Oops, _propdeclarations and friends are needed: gensuitemodule uses them

to lookup properties declared in base classes. Looking at it I'm not sure
what the official scope if the property codes is, maybe it is only the
(OSA) class in which they are used. But giving them global scope hasn't been
a problem so far.

Regenerated the standard suites, which are now also space-indented.

56 files changed, 13583 insertions, 12422 deletions

diff --git a/Lib/plat-mac/bgenlocations.py b/Lib/plat-mac/bgenlocations.py
index 418037d..01e21db 100644
--- a/Lib/plat-mac/bgenlocations.py
+++ b/Lib/plat-mac/bgenlocations.py
@@ -26,9 +26,9 @@ else:
 # end of lines, so don't worry about that.
 #
 if sys.platform == 'mac':
-    _MWERKSDIR="Sap:Applications (Mac OS 9):Metrowerks CodeWarrior 7.0:Metrowerks CodeWarrior"
+    _MWERKSDIR="Moes:Applications (Mac OS 9):Metrowerks CodeWarrior 7.0:Metrowerks CodeWarrior"
 else:
-    _MWERKSDIR="/Volumes/Sap/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/"
+    _MWERKSDIR="/Volumes/Moes/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/"
 INCLUDEDIR=os.path.join(_MWERKSDIR, "MacOS Support", "Universal", "Interfaces", "CIncludes")
 
 #
diff --git a/Lib/plat-mac/gensuitemodule.py b/Lib/plat-mac/gensuitemodule.py
index 622016e..d7206ff 100644
--- a/Lib/plat-mac/gensuitemodule.py
+++ b/Lib/plat-mac/gensuitemodule.py
@@ -987,8 +987,6 @@ class ObjectCompiler:
             if self.fp:
                 self.fp.write("\n_Prop_%s = _Prop_%s\n"%(pname, othername))
         else:
-            if self.hasname(pname):
-                pass
             if self.fp:
                 self.fp.write("class _Prop_%s(aetools.NProperty):\n" % pname)
                 self.fp.write('    """%s - %s """\n' % (ascii(name), ascii(what[1])))
@@ -1108,26 +1106,26 @@ class ObjectCompiler:
             self.fp.write("    %s : %s,\n" % (`k`, v))
         self.fp.write("}\n")
         
-##      self.fp.write("\n_propdeclarations = {\n")
-##      proplist = self.namemappers[0].getall('property')
-##      proplist.sort()
-##      for k, v in proplist:
-##          self.fp.write("    %s : _Prop_%s,\n" % (`k`, v))
-##      self.fp.write("}\n")
-##      
-##      self.fp.write("\n_compdeclarations = {\n")
-##      complist = self.namemappers[0].getall('comparison')
-##      complist.sort()
-##      for k, v in complist:
-##          self.fp.write("    %s : %s,\n" % (`k`, v))
-##      self.fp.write("}\n")
-##      
-##      self.fp.write("\n_enumdeclarations = {\n")
-##      enumlist = self.namemappers[0].getall('enum')
-##      enumlist.sort()
-##      for k, v in enumlist:
-##          self.fp.write("    %s : %s,\n" % (`k`, v))
-##      self.fp.write("}\n")
+        self.fp.write("\n_propdeclarations = {\n")
+        proplist = self.namemappers[0].getall('property')
+        proplist.sort()
+        for k, v in proplist:
+            self.fp.write("    %s : _Prop_%s,\n" % (`k`, v))
+        self.fp.write("}\n")
+        
+        self.fp.write("\n_compdeclarations = {\n")
+        complist = self.namemappers[0].getall('comparison')
+        complist.sort()
+        for k, v in complist:
+            self.fp.write("    %s : %s,\n" % (`k`, v))
+        self.fp.write("}\n")
+        
+        self.fp.write("\n_enumdeclarations = {\n")
+        enumlist = self.namemappers[0].getall('enum')
+        enumlist.sort()
+        for k, v in enumlist:
+            self.fp.write("    %s : %s,\n" % (`k`, v))
+        self.fp.write("}\n")
 
 def compiledata(data):
     [type, description, flags] = data
diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
index e015c83..5cb7478 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
@@ -12,436 +12,436 @@ _code = 'CWIE'
 
 class CodeWarrior_suite_Events:
 
-	_argmap_add = {
-		'new' : 'kocl',
-		'with_data' : 'data',
-		'to_targets' : 'TTGT',
-		'to_group' : 'TGRP',
-	}
-
-	def add(self, _object, _attributes={}, **_arguments):
-		"""add: add elements to a project or target
-		Required argument: an AE object reference
-		Keyword argument new: the class of the new element or elements to add
-		Keyword argument with_data: the initial data for the element or elements
-		Keyword argument to_targets: the targets to which the new element or elements will be added
-		Keyword argument to_group: the group to which the new element or elements will be added
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'CWIE'
-		_subcode = 'ADDF'
-
-		aetools.keysubst(_arguments, self._argmap_add)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def build(self, _no_object=None, _attributes={}, **_arguments):
-		"""build: build a project or target (equivalent of the Make menu command)
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'CWIE'
-		_subcode = 'MAKE'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def check(self, _object=None, _attributes={}, **_arguments):
-		"""check: check the syntax of a file in a project or target
-		Required argument: the file or files to be checked
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'CWIE'
-		_subcode = 'CHEK'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def compile_file(self, _object=None, _attributes={}, **_arguments):
-		"""compile file: compile a file in a project or target
-		Required argument: the file or files to be compiled
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'CWIE'
-		_subcode = 'COMP'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def disassemble_file(self, _object=None, _attributes={}, **_arguments):
-		"""disassemble file: disassemble a file in a project or target
-		Required argument: the file or files to be disassembled
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'CWIE'
-		_subcode = 'DASM'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_export = {
-		'in_' : 'kfil',
-	}
-
-	def export(self, _no_object=None, _attributes={}, **_arguments):
-		"""export: Export the project file as an XML file
-		Keyword argument in_: the XML file in which to export the project
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'CWIE'
-		_subcode = 'EXPT'
-
-		aetools.keysubst(_arguments, self._argmap_export)
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def remove_object_code(self, _no_object=None, _attributes={}, **_arguments):
-		"""remove object code: remove object code from a project or target
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'CWIE'
-		_subcode = 'RMOB'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def remove_target_files(self, _object, _attributes={}, **_arguments):
-		"""remove target files: remove files from a target
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'CWIE'
-		_subcode = 'RMFL'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def run_target(self, _no_object=None, _attributes={}, **_arguments):
-		"""run target: run a project or target
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'CWIE'
-		_subcode = 'RUN '
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def touch_file(self, _object=None, _attributes={}, **_arguments):
-		"""touch file: touch a file in a project or target for compilation
-		Required argument: the file or files to be touched
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'CWIE'
-		_subcode = 'TOCH'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def update(self, _no_object=None, _attributes={}, **_arguments):
-		"""update: bring a project or target up to date
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'CWIE'
-		_subcode = 'UP2D'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    _argmap_add = {
+        'new' : 'kocl',
+        'with_data' : 'data',
+        'to_targets' : 'TTGT',
+        'to_group' : 'TGRP',
+    }
+
+    def add(self, _object, _attributes={}, **_arguments):
+        """add: add elements to a project or target
+        Required argument: an AE object reference
+        Keyword argument new: the class of the new element or elements to add
+        Keyword argument with_data: the initial data for the element or elements
+        Keyword argument to_targets: the targets to which the new element or elements will be added
+        Keyword argument to_group: the group to which the new element or elements will be added
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'CWIE'
+        _subcode = 'ADDF'
+
+        aetools.keysubst(_arguments, self._argmap_add)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def build(self, _no_object=None, _attributes={}, **_arguments):
+        """build: build a project or target (equivalent of the Make menu command)
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'CWIE'
+        _subcode = 'MAKE'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def check(self, _object=None, _attributes={}, **_arguments):
+        """check: check the syntax of a file in a project or target
+        Required argument: the file or files to be checked
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'CWIE'
+        _subcode = 'CHEK'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def compile_file(self, _object=None, _attributes={}, **_arguments):
+        """compile file: compile a file in a project or target
+        Required argument: the file or files to be compiled
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'CWIE'
+        _subcode = 'COMP'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def disassemble_file(self, _object=None, _attributes={}, **_arguments):
+        """disassemble file: disassemble a file in a project or target
+        Required argument: the file or files to be disassembled
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'CWIE'
+        _subcode = 'DASM'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_export = {
+        'in_' : 'kfil',
+    }
+
+    def export(self, _no_object=None, _attributes={}, **_arguments):
+        """export: Export the project file as an XML file
+        Keyword argument in_: the XML file in which to export the project
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'CWIE'
+        _subcode = 'EXPT'
+
+        aetools.keysubst(_arguments, self._argmap_export)
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def remove_object_code(self, _no_object=None, _attributes={}, **_arguments):
+        """remove object code: remove object code from a project or target
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'CWIE'
+        _subcode = 'RMOB'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def remove_target_files(self, _object, _attributes={}, **_arguments):
+        """remove target files: remove files from a target
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'CWIE'
+        _subcode = 'RMFL'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def run_target(self, _no_object=None, _attributes={}, **_arguments):
+        """run target: run a project or target
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'CWIE'
+        _subcode = 'RUN '
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def touch_file(self, _object=None, _attributes={}, **_arguments):
+        """touch file: touch a file in a project or target for compilation
+        Required argument: the file or files to be touched
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'CWIE'
+        _subcode = 'TOCH'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def update(self, _no_object=None, _attributes={}, **_arguments):
+        """update: bring a project or target up to date
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'CWIE'
+        _subcode = 'UP2D'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 class single_class_browser(aetools.ComponentItem):
-	"""single class browser - a single class browser """
-	want = '1BRW'
+    """single class browser - a single class browser """
+    want = '1BRW'
 class _Prop_inherits(aetools.NProperty):
-	"""inherits - all properties and elements of the given class are inherited by this class. """
-	which = 'c@#^'
-	want = 'TXTD'
+    """inherits - all properties and elements of the given class are inherited by this class. """
+    which = 'c@#^'
+    want = 'TXTD'
 
 single_class_browsers = single_class_browser
 
 class single_class_hierarchy(aetools.ComponentItem):
-	"""single class hierarchy - a single class hierarchy document """
-	want = '1HIR'
+    """single class hierarchy - a single class hierarchy document """
+    want = '1HIR'
 
 single_class_hierarchies = single_class_hierarchy
 
 class class_browser(aetools.ComponentItem):
-	"""class browser - a class browser """
-	want = 'BROW'
+    """class browser - a class browser """
+    want = 'BROW'
 
 class_browsers = class_browser
 
 class file_compare_document(aetools.ComponentItem):
-	"""file compare document - a file compare document """
-	want = 'COMP'
+    """file compare document - a file compare document """
+    want = 'COMP'
 
 file_compare_documents = file_compare_document
 
 class catalog_document(aetools.ComponentItem):
-	"""catalog document - a browser catalog document """
-	want = 'CTLG'
+    """catalog document - a browser catalog document """
+    want = 'CTLG'
 
 catalog_documents = catalog_document
 
 class editor_document(aetools.ComponentItem):
-	"""editor document - an editor document """
-	want = 'EDIT'
+    """editor document - an editor document """
+    want = 'EDIT'
 
 editor_documents = editor_document
 
 class class_hierarchy(aetools.ComponentItem):
-	"""class hierarchy - a class hierarchy document """
-	want = 'HIER'
+    """class hierarchy - a class hierarchy document """
+    want = 'HIER'
 
 class_hierarchies = class_hierarchy
 
 class project_inspector(aetools.ComponentItem):
-	"""project inspector - the project inspector """
-	want = 'INSP'
+    """project inspector - the project inspector """
+    want = 'INSP'
 
 project_inspectors = project_inspector
 
 class message_document(aetools.ComponentItem):
-	"""message document - a message document """
-	want = 'MSSG'
+    """message document - a message document """
+    want = 'MSSG'
 
 message_documents = message_document
 
 class build_progress_document(aetools.ComponentItem):
-	"""build progress document - a build progress document """
-	want = 'PRGS'
+    """build progress document - a build progress document """
+    want = 'PRGS'
 
 build_progress_documents = build_progress_document
 
 class project_document(aetools.ComponentItem):
-	"""project document - a project document """
-	want = 'PRJD'
+    """project document - a project document """
+    want = 'PRJD'
 class _Prop_current_target(aetools.NProperty):
-	"""current target - the current target """
-	which = 'CURT'
-	want = 'TRGT'
+    """current target - the current target """
+    which = 'CURT'
+    want = 'TRGT'
 #        element 'TRGT' as ['indx', 'name', 'test', 'rang']
 
 project_documents = project_document
 
 class subtarget(aetools.ComponentItem):
-	"""subtarget - a target that is prerequisite for another target """
-	want = 'SBTG'
+    """subtarget - a target that is prerequisite for another target """
+    want = 'SBTG'
 class _Prop_link_against_output(aetools.NProperty):
-	"""link against output - is the output of this subtarget linked into its dependent target? """
-	which = 'LNKO'
-	want = 'bool'
+    """link against output - is the output of this subtarget linked into its dependent target? """
+    which = 'LNKO'
+    want = 'bool'
 class _Prop_target(aetools.NProperty):
-	"""target - the target that is dependent on this subtarget """
-	which = 'TrgT'
-	want = 'TRGT'
+    """target - the target that is dependent on this subtarget """
+    which = 'TrgT'
+    want = 'TRGT'
 
 subtargets = subtarget
 
 class target_file(aetools.ComponentItem):
-	"""target file - a source or header file in a target """
-	want = 'SRCF'
+    """target file - a source or header file in a target """
+    want = 'SRCF'
 class _Prop_code_size(aetools.NProperty):
-	"""code size - the size of the code (in bytes) produced by compiling this source file """
-	which = 'CSZE'
-	want = 'long'
+    """code size - the size of the code (in bytes) produced by compiling this source file """
+    which = 'CSZE'
+    want = 'long'
 class _Prop_compiled_date(aetools.NProperty):
-	"""compiled date - the date and this source file was last compiled """
-	which = 'CMPD'
-	want = 'ldt '
+    """compiled date - the date and this source file was last compiled """
+    which = 'CMPD'
+    want = 'ldt '
 class _Prop_data_size(aetools.NProperty):
-	"""data size - the size of the date (in bytes) produced by compiling this source file """
-	which = 'DSZE'
-	want = 'long'
+    """data size - the size of the date (in bytes) produced by compiling this source file """
+    which = 'DSZE'
+    want = 'long'
 class _Prop_debug(aetools.NProperty):
-	"""debug - is debugging information generated for this source file? """
-	which = 'DBUG'
-	want = 'bool'
+    """debug - is debugging information generated for this source file? """
+    which = 'DBUG'
+    want = 'bool'
 class _Prop_dependents(aetools.NProperty):
-	"""dependents - the source files that need this source file in order to build """
-	which = 'DPND'
-	want = 'list'
+    """dependents - the source files that need this source file in order to build """
+    which = 'DPND'
+    want = 'list'
 class _Prop_id(aetools.NProperty):
-	"""id - the unique ID number of the target file """
-	which = 'ID  '
-	want = 'long'
+    """id - the unique ID number of the target file """
+    which = 'ID  '
+    want = 'long'
 class _Prop_init_before(aetools.NProperty):
-	"""init before - is the \xd4initialize before\xd5 flag set for this shared library? """
-	which = 'INIT'
-	want = 'bool'
+    """init before - is the \xd4initialize before\xd5 flag set for this shared library? """
+    which = 'INIT'
+    want = 'bool'
 class _Prop_link_index(aetools.NProperty):
-	"""link index - the index of the source file in its target\xd5s link order (-1 if source file is not in link order) """
-	which = 'LIDX'
-	want = 'long'
+    """link index - the index of the source file in its target\xd5s link order (-1 if source file is not in link order) """
+    which = 'LIDX'
+    want = 'long'
 class _Prop_linked(aetools.NProperty):
-	"""linked - is the source file in the link order of its target? """
-	which = 'LINK'
-	want = 'bool'
+    """linked - is the source file in the link order of its target? """
+    which = 'LINK'
+    want = 'bool'
 class _Prop_location(aetools.NProperty):
-	"""location - the location of the target file on disk """
-	which = 'FILE'
-	want = 'fss '
+    """location - the location of the target file on disk """
+    which = 'FILE'
+    want = 'fss '
 class _Prop_merge_output(aetools.NProperty):
-	"""merge output - is this shared library merged into another code fragment? """
-	which = 'MRGE'
-	want = 'bool'
+    """merge output - is this shared library merged into another code fragment? """
+    which = 'MRGE'
+    want = 'bool'
 class _Prop_modified_date(aetools.NProperty):
-	"""modified date - the date and time this source file was last modified """
-	which = 'MODD'
-	want = 'ldt '
+    """modified date - the date and time this source file was last modified """
+    which = 'MODD'
+    want = 'ldt '
 class _Prop_path(aetools.NProperty):
-	"""path - the path of the source file on disk """
-	which = 'Path'
-	want = 'itxt'
+    """path - the path of the source file on disk """
+    which = 'Path'
+    want = 'itxt'
 class _Prop_prerequisites(aetools.NProperty):
-	"""prerequisites - the source files needed to build this source file """
-	which = 'PRER'
-	want = 'list'
+    """prerequisites - the source files needed to build this source file """
+    which = 'PRER'
+    want = 'list'
 class _Prop_type(aetools.NProperty):
-	"""type - the type of source file """
-	which = 'FTYP'
-	want = 'FTYP'
+    """type - the type of source file """
+    which = 'FTYP'
+    want = 'FTYP'
 class _Prop_weak_link(aetools.NProperty):
-	"""weak link - is this shared library linked weakly? """
-	which = 'WEAK'
-	want = 'bool'
+    """weak link - is this shared library linked weakly? """
+    which = 'WEAK'
+    want = 'bool'
 
 target_files = target_file
 
 class symbol_browser(aetools.ComponentItem):
-	"""symbol browser - a symbol browser """
-	want = 'SYMB'
+    """symbol browser - a symbol browser """
+    want = 'SYMB'
 
 symbol_browsers = symbol_browser
 
 class ToolServer_worksheet(aetools.ComponentItem):
-	"""ToolServer worksheet - a ToolServer worksheet """
-	want = 'TOOL'
+    """ToolServer worksheet - a ToolServer worksheet """
+    want = 'TOOL'
 
 ToolServer_worksheets = ToolServer_worksheet
 
 class target(aetools.ComponentItem):
-	"""target - a target in a project """
-	want = 'TRGT'
+    """target - a target in a project """
+    want = 'TRGT'
 class _Prop_name(aetools.NProperty):
-	"""name -  """
-	which = 'pnam'
-	want = 'itxt'
+    """name -  """
+    which = 'pnam'
+    want = 'itxt'
 class _Prop_project_document(aetools.NProperty):
-	"""project document - the project document that contains this target """
-	which = 'PrjD'
-	want = 'PRJD'
+    """project document - the project document that contains this target """
+    which = 'PrjD'
+    want = 'PRJD'
 #        element 'SBTG' as ['indx', 'test', 'rang']
 #        element 'SRCF' as ['indx', 'test', 'rang']
 
 targets = target
 
 class text_document(aetools.ComponentItem):
-	"""text document - a document that contains text """
-	want = 'TXTD'
+    """text document - a document that contains text """
+    want = 'TXTD'
 class _Prop_modified(aetools.NProperty):
-	"""modified - Has the document been modified since the last save? """
-	which = 'imod'
-	want = 'bool'
+    """modified - Has the document been modified since the last save? """
+    which = 'imod'
+    want = 'bool'
 class _Prop_selection(aetools.NProperty):
-	"""selection - the selection visible to the user """
-	which = 'sele'
-	want = 'csel'
+    """selection - the selection visible to the user """
+    which = 'sele'
+    want = 'csel'
 #        element 'cha ' as ['indx', 'rele', 'rang', 'test']
 #        element 'cins' as ['rele']
 #        element 'clin' as ['indx', 'rang', 'rele']
@@ -450,174 +450,174 @@ class _Prop_selection(aetools.NProperty):
 text_documents = text_document
 single_class_browser._superclassnames = ['text_document']
 single_class_browser._privpropdict = {
-	'inherits' : _Prop_inherits,
+    'inherits' : _Prop_inherits,
 }
 single_class_browser._privelemdict = {
 }
 import Standard_Suite
 single_class_hierarchy._superclassnames = ['document']
 single_class_hierarchy._privpropdict = {
-	'inherits' : _Prop_inherits,
+    'inherits' : _Prop_inherits,
 }
 single_class_hierarchy._privelemdict = {
 }
 class_browser._superclassnames = ['text_document']
 class_browser._privpropdict = {
-	'inherits' : _Prop_inherits,
+    'inherits' : _Prop_inherits,
 }
 class_browser._privelemdict = {
 }
 file_compare_document._superclassnames = ['text_document']
 file_compare_document._privpropdict = {
-	'inherits' : _Prop_inherits,
+    'inherits' : _Prop_inherits,
 }
 file_compare_document._privelemdict = {
 }
 catalog_document._superclassnames = ['text_document']
 catalog_document._privpropdict = {
-	'inherits' : _Prop_inherits,
+    'inherits' : _Prop_inherits,
 }
 catalog_document._privelemdict = {
 }
 editor_document._superclassnames = ['text_document']
 editor_document._privpropdict = {
-	'inherits' : _Prop_inherits,
+    'inherits' : _Prop_inherits,
 }
 editor_document._privelemdict = {
 }
 class_hierarchy._superclassnames = ['document']
 class_hierarchy._privpropdict = {
-	'inherits' : _Prop_inherits,
+    'inherits' : _Prop_inherits,
 }
 class_hierarchy._privelemdict = {
 }
 project_inspector._superclassnames = ['document']
 project_inspector._privpropdict = {
-	'inherits' : _Prop_inherits,
+    'inherits' : _Prop_inherits,
 }
 project_inspector._privelemdict = {
 }
 message_document._superclassnames = ['text_document']
 message_document._privpropdict = {
-	'inherits' : _Prop_inherits,
+    'inherits' : _Prop_inherits,
 }
 message_document._privelemdict = {
 }
 build_progress_document._superclassnames = ['document']
 build_progress_document._privpropdict = {
-	'inherits' : _Prop_inherits,
+    'inherits' : _Prop_inherits,
 }
 build_progress_document._privelemdict = {
 }
 project_document._superclassnames = ['document']
 project_document._privpropdict = {
-	'current_target' : _Prop_current_target,
-	'inherits' : _Prop_inherits,
+    'current_target' : _Prop_current_target,
+    'inherits' : _Prop_inherits,
 }
 project_document._privelemdict = {
-	'target' : target,
+    'target' : target,
 }
 subtarget._superclassnames = ['target']
 subtarget._privpropdict = {
-	'inherits' : _Prop_inherits,
-	'link_against_output' : _Prop_link_against_output,
-	'target' : _Prop_target,
+    'inherits' : _Prop_inherits,
+    'link_against_output' : _Prop_link_against_output,
+    'target' : _Prop_target,
 }
 subtarget._privelemdict = {
 }
 target_file._superclassnames = []
 target_file._privpropdict = {
-	'code_size' : _Prop_code_size,
-	'compiled_date' : _Prop_compiled_date,
-	'data_size' : _Prop_data_size,
-	'debug' : _Prop_debug,
-	'dependents' : _Prop_dependents,
-	'id' : _Prop_id,
-	'init_before' : _Prop_init_before,
-	'link_index' : _Prop_link_index,
-	'linked' : _Prop_linked,
-	'location' : _Prop_location,
-	'merge_output' : _Prop_merge_output,
-	'modified_date' : _Prop_modified_date,
-	'path' : _Prop_path,
-	'prerequisites' : _Prop_prerequisites,
-	'type' : _Prop_type,
-	'weak_link' : _Prop_weak_link,
+    'code_size' : _Prop_code_size,
+    'compiled_date' : _Prop_compiled_date,
+    'data_size' : _Prop_data_size,
+    'debug' : _Prop_debug,
+    'dependents' : _Prop_dependents,
+    'id' : _Prop_id,
+    'init_before' : _Prop_init_before,
+    'link_index' : _Prop_link_index,
+    'linked' : _Prop_linked,
+    'location' : _Prop_location,
+    'merge_output' : _Prop_merge_output,
+    'modified_date' : _Prop_modified_date,
+    'path' : _Prop_path,
+    'prerequisites' : _Prop_prerequisites,
+    'type' : _Prop_type,
+    'weak_link' : _Prop_weak_link,
 }
 target_file._privelemdict = {
 }
 symbol_browser._superclassnames = ['text_document']
 symbol_browser._privpropdict = {
-	'inherits' : _Prop_inherits,
+    'inherits' : _Prop_inherits,
 }
 symbol_browser._privelemdict = {
 }
 ToolServer_worksheet._superclassnames = ['text_document']
 ToolServer_worksheet._privpropdict = {
-	'inherits' : _Prop_inherits,
+    'inherits' : _Prop_inherits,
 }
 ToolServer_worksheet._privelemdict = {
 }
 target._superclassnames = []
 target._privpropdict = {
-	'name' : _Prop_name,
-	'project_document' : _Prop_project_document,
+    'name' : _Prop_name,
+    'project_document' : _Prop_project_document,
 }
 target._privelemdict = {
-	'subtarget' : subtarget,
-	'target_file' : target_file,
+    'subtarget' : subtarget,
+    'target_file' : target_file,
 }
 text_document._superclassnames = ['document']
 text_document._privpropdict = {
-	'inherits' : _Prop_inherits,
-	'modified' : _Prop_modified,
-	'selection' : _Prop_selection,
+    'inherits' : _Prop_inherits,
+    'modified' : _Prop_modified,
+    'selection' : _Prop_selection,
 }
 text_document._privelemdict = {
-	'character' : Standard_Suite.character,
-	'insertion_point' : Standard_Suite.insertion_point,
-	'line' : Standard_Suite.line,
-	'text' : Standard_Suite.text,
+    'character' : Standard_Suite.character,
+    'insertion_point' : Standard_Suite.insertion_point,
+    'line' : Standard_Suite.line,
+    'text' : Standard_Suite.text,
 }
 _Enum_DKND = {
-	'project' : 'PRJD',	# a project document
-	'editor_document' : 'EDIT',	# an editor document
-	'message' : 'MSSG',	# a message document
-	'file_compare' : 'COMP',	# a file compare document
-	'catalog_document' : 'CTLG',	# a browser catalog
-	'class_browser' : 'BROW',	# a class browser document
-	'single_class_browser' : '1BRW',	# a single class browser document
-	'symbol_browser' : 'SYMB',	# a symbol browser document
-	'class_hierarchy' : 'HIER',	# a class hierarchy document
-	'single_class_hierarchy' : '1HIR',	# a single class hierarchy document
-	'project_inspector' : 'INSP',	# a project inspector
-	'ToolServer_worksheet' : 'TOOL',	# the ToolServer worksheet
-	'build_progress_document' : 'PRGS',	# the build progress window
+    'project' : 'PRJD',	# a project document
+    'editor_document' : 'EDIT',	# an editor document
+    'message' : 'MSSG',	# a message document
+    'file_compare' : 'COMP',	# a file compare document
+    'catalog_document' : 'CTLG',	# a browser catalog
+    'class_browser' : 'BROW',	# a class browser document
+    'single_class_browser' : '1BRW',	# a single class browser document
+    'symbol_browser' : 'SYMB',	# a symbol browser document
+    'class_hierarchy' : 'HIER',	# a class hierarchy document
+    'single_class_hierarchy' : '1HIR',	# a single class hierarchy document
+    'project_inspector' : 'INSP',	# a project inspector
+    'ToolServer_worksheet' : 'TOOL',	# the ToolServer worksheet
+    'build_progress_document' : 'PRGS',	# the build progress window
 }
 
 _Enum_FTYP = {
-	'library_file' : 'LIBF',	# a library file
-	'project_file' : 'PRJF',	# a project file
-	'resource_file' : 'RESF',	# a resource file
-	'text_file' : 'TXTF',	# a text file
-	'unknown_file' : 'UNKN',	# unknown file type
+    'library_file' : 'LIBF',	# a library file
+    'project_file' : 'PRJF',	# a project file
+    'resource_file' : 'RESF',	# a resource file
+    'text_file' : 'TXTF',	# a text file
+    'unknown_file' : 'UNKN',	# unknown file type
 }
 
 _Enum_Inte = {
-	'never_interact' : 'eNvr',	# never allow user interactions
-	'interact_with_self' : 'eInS',	# allow user interaction only when an AppleEvent is sent from within CodeWarrior
-	'interact_with_local' : 'eInL',	# allow user interaction when AppleEvents are sent from applications on the same machine (default)
-	'interact_with_all' : 'eInA',	# allow user interaction from both local and remote AppleEvents
+    'never_interact' : 'eNvr',	# never allow user interactions
+    'interact_with_self' : 'eInS',	# allow user interaction only when an AppleEvent is sent from within CodeWarrior
+    'interact_with_local' : 'eInL',	# allow user interaction when AppleEvents are sent from applications on the same machine (default)
+    'interact_with_all' : 'eInA',	# allow user interaction from both local and remote AppleEvents
 }
 
 _Enum_PERM = {
-	'read_write' : 'RdWr',	# the file is open with read/write permission
-	'read_only' : 'Read',	# the file is open with read/only permission
-	'checked_out_read_write' : 'CkRW',	# the file is checked out with read/write permission
-	'checked_out_read_only' : 'CkRO',	# the file is checked out with read/only permission
-	'checked_out_read_modify' : 'CkRM',	# the file is checked out with read/modify permission
-	'locked' : 'Lock',	# the file is locked on disk
-	'none' : 'LNNO',	# the file is new
+    'read_write' : 'RdWr',	# the file is open with read/write permission
+    'read_only' : 'Read',	# the file is open with read/only permission
+    'checked_out_read_write' : 'CkRW',	# the file is checked out with read/write permission
+    'checked_out_read_only' : 'CkRO',	# the file is checked out with read/only permission
+    'checked_out_read_modify' : 'CkRM',	# the file is checked out with read/modify permission
+    'locked' : 'Lock',	# the file is locked on disk
+    'none' : 'LNNO',	# the file is new
 }
 
 
@@ -625,21 +625,58 @@ _Enum_PERM = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'1BRW' : single_class_browser,
-	'1HIR' : single_class_hierarchy,
-	'BROW' : class_browser,
-	'COMP' : file_compare_document,
-	'CTLG' : catalog_document,
-	'EDIT' : editor_document,
-	'HIER' : class_hierarchy,
-	'INSP' : project_inspector,
-	'MSSG' : message_document,
-	'PRGS' : build_progress_document,
-	'PRJD' : project_document,
-	'SBTG' : subtarget,
-	'SRCF' : target_file,
-	'SYMB' : symbol_browser,
-	'TOOL' : ToolServer_worksheet,
-	'TRGT' : target,
-	'TXTD' : text_document,
+    '1BRW' : single_class_browser,
+    '1HIR' : single_class_hierarchy,
+    'BROW' : class_browser,
+    'COMP' : file_compare_document,
+    'CTLG' : catalog_document,
+    'EDIT' : editor_document,
+    'HIER' : class_hierarchy,
+    'INSP' : project_inspector,
+    'MSSG' : message_document,
+    'PRGS' : build_progress_document,
+    'PRJD' : project_document,
+    'SBTG' : subtarget,
+    'SRCF' : target_file,
+    'SYMB' : symbol_browser,
+    'TOOL' : ToolServer_worksheet,
+    'TRGT' : target,
+    'TXTD' : text_document,
+}
+
+_propdeclarations = {
+    'CMPD' : _Prop_compiled_date,
+    'CSZE' : _Prop_code_size,
+    'CURT' : _Prop_current_target,
+    'DBUG' : _Prop_debug,
+    'DPND' : _Prop_dependents,
+    'DSZE' : _Prop_data_size,
+    'FILE' : _Prop_location,
+    'FTYP' : _Prop_type,
+    'ID  ' : _Prop_id,
+    'INIT' : _Prop_init_before,
+    'LIDX' : _Prop_link_index,
+    'LINK' : _Prop_linked,
+    'LNKO' : _Prop_link_against_output,
+    'MODD' : _Prop_modified_date,
+    'MRGE' : _Prop_merge_output,
+    'PRER' : _Prop_prerequisites,
+    'Path' : _Prop_path,
+    'PrjD' : _Prop_project_document,
+    'TrgT' : _Prop_target,
+    'WEAK' : _Prop_weak_link,
+    'c@#^' : _Prop_inherits,
+    'imod' : _Prop_modified,
+    'pnam' : _Prop_name,
+    'sele' : _Prop_selection,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+    'DKND' : _Enum_DKND,
+    'FTYP' : _Enum_FTYP,
+    'Inte' : _Enum_Inte,
+    'PERM' : _Enum_PERM,
 }
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 8584796..a812b0a 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py
@@ -12,934 +12,934 @@ _code = 'MMPR'
 
 class Metrowerks_Shell_Suite_Events:
 
-	_argmap_Add_Files = {
-		'To_Segment' : 'Segm',
-	}
-
-	def Add_Files(self, _object, _attributes={}, **_arguments):
-		"""Add Files: Add the specified file(s) to the current project
-		Required argument: List of files to add
-		Keyword argument To_Segment: Segment number into which to add the file(s)
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Error code for each file added
-		"""
-		_code = 'MMPR'
-		_subcode = 'AddF'
-
-		aetools.keysubst(_arguments, self._argmap_Add_Files)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_Check_Syntax = {
-		'ExternalEditor' : 'Errs',
-	}
-
-	def Check_Syntax(self, _object, _attributes={}, **_arguments):
-		"""Check Syntax: Check the syntax of the specified file(s)
-		Required argument: List of files to check the syntax of
-		Keyword argument ExternalEditor: Should the contents of the message window be returned to the caller?
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Errors for each file whose syntax was checked
-		"""
-		_code = 'MMPR'
-		_subcode = 'Chek'
-
-		aetools.keysubst(_arguments, self._argmap_Check_Syntax)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Close_Project(self, _no_object=None, _attributes={}, **_arguments):
-		"""Close Project: Close the current project
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MMPR'
-		_subcode = 'ClsP'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_Close_Window = {
-		'Saving' : 'savo',
-	}
-
-	def Close_Window(self, _object, _attributes={}, **_arguments):
-		"""Close Window: Close the windows showing the specified files
-		Required argument: The files to close
-		Keyword argument Saving: Whether to save changes to each file before closing its window
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MMPR'
-		_subcode = 'ClsW'
-
-		aetools.keysubst(_arguments, self._argmap_Close_Window)
-		_arguments['----'] = _object
-
-		aetools.enumsubst(_arguments, 'savo', _Enum_savo)
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_Compile = {
-		'ExternalEditor' : 'Errs',
-	}
-
-	def Compile(self, _object, _attributes={}, **_arguments):
-		"""Compile: Compile the specified file(s)
-		Required argument: List of files to compile
-		Keyword argument ExternalEditor: Should the contents of the message window be returned to the caller?
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Errors for each file compiled
-		"""
-		_code = 'MMPR'
-		_subcode = 'Comp'
-
-		aetools.keysubst(_arguments, self._argmap_Compile)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_Create_Project = {
-		'from_stationery' : 'Tmpl',
-	}
-
-	def Create_Project(self, _object, _attributes={}, **_arguments):
-		"""Create Project: Create a new project file
-		Required argument: New project file specifier
-		Keyword argument from_stationery: undocumented, typecode 'alis'
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MMPR'
-		_subcode = 'NewP'
-
-		aetools.keysubst(_arguments, self._argmap_Create_Project)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Get_Definition(self, _object, _attributes={}, **_arguments):
-		"""Get Definition: Returns the location(s) of a globally scoped function or data object.
-		Required argument: undocumented, typecode 'TEXT'
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: undocumented, typecode 'FDef'
-		"""
-		_code = 'MMPR'
-		_subcode = 'GDef'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Get_Open_Documents(self, _no_object=None, _attributes={}, **_arguments):
-		"""Get Open Documents: Returns the list of open documents
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: The list of documents
-		"""
-		_code = 'MMPR'
-		_subcode = 'GDoc'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_Get_Preferences = {
-		'of' : 'PRec',
-		'from_panel' : 'PNam',
-	}
-
-	def Get_Preferences(self, _no_object=None, _attributes={}, **_arguments):
-		"""Get Preferences: Get the preferences for the current project
-		Keyword argument of: Names of requested preferences
-		Keyword argument from_panel: Name of the preference panel
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: The requested preferences
-		"""
-		_code = 'MMPR'
-		_subcode = 'Gref'
-
-		aetools.keysubst(_arguments, self._argmap_Get_Preferences)
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_Get_Project_File = {
-		'Segment' : 'Segm',
-	}
-
-	def Get_Project_File(self, _object, _attributes={}, **_arguments):
-		"""Get Project File: Returns a description of a file in the project window.
-		Required argument: The index of the file within its segment.
-		Keyword argument Segment: The segment containing the file.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: undocumented, typecode 'SrcF'
-		"""
-		_code = 'MMPR'
-		_subcode = 'GFil'
-
-		aetools.keysubst(_arguments, self._argmap_Get_Project_File)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Get_Project_Specifier(self, _no_object=None, _attributes={}, **_arguments):
-		"""Get Project Specifier: Return the File Specifier for the current project
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: File Specifier for the current project
-		"""
-		_code = 'MMPR'
-		_subcode = 'GetP'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Get_Segments(self, _no_object=None, _attributes={}, **_arguments):
-		"""Get Segments: Returns a description of each segment in the project.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: undocumented, typecode 'Seg '
-		"""
-		_code = 'MMPR'
-		_subcode = 'GSeg'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Get_member_function_names(self, _object, _attributes={}, **_arguments):
-		"""Get member function names: Returns a list containing the names of all the member functions of a class object
-		Required argument: must be a class object
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: undocumented, typecode 'list'
-		"""
-		_code = 'MMPR'
-		_subcode = 'MbFN'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Get_nonsimple_classes(self, _no_object=None, _attributes={}, **_arguments):
-		"""Get nonsimple classes: Returns an alphabetical list of classes with member functions, bases classes, or subclasses
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: undocumented, typecode 'list'
-		"""
-		_code = 'MMPR'
-		_subcode = 'NsCl'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Goto_Function(self, _object, _attributes={}, **_arguments):
-		"""Goto Function: Goto Specified Function Name
-		Required argument: undocumented, typecode 'TEXT'
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MMPR'
-		_subcode = 'GoFn'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Goto_Line(self, _object, _attributes={}, **_arguments):
-		"""Goto Line: Goto Specified Line Number
-		Required argument: The requested source file line number
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MMPR'
-		_subcode = 'GoLn'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Is_In_Project(self, _object, _attributes={}, **_arguments):
-		"""Is In Project: Whether or not the specified file(s) is in the current project
-		Required argument: List of files to check for project membership
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Result code for each file
-		"""
-		_code = 'MMPR'
-		_subcode = 'FInP'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_Make_Project = {
-		'ExternalEditor' : 'Errs',
-	}
-
-	def Make_Project(self, _no_object=None, _attributes={}, **_arguments):
-		"""Make Project: Make the current project
-		Keyword argument ExternalEditor: Should the contents of the message window be returned to the caller?
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Errors that occurred while making the project
-		"""
-		_code = 'MMPR'
-		_subcode = 'Make'
-
-		aetools.keysubst(_arguments, self._argmap_Make_Project)
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Open_browser(self, _object, _attributes={}, **_arguments):
-		"""Open browser: Display a class, member function, or data member object in a single class browser window
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MMPR'
-		_subcode = 'Brow'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_Precompile = {
-		'Saving_As' : 'Targ',
-		'ExternalEditor' : 'Errs',
-	}
-
-	def Precompile(self, _object, _attributes={}, **_arguments):
-		"""Precompile: Precompile the specified file to the specified destination file
-		Required argument: File to precompile
-		Keyword argument Saving_As: Destination file for precompiled header
-		Keyword argument ExternalEditor: Should the contents of the message window be returned to the caller?
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Errors for the precompiled file
-		"""
-		_code = 'MMPR'
-		_subcode = 'PreC'
-
-		aetools.keysubst(_arguments, self._argmap_Precompile)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_Preprocess = {
-		'ExternalEditor' : 'Errs',
-	}
-
-	def Preprocess(self, _object, _attributes={}, **_arguments):
-		"""Preprocess: Preprocesses the specified file(s)
-		Required argument: undocumented, typecode 'alis'
-		Keyword argument ExternalEditor: undocumented, typecode 'bool'
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Errors for each preprocessed file
-		"""
-		_code = 'MMPR'
-		_subcode = 'PreP'
-
-		aetools.keysubst(_arguments, self._argmap_Preprocess)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Remove_Binaries(self, _no_object=None, _attributes={}, **_arguments):
-		"""Remove Binaries: Remove the binary object code from the current project
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MMPR'
-		_subcode = 'RemB'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Remove_Files(self, _object, _attributes={}, **_arguments):
-		"""Remove Files: Remove the specified file(s) from the current project
-		Required argument: List of files to remove
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Error code for each file removed
-		"""
-		_code = 'MMPR'
-		_subcode = 'RemF'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Reset_File_Paths(self, _no_object=None, _attributes={}, **_arguments):
-		"""Reset File Paths: Resets access paths for all files belonging to open project.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MMPR'
-		_subcode = 'ReFP'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_Run_Project = {
-		'ExternalEditor' : 'Errs',
-		'SourceDebugger' : 'DeBg',
-	}
-
-	def Run_Project(self, _no_object=None, _attributes={}, **_arguments):
-		"""Run Project: Run the current project
-		Keyword argument ExternalEditor: Should the contents of the message window be returned to the caller?
-		Keyword argument SourceDebugger: Run the application under the control of the source-level debugger
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Errors that occurred when running the project
-		"""
-		_code = 'MMPR'
-		_subcode = 'RunP'
-
-		aetools.keysubst(_arguments, self._argmap_Run_Project)
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Save_Error_Window_As(self, _object, _attributes={}, **_arguments):
-		"""Save Error Window As: Saves the Errors & Warnings window as a text file
-		Required argument: Destination file for Save Message Window As
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MMPR'
-		_subcode = 'SvMs'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Set_Current_Target(self, _object=None, _attributes={}, **_arguments):
-		"""Set Current Target: Set the current target of a project
-		Required argument: Name of target
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MMPR'
-		_subcode = 'STrg'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Set_Default_Project(self, _object, _attributes={}, **_arguments):
-		"""Set Default Project: Set the default project
-		Required argument: Name of project
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MMPR'
-		_subcode = 'SDfP'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_Set_Modification_Date = {
-		'to' : 'MDat',
-	}
-
-	def Set_Modification_Date(self, _object, _attributes={}, **_arguments):
-		"""Set Modification Date: Changes the internal modification date of the specified file(s)
-		Required argument: List of files
-		Keyword argument to: undocumented, typecode 'ldt '
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Error code for each modified file
-		"""
-		_code = 'MMPR'
-		_subcode = 'SMod'
-
-		aetools.keysubst(_arguments, self._argmap_Set_Modification_Date)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_Set_Preferences = {
-		'of_panel' : 'PNam',
-		'to' : 'PRec',
-	}
-
-	def Set_Preferences(self, _no_object=None, _attributes={}, **_arguments):
-		"""Set Preferences: Set the preferences for the current project
-		Keyword argument of_panel: Name of the preference panel
-		Keyword argument to: Preferences settings
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MMPR'
-		_subcode = 'Pref'
-
-		aetools.keysubst(_arguments, self._argmap_Set_Preferences)
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_Set_Project_File = {
-		'to' : 'SrcS',
-	}
-
-	def Set_Project_File(self, _object, _attributes={}, **_arguments):
-		"""Set Project File: Changes the settings for a given file in the project.
-		Required argument: The name of the file
-		Keyword argument to: The new settings for the file
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MMPR'
-		_subcode = 'SFil'
-
-		aetools.keysubst(_arguments, self._argmap_Set_Project_File)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_Set_Segment = {
-		'to' : 'Segm',
-	}
-
-	def Set_Segment(self, _object, _attributes={}, **_arguments):
-		"""Set Segment: Changes the name and attributes of a segment.
-		Required argument: The segment to change
-		Keyword argument to: The new name and attributes for the segment.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MMPR'
-		_subcode = 'SSeg'
-
-		aetools.keysubst(_arguments, self._argmap_Set_Segment)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Touch(self, _object, _attributes={}, **_arguments):
-		"""Touch: Force recompilation of the specified file(s)
-		Required argument: List of files to compile
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Error code for each file touched
-		"""
-		_code = 'MMPR'
-		_subcode = 'Toch'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_Update_Project = {
-		'ExternalEditor' : 'Errs',
-	}
-
-	def Update_Project(self, _no_object=None, _attributes={}, **_arguments):
-		"""Update Project: Update the current project
-		Keyword argument ExternalEditor: Should the contents of the message window be returned to the caller?
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Errors that occurred while updating the project
-		"""
-		_code = 'MMPR'
-		_subcode = 'UpdP'
-
-		aetools.keysubst(_arguments, self._argmap_Update_Project)
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    _argmap_Add_Files = {
+        'To_Segment' : 'Segm',
+    }
+
+    def Add_Files(self, _object, _attributes={}, **_arguments):
+        """Add Files: Add the specified file(s) to the current project
+        Required argument: List of files to add
+        Keyword argument To_Segment: Segment number into which to add the file(s)
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: Error code for each file added
+        """
+        _code = 'MMPR'
+        _subcode = 'AddF'
+
+        aetools.keysubst(_arguments, self._argmap_Add_Files)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_Check_Syntax = {
+        'ExternalEditor' : 'Errs',
+    }
+
+    def Check_Syntax(self, _object, _attributes={}, **_arguments):
+        """Check Syntax: Check the syntax of the specified file(s)
+        Required argument: List of files to check the syntax of
+        Keyword argument ExternalEditor: Should the contents of the message window be returned to the caller?
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: Errors for each file whose syntax was checked
+        """
+        _code = 'MMPR'
+        _subcode = 'Chek'
+
+        aetools.keysubst(_arguments, self._argmap_Check_Syntax)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Close_Project(self, _no_object=None, _attributes={}, **_arguments):
+        """Close Project: Close the current project
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'MMPR'
+        _subcode = 'ClsP'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_Close_Window = {
+        'Saving' : 'savo',
+    }
+
+    def Close_Window(self, _object, _attributes={}, **_arguments):
+        """Close Window: Close the windows showing the specified files
+        Required argument: The files to close
+        Keyword argument Saving: Whether to save changes to each file before closing its window
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'MMPR'
+        _subcode = 'ClsW'
+
+        aetools.keysubst(_arguments, self._argmap_Close_Window)
+        _arguments['----'] = _object
+
+        aetools.enumsubst(_arguments, 'savo', _Enum_savo)
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_Compile = {
+        'ExternalEditor' : 'Errs',
+    }
+
+    def Compile(self, _object, _attributes={}, **_arguments):
+        """Compile: Compile the specified file(s)
+        Required argument: List of files to compile
+        Keyword argument ExternalEditor: Should the contents of the message window be returned to the caller?
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: Errors for each file compiled
+        """
+        _code = 'MMPR'
+        _subcode = 'Comp'
+
+        aetools.keysubst(_arguments, self._argmap_Compile)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_Create_Project = {
+        'from_stationery' : 'Tmpl',
+    }
+
+    def Create_Project(self, _object, _attributes={}, **_arguments):
+        """Create Project: Create a new project file
+        Required argument: New project file specifier
+        Keyword argument from_stationery: undocumented, typecode 'alis'
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'MMPR'
+        _subcode = 'NewP'
+
+        aetools.keysubst(_arguments, self._argmap_Create_Project)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Get_Definition(self, _object, _attributes={}, **_arguments):
+        """Get Definition: Returns the location(s) of a globally scoped function or data object.
+        Required argument: undocumented, typecode 'TEXT'
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: undocumented, typecode 'FDef'
+        """
+        _code = 'MMPR'
+        _subcode = 'GDef'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Get_Open_Documents(self, _no_object=None, _attributes={}, **_arguments):
+        """Get Open Documents: Returns the list of open documents
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: The list of documents
+        """
+        _code = 'MMPR'
+        _subcode = 'GDoc'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_Get_Preferences = {
+        'of' : 'PRec',
+        'from_panel' : 'PNam',
+    }
+
+    def Get_Preferences(self, _no_object=None, _attributes={}, **_arguments):
+        """Get Preferences: Get the preferences for the current project
+        Keyword argument of: Names of requested preferences
+        Keyword argument from_panel: Name of the preference panel
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: The requested preferences
+        """
+        _code = 'MMPR'
+        _subcode = 'Gref'
+
+        aetools.keysubst(_arguments, self._argmap_Get_Preferences)
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_Get_Project_File = {
+        'Segment' : 'Segm',
+    }
+
+    def Get_Project_File(self, _object, _attributes={}, **_arguments):
+        """Get Project File: Returns a description of a file in the project window.
+        Required argument: The index of the file within its segment.
+        Keyword argument Segment: The segment containing the file.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: undocumented, typecode 'SrcF'
+        """
+        _code = 'MMPR'
+        _subcode = 'GFil'
+
+        aetools.keysubst(_arguments, self._argmap_Get_Project_File)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Get_Project_Specifier(self, _no_object=None, _attributes={}, **_arguments):
+        """Get Project Specifier: Return the File Specifier for the current project
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: File Specifier for the current project
+        """
+        _code = 'MMPR'
+        _subcode = 'GetP'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Get_Segments(self, _no_object=None, _attributes={}, **_arguments):
+        """Get Segments: Returns a description of each segment in the project.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: undocumented, typecode 'Seg '
+        """
+        _code = 'MMPR'
+        _subcode = 'GSeg'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Get_member_function_names(self, _object, _attributes={}, **_arguments):
+        """Get member function names: Returns a list containing the names of all the member functions of a class object
+        Required argument: must be a class object
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: undocumented, typecode 'list'
+        """
+        _code = 'MMPR'
+        _subcode = 'MbFN'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Get_nonsimple_classes(self, _no_object=None, _attributes={}, **_arguments):
+        """Get nonsimple classes: Returns an alphabetical list of classes with member functions, bases classes, or subclasses
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: undocumented, typecode 'list'
+        """
+        _code = 'MMPR'
+        _subcode = 'NsCl'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Goto_Function(self, _object, _attributes={}, **_arguments):
+        """Goto Function: Goto Specified Function Name
+        Required argument: undocumented, typecode 'TEXT'
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'MMPR'
+        _subcode = 'GoFn'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Goto_Line(self, _object, _attributes={}, **_arguments):
+        """Goto Line: Goto Specified Line Number
+        Required argument: The requested source file line number
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'MMPR'
+        _subcode = 'GoLn'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Is_In_Project(self, _object, _attributes={}, **_arguments):
+        """Is In Project: Whether or not the specified file(s) is in the current project
+        Required argument: List of files to check for project membership
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: Result code for each file
+        """
+        _code = 'MMPR'
+        _subcode = 'FInP'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_Make_Project = {
+        'ExternalEditor' : 'Errs',
+    }
+
+    def Make_Project(self, _no_object=None, _attributes={}, **_arguments):
+        """Make Project: Make the current project
+        Keyword argument ExternalEditor: Should the contents of the message window be returned to the caller?
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: Errors that occurred while making the project
+        """
+        _code = 'MMPR'
+        _subcode = 'Make'
+
+        aetools.keysubst(_arguments, self._argmap_Make_Project)
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Open_browser(self, _object, _attributes={}, **_arguments):
+        """Open browser: Display a class, member function, or data member object in a single class browser window
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'MMPR'
+        _subcode = 'Brow'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_Precompile = {
+        'Saving_As' : 'Targ',
+        'ExternalEditor' : 'Errs',
+    }
+
+    def Precompile(self, _object, _attributes={}, **_arguments):
+        """Precompile: Precompile the specified file to the specified destination file
+        Required argument: File to precompile
+        Keyword argument Saving_As: Destination file for precompiled header
+        Keyword argument ExternalEditor: Should the contents of the message window be returned to the caller?
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: Errors for the precompiled file
+        """
+        _code = 'MMPR'
+        _subcode = 'PreC'
+
+        aetools.keysubst(_arguments, self._argmap_Precompile)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_Preprocess = {
+        'ExternalEditor' : 'Errs',
+    }
+
+    def Preprocess(self, _object, _attributes={}, **_arguments):
+        """Preprocess: Preprocesses the specified file(s)
+        Required argument: undocumented, typecode 'alis'
+        Keyword argument ExternalEditor: undocumented, typecode 'bool'
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: Errors for each preprocessed file
+        """
+        _code = 'MMPR'
+        _subcode = 'PreP'
+
+        aetools.keysubst(_arguments, self._argmap_Preprocess)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Remove_Binaries(self, _no_object=None, _attributes={}, **_arguments):
+        """Remove Binaries: Remove the binary object code from the current project
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'MMPR'
+        _subcode = 'RemB'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Remove_Files(self, _object, _attributes={}, **_arguments):
+        """Remove Files: Remove the specified file(s) from the current project
+        Required argument: List of files to remove
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: Error code for each file removed
+        """
+        _code = 'MMPR'
+        _subcode = 'RemF'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Reset_File_Paths(self, _no_object=None, _attributes={}, **_arguments):
+        """Reset File Paths: Resets access paths for all files belonging to open project.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'MMPR'
+        _subcode = 'ReFP'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_Run_Project = {
+        'ExternalEditor' : 'Errs',
+        'SourceDebugger' : 'DeBg',
+    }
+
+    def Run_Project(self, _no_object=None, _attributes={}, **_arguments):
+        """Run Project: Run the current project
+        Keyword argument ExternalEditor: Should the contents of the message window be returned to the caller?
+        Keyword argument SourceDebugger: Run the application under the control of the source-level debugger
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: Errors that occurred when running the project
+        """
+        _code = 'MMPR'
+        _subcode = 'RunP'
+
+        aetools.keysubst(_arguments, self._argmap_Run_Project)
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Save_Error_Window_As(self, _object, _attributes={}, **_arguments):
+        """Save Error Window As: Saves the Errors & Warnings window as a text file
+        Required argument: Destination file for Save Message Window As
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'MMPR'
+        _subcode = 'SvMs'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Set_Current_Target(self, _object=None, _attributes={}, **_arguments):
+        """Set Current Target: Set the current target of a project
+        Required argument: Name of target
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'MMPR'
+        _subcode = 'STrg'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Set_Default_Project(self, _object, _attributes={}, **_arguments):
+        """Set Default Project: Set the default project
+        Required argument: Name of project
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'MMPR'
+        _subcode = 'SDfP'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_Set_Modification_Date = {
+        'to' : 'MDat',
+    }
+
+    def Set_Modification_Date(self, _object, _attributes={}, **_arguments):
+        """Set Modification Date: Changes the internal modification date of the specified file(s)
+        Required argument: List of files
+        Keyword argument to: undocumented, typecode 'ldt '
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: Error code for each modified file
+        """
+        _code = 'MMPR'
+        _subcode = 'SMod'
+
+        aetools.keysubst(_arguments, self._argmap_Set_Modification_Date)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_Set_Preferences = {
+        'of_panel' : 'PNam',
+        'to' : 'PRec',
+    }
+
+    def Set_Preferences(self, _no_object=None, _attributes={}, **_arguments):
+        """Set Preferences: Set the preferences for the current project
+        Keyword argument of_panel: Name of the preference panel
+        Keyword argument to: Preferences settings
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'MMPR'
+        _subcode = 'Pref'
+
+        aetools.keysubst(_arguments, self._argmap_Set_Preferences)
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_Set_Project_File = {
+        'to' : 'SrcS',
+    }
+
+    def Set_Project_File(self, _object, _attributes={}, **_arguments):
+        """Set Project File: Changes the settings for a given file in the project.
+        Required argument: The name of the file
+        Keyword argument to: The new settings for the file
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'MMPR'
+        _subcode = 'SFil'
+
+        aetools.keysubst(_arguments, self._argmap_Set_Project_File)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_Set_Segment = {
+        'to' : 'Segm',
+    }
+
+    def Set_Segment(self, _object, _attributes={}, **_arguments):
+        """Set Segment: Changes the name and attributes of a segment.
+        Required argument: The segment to change
+        Keyword argument to: The new name and attributes for the segment.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'MMPR'
+        _subcode = 'SSeg'
+
+        aetools.keysubst(_arguments, self._argmap_Set_Segment)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Touch(self, _object, _attributes={}, **_arguments):
+        """Touch: Force recompilation of the specified file(s)
+        Required argument: List of files to compile
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: Error code for each file touched
+        """
+        _code = 'MMPR'
+        _subcode = 'Toch'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_Update_Project = {
+        'ExternalEditor' : 'Errs',
+    }
+
+    def Update_Project(self, _no_object=None, _attributes={}, **_arguments):
+        """Update Project: Update the current project
+        Keyword argument ExternalEditor: Should the contents of the message window be returned to the caller?
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: Errors that occurred while updating the project
+        """
+        _code = 'MMPR'
+        _subcode = 'UpdP'
+
+        aetools.keysubst(_arguments, self._argmap_Update_Project)
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 class Browser_Coloring(aetools.ComponentItem):
-	"""Browser Coloring - Colors for Browser symbols. """
-	want = 'BRKW'
+    """Browser Coloring - Colors for Browser symbols. """
+    want = 'BRKW'
 class _Prop_Browser_Keywords(aetools.NProperty):
-	"""Browser Keywords - Mark Browser symbols with color. """
-	which = 'BW00'
-	want = 'bool'
+    """Browser Keywords - Mark Browser symbols with color. """
+    which = 'BW00'
+    want = 'bool'
 class _Prop_Classes_Color(aetools.NProperty):
-	"""Classes Color - The color for classes. """
-	which = 'BW01'
-	want = 'cRGB'
+    """Classes Color - The color for classes. """
+    which = 'BW01'
+    want = 'cRGB'
 class _Prop_Constants_Color(aetools.NProperty):
-	"""Constants Color - The color for constants. """
-	which = 'BW02'
-	want = 'cRGB'
+    """Constants Color - The color for constants. """
+    which = 'BW02'
+    want = 'cRGB'
 class _Prop_Enums_Color(aetools.NProperty):
-	"""Enums Color - The color for enums. """
-	which = 'BW03'
-	want = 'cRGB'
+    """Enums Color - The color for enums. """
+    which = 'BW03'
+    want = 'cRGB'
 class _Prop_Functions_Color(aetools.NProperty):
-	"""Functions Color - Set color for functions. """
-	which = 'BW04'
-	want = 'cRGB'
+    """Functions Color - Set color for functions. """
+    which = 'BW04'
+    want = 'cRGB'
 class _Prop_Globals_Color(aetools.NProperty):
-	"""Globals Color - The color for globals """
-	which = 'BW05'
-	want = 'cRGB'
+    """Globals Color - The color for globals """
+    which = 'BW05'
+    want = 'cRGB'
 class _Prop_Macros_Color(aetools.NProperty):
-	"""Macros Color - The color for macros. """
-	which = 'BW06'
-	want = 'cRGB'
+    """Macros Color - The color for macros. """
+    which = 'BW06'
+    want = 'cRGB'
 class _Prop_Template_Commands_in_Menu(aetools.NProperty):
-	"""Template Commands in Menu - Include template commands in context menus """
-	which = 'BW10'
-	want = 'bool'
+    """Template Commands in Menu - Include template commands in context menus """
+    which = 'BW10'
+    want = 'bool'
 class _Prop_Templates_Color(aetools.NProperty):
-	"""Templates Color - Set color for templates. """
-	which = 'BW07'
-	want = 'cRGB'
+    """Templates Color - Set color for templates. """
+    which = 'BW07'
+    want = 'cRGB'
 class _Prop_Typedefs_Color(aetools.NProperty):
-	"""Typedefs Color - The color for typedefs. """
-	which = 'BW08'
-	want = 'cRGB'
+    """Typedefs Color - The color for typedefs. """
+    which = 'BW08'
+    want = 'cRGB'
 
 class Build_Settings(aetools.ComponentItem):
-	"""Build Settings - Build Settings preferences. """
-	want = 'BSTG'
+    """Build Settings - Build Settings preferences. """
+    want = 'BSTG'
 class _Prop_Build_Before_Running(aetools.NProperty):
-	"""Build Before Running - Build the target before running. """
-	which = 'BX04'
-	want = 'BXbr'
+    """Build Before Running - Build the target before running. """
+    which = 'BX04'
+    want = 'BXbr'
 class _Prop_Compiler_Thread_Stack_Size(aetools.NProperty):
-	"""Compiler Thread Stack Size - Compiler Thread Stack Size """
-	which = 'BX06'
-	want = 'long'
+    """Compiler Thread Stack Size - Compiler Thread Stack Size """
+    which = 'BX06'
+    want = 'long'
 class _Prop_Completion_Sound(aetools.NProperty):
-	"""Completion Sound - Play a sound when finished a Bring Up To Date or Make command. """
-	which = 'BX01'
-	want = 'bool'
+    """Completion Sound - Play a sound when finished a Bring Up To Date or Make command. """
+    which = 'BX01'
+    want = 'bool'
 class _Prop_Failure_Sound(aetools.NProperty):
-	"""Failure Sound - The sound CodeWarrior plays when it cannot finish a Bring Up To Date or Make command. """
-	which = 'BX03'
-	want = 'TEXT'
+    """Failure Sound - The sound CodeWarrior plays when it cannot finish a Bring Up To Date or Make command. """
+    which = 'BX03'
+    want = 'TEXT'
 class _Prop_Include_Cache_Size(aetools.NProperty):
-	"""Include Cache Size - Include file cache size. """
-	which = 'BX05'
-	want = 'long'
+    """Include Cache Size - Include file cache size. """
+    which = 'BX05'
+    want = 'long'
 class _Prop_Save_Before_Building(aetools.NProperty):
-	"""Save Before Building - Save open editor files before build operations """
-	which = 'BX07'
-	want = 'bool'
+    """Save Before Building - Save open editor files before build operations """
+    which = 'BX07'
+    want = 'bool'
 class _Prop_Success_Sound(aetools.NProperty):
-	"""Success Sound - The sound CodeWarrior plays when it successfully finishes a Bring Up To Date or Make command. """
-	which = 'BX02'
-	want = 'TEXT'
+    """Success Sound - The sound CodeWarrior plays when it successfully finishes a Bring Up To Date or Make command. """
+    which = 'BX02'
+    want = 'TEXT'
 
 class base_class(aetools.ComponentItem):
-	"""base class - A base class or super class of a class """
-	want = 'BsCl'
+    """base class - A base class or super class of a class """
+    want = 'BsCl'
 class _Prop_access(aetools.NProperty):
-	"""access -  """
-	which = 'Acce'
-	want = 'Acce'
+    """access -  """
+    which = 'Acce'
+    want = 'Acce'
 class _Prop_class_(aetools.NProperty):
-	"""class - The class object corresponding to this base class """
-	which = 'Clas'
-	want = 'obj '
+    """class - The class object corresponding to this base class """
+    which = 'Clas'
+    want = 'obj '
 class _Prop_virtual(aetools.NProperty):
-	"""virtual -  """
-	which = 'Virt'
-	want = 'bool'
+    """virtual -  """
+    which = 'Virt'
+    want = 'bool'
 
 base_classes = base_class
 
 class Custom_Keywords(aetools.ComponentItem):
-	"""Custom Keywords -  """
-	want = 'CUKW'
+    """Custom Keywords -  """
+    want = 'CUKW'
 class _Prop_Custom_Color_1(aetools.NProperty):
-	"""Custom Color 1 - The color for the first set of custom keywords. """
-	which = 'GH05'
-	want = 'cRGB'
+    """Custom Color 1 - The color for the first set of custom keywords. """
+    which = 'GH05'
+    want = 'cRGB'
 class _Prop_Custom_Color_2(aetools.NProperty):
-	"""Custom Color 2 - The color for the second set custom keywords. """
-	which = 'GH06'
-	want = 'cRGB'
+    """Custom Color 2 - The color for the second set custom keywords. """
+    which = 'GH06'
+    want = 'cRGB'
 class _Prop_Custom_Color_3(aetools.NProperty):
-	"""Custom Color 3 - The color for the third set of custom keywords. """
-	which = 'GH07'
-	want = 'cRGB'
+    """Custom Color 3 - The color for the third set of custom keywords. """
+    which = 'GH07'
+    want = 'cRGB'
 class _Prop_Custom_Color_4(aetools.NProperty):
-	"""Custom Color 4 - The color for the fourth set of custom keywords. """
-	which = 'GH08'
-	want = 'cRGB'
+    """Custom Color 4 - The color for the fourth set of custom keywords. """
+    which = 'GH08'
+    want = 'cRGB'
 
 class browser_catalog(aetools.ComponentItem):
-	"""browser catalog - The browser symbol catalog for the current project """
-	want = 'Cata'
+    """browser catalog - The browser symbol catalog for the current project """
+    want = 'Cata'
 #        element 'Clas' as ['indx', 'name']
 
 class class_(aetools.ComponentItem):
-	"""class - A class, struct, or record type in the current project. """
-	want = 'Clas'
+    """class - A class, struct, or record type in the current project. """
+    want = 'Clas'
 class _Prop_all_subclasses(aetools.NProperty):
-	"""all subclasses - the classes directly or indirectly derived from this class """
-	which = 'SubA'
-	want = 'Clas'
+    """all subclasses - the classes directly or indirectly derived from this class """
+    which = 'SubA'
+    want = 'Clas'
 class _Prop_declaration_end_offset(aetools.NProperty):
-	"""declaration end offset - End of class declaration """
-	which = 'DcEn'
-	want = 'long'
+    """declaration end offset - End of class declaration """
+    which = 'DcEn'
+    want = 'long'
 class _Prop_declaration_file(aetools.NProperty):
-	"""declaration file - Source file containing the class declaration """
-	which = 'DcFl'
-	want = 'fss '
+    """declaration file - Source file containing the class declaration """
+    which = 'DcFl'
+    want = 'fss '
 class _Prop_declaration_start_offset(aetools.NProperty):
-	"""declaration start offset - Start of class declaration source code """
-	which = 'DcSt'
-	want = 'long'
+    """declaration start offset - Start of class declaration source code """
+    which = 'DcSt'
+    want = 'long'
 class _Prop_language(aetools.NProperty):
-	"""language - Implementation language of this class """
-	which = 'Lang'
-	want = 'Lang'
+    """language - Implementation language of this class """
+    which = 'Lang'
+    want = 'Lang'
 class _Prop_name(aetools.NProperty):
-	"""name -  """
-	which = 'pnam'
-	want = 'TEXT'
+    """name -  """
+    which = 'pnam'
+    want = 'TEXT'
 class _Prop_subclasses(aetools.NProperty):
-	"""subclasses - the immediate subclasses of this class """
-	which = 'SubC'
-	want = 'Clas'
+    """subclasses - the immediate subclasses of this class """
+    which = 'SubC'
+    want = 'Clas'
 #        element 'BsCl' as ['indx']
 #        element 'DtMb' as ['indx', 'name']
 #        element 'MbFn' as ['indx', 'name']
@@ -947,737 +947,737 @@ class _Prop_subclasses(aetools.NProperty):
 classes = class_
 
 class Debugger_Display(aetools.ComponentItem):
-	"""Debugger Display - Debugger Display preferences """
-	want = 'DbDS'
+    """Debugger Display - Debugger Display preferences """
+    want = 'DbDS'
 class _Prop_Default_Array_Size(aetools.NProperty):
-	"""Default Array Size - Controls whether CodeWarrior uses its own integrated editor or an external application for editing text files. """
-	which = 'Db08'
-	want = 'shor'
+    """Default Array Size - Controls whether CodeWarrior uses its own integrated editor or an external application for editing text files. """
+    which = 'Db08'
+    want = 'shor'
 class _Prop_Show_As_Decimal(aetools.NProperty):
-	"""Show As Decimal - Show variable values as decimal by default """
-	which = 'Db10'
-	want = 'bool'
+    """Show As Decimal - Show variable values as decimal by default """
+    which = 'Db10'
+    want = 'bool'
 class _Prop_Show_Locals(aetools.NProperty):
-	"""Show Locals - Show locals by default """
-	which = 'Db09'
-	want = 'bool'
+    """Show Locals - Show locals by default """
+    which = 'Db09'
+    want = 'bool'
 class _Prop_Show_Variable_Types(aetools.NProperty):
-	"""Show Variable Types - Show variable types by default. """
-	which = 'Db01'
-	want = 'bool'
+    """Show Variable Types - Show variable types by default. """
+    which = 'Db01'
+    want = 'bool'
 class _Prop_Sort_By_Method(aetools.NProperty):
-	"""Sort By Method - Sort functions by method. """
-	which = 'Db02'
-	want = 'bool'
+    """Sort By Method - Sort functions by method. """
+    which = 'Db02'
+    want = 'bool'
 class _Prop_Threads_in_Window(aetools.NProperty):
-	"""Threads in Window - Show threads in separate windows. """
-	which = 'Db04'
-	want = 'bool'
+    """Threads in Window - Show threads in separate windows. """
+    which = 'Db04'
+    want = 'bool'
 class _Prop_Use_RTTI(aetools.NProperty):
-	"""Use RTTI - Enable RunTime Type Information. """
-	which = 'Db03'
-	want = 'bool'
+    """Use RTTI - Enable RunTime Type Information. """
+    which = 'Db03'
+    want = 'bool'
 class _Prop_Variable_Changed_Hilite(aetools.NProperty):
-	"""Variable Changed Hilite - Variable changed hilite color. """
-	which = 'Db07'
-	want = 'cRGB'
+    """Variable Changed Hilite - Variable changed hilite color. """
+    which = 'Db07'
+    want = 'cRGB'
 class _Prop_Variable_Hints(aetools.NProperty):
-	"""Variable Hints - Show variable hints. """
-	which = 'Db05'
-	want = 'bool'
+    """Variable Hints - Show variable hints. """
+    which = 'Db05'
+    want = 'bool'
 class _Prop_Watchpoint_Hilite(aetools.NProperty):
-	"""Watchpoint Hilite - Watchpoint hilite color. """
-	which = 'Db06'
-	want = 'cRGB'
+    """Watchpoint Hilite - Watchpoint hilite color. """
+    which = 'Db06'
+    want = 'cRGB'
 
 class Debugger_Global(aetools.ComponentItem):
-	"""Debugger Global - Debugger Global preferences """
-	want = 'DbGL'
+    """Debugger Global - Debugger Global preferences """
+    want = 'DbGL'
 class _Prop_Auto_Target_Libraries(aetools.NProperty):
-	"""Auto Target Libraries - Automatically target libraries when debugging """
-	which = 'Dg11'
-	want = 'bool'
+    """Auto Target Libraries - Automatically target libraries when debugging """
+    which = 'Dg11'
+    want = 'bool'
 class _Prop_Cache_Edited_Files(aetools.NProperty):
-	"""Cache Edited Files - Cache edit files between debug sessions """
-	which = 'Dg12'
-	want = 'bool'
+    """Cache Edited Files - Cache edit files between debug sessions """
+    which = 'Dg12'
+    want = 'bool'
 class _Prop_Confirm_Kill(aetools.NProperty):
-	"""Confirm Kill - Confirm the \xd4killing\xd5 of the process. """
-	which = 'Dg04'
-	want = 'bool'
+    """Confirm Kill - Confirm the \xd4killing\xd5 of the process. """
+    which = 'Dg04'
+    want = 'bool'
 class _Prop_Dont_Step_in_Runtime(aetools.NProperty):
-	"""Dont Step in Runtime - Don\xd5t step into runtime code when debugging. """
-	which = 'Dg07'
-	want = 'bool'
+    """Dont Step in Runtime - Don\xd5t step into runtime code when debugging. """
+    which = 'Dg07'
+    want = 'bool'
 class _Prop_File_Cache_Duration(aetools.NProperty):
-	"""File Cache Duration - Duration to keep files in cache (in days) """
-	which = 'Dg13'
-	want = 'shor'
+    """File Cache Duration - Duration to keep files in cache (in days) """
+    which = 'Dg13'
+    want = 'shor'
 class _Prop_Ignore_Mod_Dates(aetools.NProperty):
-	"""Ignore Mod Dates - Ignore modification dates of files. """
-	which = 'Dg01'
-	want = 'bool'
+    """Ignore Mod Dates - Ignore modification dates of files. """
+    which = 'Dg01'
+    want = 'bool'
 class _Prop_Launch_Apps_on_Open(aetools.NProperty):
-	"""Launch Apps on Open - Launch applications on the opening of sym files. """
-	which = 'Dg03'
-	want = 'bool'
+    """Launch Apps on Open - Launch applications on the opening of sym files. """
+    which = 'Dg03'
+    want = 'bool'
 class _Prop_Open_All_Classes(aetools.NProperty):
-	"""Open All Classes - Open all Java class files. """
-	which = 'Dg02'
-	want = 'bool'
+    """Open All Classes - Open all Java class files. """
+    which = 'Dg02'
+    want = 'bool'
 class _Prop_Select_Stack_Crawl(aetools.NProperty):
-	"""Select Stack Crawl - Select the stack crawl. """
-	which = 'Dg06'
-	want = 'bool'
+    """Select Stack Crawl - Select the stack crawl. """
+    which = 'Dg06'
+    want = 'bool'
 class _Prop_Stop_at_Main(aetools.NProperty):
-	"""Stop at Main - Stop to debug on the main() function. """
-	which = 'Dg05'
-	want = 'bool'
+    """Stop at Main - Stop to debug on the main() function. """
+    which = 'Dg05'
+    want = 'bool'
 
 class Debugger_Target(aetools.ComponentItem):
-	"""Debugger Target - Debugger Target preferences """
-	want = 'DbTG'
+    """Debugger Target - Debugger Target preferences """
+    want = 'DbTG'
 class _Prop_Cache_symbolics(aetools.NProperty):
-	"""Cache symbolics - Cache symbolics between runs when executable doesn\xd5t change, else release symbolics files after killing process. """
-	which = 'Dt15'
-	want = 'bool'
+    """Cache symbolics - Cache symbolics between runs when executable doesn\xd5t change, else release symbolics files after killing process. """
+    which = 'Dt15'
+    want = 'bool'
 class _Prop_Data_Update_Interval(aetools.NProperty):
-	"""Data Update Interval - How often to update the data while running (in seconds) """
-	which = 'Dt09'
-	want = 'long'
+    """Data Update Interval - How often to update the data while running (in seconds) """
+    which = 'Dt09'
+    want = 'long'
 class _Prop_Log_System_Messages(aetools.NProperty):
-	"""Log System Messages - Log all system messages while debugging. """
-	which = 'Dt02'
-	want = 'bool'
+    """Log System Messages - Log all system messages while debugging. """
+    which = 'Dt02'
+    want = 'bool'
 class _Prop_Relocated_Executable_Path(aetools.NProperty):
-	"""Relocated Executable Path - Path to location of relocated libraries, code resources or remote debugging folder """
-	which = 'Dt10'
-	want = 'RlPt'
+    """Relocated Executable Path - Path to location of relocated libraries, code resources or remote debugging folder """
+    which = 'Dt10'
+    want = 'RlPt'
 class _Prop_Stop_at_temp_breakpoint(aetools.NProperty):
-	"""Stop at temp breakpoint - Stop at a temp breakpoint on program launch. Set breakpoint type in Temp Breakpoint Type AppleEvent. """
-	which = 'Dt13'
-	want = 'bool'
+    """Stop at temp breakpoint - Stop at a temp breakpoint on program launch. Set breakpoint type in Temp Breakpoint Type AppleEvent. """
+    which = 'Dt13'
+    want = 'bool'
 class _Prop_Temp_Breakpoint_Type(aetools.NProperty):
-	"""Temp Breakpoint Type - Type of temp breakpoint to set on program launch. """
-	which = 'Dt16'
-	want = 'TmpB'
+    """Temp Breakpoint Type - Type of temp breakpoint to set on program launch. """
+    which = 'Dt16'
+    want = 'TmpB'
 class _Prop_Temp_breakpoint_names(aetools.NProperty):
-	"""Temp breakpoint names - Comma separated list of names to attempt to stop at on program launch. First symbol to resolve in list is the temp BP that will be set. """
-	which = 'Dt14'
-	want = 'ctxt'
+    """Temp breakpoint names - Comma separated list of names to attempt to stop at on program launch. First symbol to resolve in list is the temp BP that will be set. """
+    which = 'Dt14'
+    want = 'ctxt'
 class _Prop_Update_Data_While_Running(aetools.NProperty):
-	"""Update Data While Running - Should pause to update data while running """
-	which = 'Dt08'
-	want = 'bool'
+    """Update Data While Running - Should pause to update data while running """
+    which = 'Dt08'
+    want = 'bool'
 
 class Debugger_Windowing(aetools.ComponentItem):
-	"""Debugger Windowing -  """
-	want = 'DbWN'
+    """Debugger Windowing -  """
+    want = 'DbWN'
 class _Prop_Debugging_Start_Action(aetools.NProperty):
-	"""Debugging Start Action - What action to take when debug session starts """
-	which = 'Dw01'
-	want = 'DbSA'
+    """Debugging Start Action - What action to take when debug session starts """
+    which = 'Dw01'
+    want = 'DbSA'
 class _Prop_Do_Nothing_To_Projects(aetools.NProperty):
-	"""Do Nothing To Projects - Suppress debugging start action for project windows """
-	which = 'Dw02'
-	want = 'bool'
+    """Do Nothing To Projects - Suppress debugging start action for project windows """
+    which = 'Dw02'
+    want = 'bool'
 
 class data_member(aetools.ComponentItem):
-	"""data member - A class data member or field """
-	want = 'DtMb'
+    """data member - A class data member or field """
+    want = 'DtMb'
 class _Prop_static(aetools.NProperty):
-	"""static -  """
-	which = 'Stat'
-	want = 'bool'
+    """static -  """
+    which = 'Stat'
+    want = 'bool'
 
 data_members = data_member
 
 class Editor(aetools.ComponentItem):
-	"""Editor -  """
-	want = 'EDTR'
+    """Editor -  """
+    want = 'EDTR'
 class _Prop_Background_Color(aetools.NProperty):
-	"""Background Color - Color of the background of editor windows. """
-	which = 'ED13'
-	want = 'cRGB'
+    """Background Color - Color of the background of editor windows. """
+    which = 'ED13'
+    want = 'cRGB'
 class _Prop_Balance(aetools.NProperty):
-	"""Balance - Flash the matching opening bracket when you type a closing bracket. """
-	which = 'ED03'
-	want = 'bool'
+    """Balance - Flash the matching opening bracket when you type a closing bracket. """
+    which = 'ED03'
+    want = 'bool'
 class _Prop_Context_Popup_Delay(aetools.NProperty):
-	"""Context Popup Delay - The amount of time, in sixtieths of a second, before the context popup is displayed if you click and hold on a browser symbol. """
-	which = 'ED14'
-	want = 'long'
+    """Context Popup Delay - The amount of time, in sixtieths of a second, before the context popup is displayed if you click and hold on a browser symbol. """
+    which = 'ED14'
+    want = 'long'
 class _Prop_Default_Text_File_Format(aetools.NProperty):
-	"""Default Text File Format - Default text file format (i.e. which type of line endings to use) """
-	which = 'ED17'
-	want = 'TxtF'
+    """Default Text File Format - Default text file format (i.e. which type of line endings to use) """
+    which = 'ED17'
+    want = 'TxtF'
 class _Prop_Dynamic_Scroll(aetools.NProperty):
-	"""Dynamic Scroll - Display a window\xd5s contents as you move the scroll box. """
-	which = 'ED02'
-	want = 'bool'
+    """Dynamic Scroll - Display a window\xd5s contents as you move the scroll box. """
+    which = 'ED02'
+    want = 'bool'
 class _Prop_Flash_Delay(aetools.NProperty):
-	"""Flash Delay - The amount of time, in sixtieths of a second, the editor highlights a matching bracket. """
-	which = 'ED01'
-	want = 'long'
+    """Flash Delay - The amount of time, in sixtieths of a second, the editor highlights a matching bracket. """
+    which = 'ED01'
+    want = 'long'
 class _Prop_Left_Margin_Line_Select(aetools.NProperty):
-	"""Left Margin Line Select - Clicking in the left margin selects lines """
-	which = 'ED16'
-	want = 'bool'
+    """Left Margin Line Select - Clicking in the left margin selects lines """
+    which = 'ED16'
+    want = 'bool'
 class _Prop_Main_Text_Color(aetools.NProperty):
-	"""Main Text Color - Main, default, color for text. """
-	which = 'ED12'
-	want = 'cRGB'
+    """Main Text Color - Main, default, color for text. """
+    which = 'ED12'
+    want = 'cRGB'
 class _Prop_Relaxed_C_Popup_Parsing(aetools.NProperty):
-	"""Relaxed C Popup Parsing - Relax the function parser for C source files """
-	which = 'ED15'
-	want = 'bool'
+    """Relaxed C Popup Parsing - Relax the function parser for C source files """
+    which = 'ED15'
+    want = 'bool'
 class _Prop_Remember_Font(aetools.NProperty):
-	"""Remember Font - Display a source file with its own font settings. """
-	which = 'ED08'
-	want = 'bool'
+    """Remember Font - Display a source file with its own font settings. """
+    which = 'ED08'
+    want = 'bool'
 class _Prop_Remember_Selection(aetools.NProperty):
-	"""Remember Selection - Restore the previous selection in a file when you open it. """
-	which = 'ED09'
-	want = 'bool'
+    """Remember Selection - Restore the previous selection in a file when you open it. """
+    which = 'ED09'
+    want = 'bool'
 class _Prop_Remember_Window(aetools.NProperty):
-	"""Remember Window - Restore the last size and position for a source file window when you open it. """
-	which = 'ED10'
-	want = 'bool'
+    """Remember Window - Restore the last size and position for a source file window when you open it. """
+    which = 'ED10'
+    want = 'bool'
 class _Prop_Sort_Function_Popup(aetools.NProperty):
-	"""Sort Function Popup -  """
-	which = 'ED06'
-	want = 'bool'
+    """Sort Function Popup -  """
+    which = 'ED06'
+    want = 'bool'
 class _Prop_Use_Drag__26__Drop_Editing(aetools.NProperty):
-	"""Use Drag & Drop Editing - Use Drag & Drop text editing. """
-	which = 'ED04'
-	want = 'bool'
+    """Use Drag & Drop Editing - Use Drag & Drop text editing. """
+    which = 'ED04'
+    want = 'bool'
 class _Prop_Use_Multiple_Undo(aetools.NProperty):
-	"""Use Multiple Undo -  """
-	which = 'ED07'
-	want = 'bool'
+    """Use Multiple Undo -  """
+    which = 'ED07'
+    want = 'bool'
 
 class Environment_Variable(aetools.ComponentItem):
-	"""Environment Variable - Environment variable for host OS """
-	want = 'EnvV'
+    """Environment Variable - Environment variable for host OS """
+    want = 'EnvV'
 class _Prop_value(aetools.NProperty):
-	"""value - Value of the environment variable """
-	which = 'Valu'
-	want = 'TEXT'
+    """value - Value of the environment variable """
+    which = 'Valu'
+    want = 'TEXT'
 
 class Error_Information(aetools.ComponentItem):
-	"""Error Information - Describes a single error or warning from the compiler or the linker. """
-	want = 'ErrM'
+    """Error Information - Describes a single error or warning from the compiler or the linker. """
+    want = 'ErrM'
 class _Prop_disk_file(aetools.NProperty):
-	"""disk file - The file where the error occurred.  May not be returned for certain kinds of errors (eg, link errors). """
-	which = 'file'
-	want = 'fss '
+    """disk file - The file where the error occurred.  May not be returned for certain kinds of errors (eg, link errors). """
+    which = 'file'
+    want = 'fss '
 class _Prop_lineNumber(aetools.NProperty):
-	"""lineNumber - The line in the file where the error occurred.  May not be returned for certain kinds of errors (eg, link errors). """
-	which = 'ErrL'
-	want = 'long'
+    """lineNumber - The line in the file where the error occurred.  May not be returned for certain kinds of errors (eg, link errors). """
+    which = 'ErrL'
+    want = 'long'
 class _Prop_message(aetools.NProperty):
-	"""message - The error or warning message. """
-	which = 'ErrS'
-	want = 'TEXT'
+    """message - The error or warning message. """
+    which = 'ErrS'
+    want = 'TEXT'
 class _Prop_messageKind(aetools.NProperty):
-	"""messageKind - The type of error or warning. """
-	which = 'ErrT'
-	want = 'ErrT'
+    """messageKind - The type of error or warning. """
+    which = 'ErrT'
+    want = 'ErrT'
 
 class Function_Information(aetools.ComponentItem):
-	"""Function Information - Describes the location of any function or global data definition within the current project. """
-	want = 'FDef'
+    """Function Information - Describes the location of any function or global data definition within the current project. """
+    want = 'FDef'
 
 class File_Mappings(aetools.ComponentItem):
-	"""File Mappings - Mappings of extensions & file types to compilers """
-	want = 'FLMP'
+    """File Mappings - Mappings of extensions & file types to compilers """
+    want = 'FLMP'
 class _Prop_Mappings(aetools.NProperty):
-	"""Mappings -  """
-	which = 'FMps'
-	want = 'FMap'
+    """Mappings -  """
+    which = 'FMps'
+    want = 'FMap'
 
 class File_Mapping(aetools.ComponentItem):
-	"""File Mapping -  """
-	want = 'FMap'
+    """File Mapping -  """
+    want = 'FMap'
 class _Prop_Compiler(aetools.NProperty):
-	"""Compiler -  """
-	which = 'TA07'
-	want = 'TEXT'
+    """Compiler -  """
+    which = 'TA07'
+    want = 'TEXT'
 class _Prop_Extension(aetools.NProperty):
-	"""Extension -  """
-	which = 'TA02'
-	want = 'TEXT'
+    """Extension -  """
+    which = 'TA02'
+    want = 'TEXT'
 class _Prop_File_Type(aetools.NProperty):
-	"""File Type -  """
-	which = 'PR04'
-	want = 'TEXT'
+    """File Type -  """
+    which = 'PR04'
+    want = 'TEXT'
 class _Prop_Ignored_by_Make(aetools.NProperty):
-	"""Ignored by Make -  """
-	which = 'TA06'
-	want = 'bool'
+    """Ignored by Make -  """
+    which = 'TA06'
+    want = 'bool'
 class _Prop_Launchable(aetools.NProperty):
-	"""Launchable -  """
-	which = 'TA05'
-	want = 'bool'
+    """Launchable -  """
+    which = 'TA05'
+    want = 'bool'
 class _Prop_Precompiled(aetools.NProperty):
-	"""Precompiled -  """
-	which = 'TA03'
-	want = 'bool'
+    """Precompiled -  """
+    which = 'TA03'
+    want = 'bool'
 class _Prop_Resource_File(aetools.NProperty):
-	"""Resource File -  """
-	which = 'TA04'
-	want = 'bool'
+    """Resource File -  """
+    which = 'TA04'
+    want = 'bool'
 
 class Global_Source_Trees(aetools.ComponentItem):
-	"""Global Source Trees - Globally-defined source tree roots """
-	want = 'GSTs'
+    """Global Source Trees - Globally-defined source tree roots """
+    want = 'GSTs'
 class _Prop_Source_Trees(aetools.NProperty):
-	"""Source Trees - List of source tree roots """
-	which = 'ST01'
-	want = 'SrcT'
+    """Source Trees - List of source tree roots """
+    which = 'ST01'
+    want = 'SrcT'
 
 class Extras(aetools.ComponentItem):
-	"""Extras -  """
-	want = 'GXTR'
+    """Extras -  """
+    want = 'GXTR'
 class _Prop_Automatic_Toolbar_Help(aetools.NProperty):
-	"""Automatic Toolbar Help - Automatically show balloon help in toolbar after delay """
-	which = 'EX19'
-	want = 'bool'
+    """Automatic Toolbar Help - Automatically show balloon help in toolbar after delay """
+    which = 'EX19'
+    want = 'bool'
 class _Prop_External_Reference(aetools.NProperty):
-	"""External Reference - Which on-line function reference to use. """
-	which = 'EX08'
-	want = 'RefP'
+    """External Reference - Which on-line function reference to use. """
+    which = 'EX08'
+    want = 'RefP'
 class _Prop_Full_Screen_Zoom(aetools.NProperty):
-	"""Full Screen Zoom - Zoom windows to the full screen width. """
-	which = 'EX07'
-	want = 'bool'
+    """Full Screen Zoom - Zoom windows to the full screen width. """
+    which = 'EX07'
+    want = 'bool'
 class _Prop_Recent_Editor_Count(aetools.NProperty):
-	"""Recent Editor Count - Maximum number of editor documents to show in the \xd2Open Recent\xd3 menu """
-	which = 'EX16'
-	want = 'shor'
+    """Recent Editor Count - Maximum number of editor documents to show in the \xd2Open Recent\xd3 menu """
+    which = 'EX16'
+    want = 'shor'
 class _Prop_Recent_Project_Count(aetools.NProperty):
-	"""Recent Project Count - Maximum number of project documents to show in the \xd2Open Recent\xd3 menu """
-	which = 'EX17'
-	want = 'shor'
+    """Recent Project Count - Maximum number of project documents to show in the \xd2Open Recent\xd3 menu """
+    which = 'EX17'
+    want = 'shor'
 class _Prop_Use_Editor_Extensions(aetools.NProperty):
-	"""Use Editor Extensions - Controls the use of the Editor Extensions menu """
-	which = 'EX10'
-	want = 'bool'
+    """Use Editor Extensions - Controls the use of the Editor Extensions menu """
+    which = 'EX10'
+    want = 'bool'
 class _Prop_Use_External_Editor(aetools.NProperty):
-	"""Use External Editor - Controls whether CodeWarrior uses its own integrated editor or an external application for editing text files. """
-	which = 'EX11'
-	want = 'bool'
+    """Use External Editor - Controls whether CodeWarrior uses its own integrated editor or an external application for editing text files. """
+    which = 'EX11'
+    want = 'bool'
 class _Prop_Use_Script_Menu(aetools.NProperty):
-	"""Use Script Menu - Controls the use of the AppleScript menu """
-	which = 'EX12'
-	want = 'bool'
+    """Use Script Menu - Controls the use of the AppleScript menu """
+    which = 'EX12'
+    want = 'bool'
 class _Prop_Use_ToolServer_Menu(aetools.NProperty):
-	"""Use ToolServer Menu - Controls the use of the ToolServer menu """
-	which = 'EX18'
-	want = 'bool'
+    """Use ToolServer Menu - Controls the use of the ToolServer menu """
+    which = 'EX18'
+    want = 'bool'
 
 class Build_Extras(aetools.ComponentItem):
-	"""Build Extras -  """
-	want = 'LXTR'
+    """Build Extras -  """
+    want = 'LXTR'
 class _Prop_Browser_Active(aetools.NProperty):
-	"""Browser Active - Allow the collection of browser information. """
-	which = 'EX09'
-	want = 'bool'
+    """Browser Active - Allow the collection of browser information. """
+    which = 'EX09'
+    want = 'bool'
 class _Prop_Cache_Subproject_Data(aetools.NProperty):
-	"""Cache Subproject Data -  """
-	which = 'EX31'
-	want = 'bool'
+    """Cache Subproject Data -  """
+    which = 'EX31'
+    want = 'bool'
 class _Prop_Dump_Browser_Info(aetools.NProperty):
-	"""Dump Browser Info -  """
-	which = 'EX30'
-	want = 'bool'
+    """Dump Browser Info -  """
+    which = 'EX30'
+    want = 'bool'
 class _Prop_Modification_Date_Caching(aetools.NProperty):
-	"""Modification Date Caching -  """
-	which = 'EX04'
-	want = 'bool'
+    """Modification Date Caching -  """
+    which = 'EX04'
+    want = 'bool'
 
 class member_function(aetools.ComponentItem):
-	"""member function - A class member function or method. """
-	want = 'MbFn'
+    """member function - A class member function or method. """
+    want = 'MbFn'
 class _Prop_implementation_end_offset(aetools.NProperty):
-	"""implementation end offset - end of member function definition """
-	which = 'DfEn'
-	want = 'long'
+    """implementation end offset - end of member function definition """
+    which = 'DfEn'
+    want = 'long'
 class _Prop_implementation_file(aetools.NProperty):
-	"""implementation file - Source file containing the member function definition """
-	which = 'DfFl'
-	want = 'fss '
+    """implementation file - Source file containing the member function definition """
+    which = 'DfFl'
+    want = 'fss '
 class _Prop_implementation_start_offset(aetools.NProperty):
-	"""implementation start offset - start of member function definition source code """
-	which = 'DfSt'
-	want = 'long'
+    """implementation start offset - start of member function definition source code """
+    which = 'DfSt'
+    want = 'long'
 
 member_functions = member_function
 
 class Access_Paths(aetools.ComponentItem):
-	"""Access Paths - Contains the definitions of a project\xd5s access (search) paths. """
-	want = 'PATH'
+    """Access Paths - Contains the definitions of a project\xd5s access (search) paths. """
+    want = 'PATH'
 class _Prop_Always_Full_Search(aetools.NProperty):
-	"""Always Full Search - To force the compiler to search for system includes like it searches for user includes. """
-	which = 'PA02'
-	want = 'bool'
+    """Always Full Search - To force the compiler to search for system includes like it searches for user includes. """
+    which = 'PA02'
+    want = 'bool'
 class _Prop_Convert_Paths(aetools.NProperty):
-	"""Convert Paths - Enables conversion of DOS & Unix-style relative paths when searching for files. """
-	which = 'PA04'
-	want = 'bool'
+    """Convert Paths - Enables conversion of DOS & Unix-style relative paths when searching for files. """
+    which = 'PA04'
+    want = 'bool'
 class _Prop_Require_Framework_Includes(aetools.NProperty):
-	"""Require Framework Includes - Causes the IDE to only look in the framework access paths if a Mac OS X framework style include (i.e. <Carbon/Carbon.h> ) is used. """
-	which = 'PA05'
-	want = 'bool'
+    """Require Framework Includes - Causes the IDE to only look in the framework access paths if a Mac OS X framework style include (i.e. <Carbon/Carbon.h> ) is used. """
+    which = 'PA05'
+    want = 'bool'
 class _Prop_System_Paths(aetools.NProperty):
-	"""System Paths - To add an access path for the include files. (Not supported in Pascal) """
-	which = 'PA03'
-	want = 'PInf'
+    """System Paths - To add an access path for the include files. (Not supported in Pascal) """
+    which = 'PA03'
+    want = 'PInf'
 class _Prop_User_Paths(aetools.NProperty):
-	"""User Paths - To add an access path for the source files. """
-	which = 'PA01'
-	want = 'PInf'
+    """User Paths - To add an access path for the source files. """
+    which = 'PA01'
+    want = 'PInf'
 
 class Path_Information(aetools.ComponentItem):
-	"""Path Information - Contains all of the parameters that describe an access path. """
-	want = 'PInf'
+    """Path Information - Contains all of the parameters that describe an access path. """
+    want = 'PInf'
 class _Prop_format(aetools.NProperty):
-	"""format - Format of the a """
-	which = 'Frmt'
-	want = 'PthF'
+    """format - Format of the a """
+    which = 'Frmt'
+    want = 'PthF'
 class _Prop_framework(aetools.NProperty):
-	"""framework - Is the path a Mac OS X framework style path?  (This flag is readable but not writeable from AppleScript.) """
-	which = 'Frmw'
-	want = 'bool'
+    """framework - Is the path a Mac OS X framework style path?  (This flag is readable but not writeable from AppleScript.) """
+    which = 'Frmw'
+    want = 'bool'
 class _Prop_host_flags(aetools.NProperty):
-	"""host flags - Bit fields enabling the access path for each host OS (1 = Mac OS, 2 = Windows) """
-	which = 'HstF'
-	want = 'long'
+    """host flags - Bit fields enabling the access path for each host OS (1 = Mac OS, 2 = Windows) """
+    which = 'HstF'
+    want = 'long'
 class _Prop_origin(aetools.NProperty):
-	"""origin -  """
-	which = 'Orig'
-	want = 'PPrm'
+    """origin -  """
+    which = 'Orig'
+    want = 'PPrm'
 class _Prop_recursive(aetools.NProperty):
-	"""recursive - Will the path be searched recursively?  (Default is true) """
-	which = 'Recu'
-	want = 'bool'
+    """recursive - Will the path be searched recursively?  (Default is true) """
+    which = 'Recu'
+    want = 'bool'
 class _Prop_root(aetools.NProperty):
-	"""root - Name of the root of the relative path. Pre-defined values are \xd2Absolute\xd3, \xd2Project\xd3, \xd2CodeWarrior\xd3, and  \xd2System\xd3. Anything else is a user-defined root. """
-	which = 'Root'
-	want = 'TEXT'
+    """root - Name of the root of the relative path. Pre-defined values are \xd2Absolute\xd3, \xd2Project\xd3, \xd2CodeWarrior\xd3, and  \xd2System\xd3. Anything else is a user-defined root. """
+    which = 'Root'
+    want = 'TEXT'
 
 class Plugin_Settings(aetools.ComponentItem):
-	"""Plugin Settings - Settings for plugin tools """
-	want = 'PSTG'
+    """Plugin Settings - Settings for plugin tools """
+    want = 'PSTG'
 class _Prop_Disable_Third_Party_COM_Plugins(aetools.NProperty):
-	"""Disable Third Party COM Plugins - Disable COM plugins from third parties """
-	which = 'PX02'
-	want = 'bool'
+    """Disable Third Party COM Plugins - Disable COM plugins from third parties """
+    which = 'PX02'
+    want = 'bool'
 class _Prop_Plugin_Diagnostics_Level(aetools.NProperty):
-	"""Plugin Diagnostics Level - Plugin Diagnostics Level is for those who are developing plugins for the IDE and need to debug them. """
-	which = 'PX01'
-	want = 'PXdg'
+    """Plugin Diagnostics Level - Plugin Diagnostics Level is for those who are developing plugins for the IDE and need to debug them. """
+    which = 'PX01'
+    want = 'PXdg'
 
 class Runtime_Settings(aetools.ComponentItem):
-	"""Runtime Settings - Runtime settings """
-	want = 'RSTG'
+    """Runtime Settings - Runtime settings """
+    want = 'RSTG'
 class _Prop_Command_Line_Arguments(aetools.NProperty):
-	"""Command Line Arguments - Extra command line args to pass to executable """
-	which = 'RS02'
-	want = 'TEXT'
+    """Command Line Arguments - Extra command line args to pass to executable """
+    which = 'RS02'
+    want = 'TEXT'
 class _Prop_Environment_Variables(aetools.NProperty):
-	"""Environment Variables - Environment variables to use when running the executable """
-	which = 'RS04'
-	want = 'EnvV'
+    """Environment Variables - Environment variables to use when running the executable """
+    which = 'RS04'
+    want = 'EnvV'
 class _Prop_Host_Application(aetools.NProperty):
-	"""Host Application - Host application for running/debugging libraries and code resources """
-	which = 'RS01'
-	want = 'RlPt'
+    """Host Application - Host application for running/debugging libraries and code resources """
+    which = 'RS01'
+    want = 'RlPt'
 class _Prop_Working_Directory(aetools.NProperty):
-	"""Working Directory - Working directory to use when running the executable """
-	which = 'RS03'
-	want = 'TEXT'
+    """Working Directory - Working directory to use when running the executable """
+    which = 'RS03'
+    want = 'TEXT'
 
 class Relative_Path(aetools.ComponentItem):
-	"""Relative Path - Relative path from some root """
-	want = 'RlPt'
+    """Relative Path - Relative path from some root """
+    want = 'RlPt'
 
 class Shielded_Folder(aetools.ComponentItem):
-	"""Shielded Folder -  """
-	want = 'SFit'
+    """Shielded Folder -  """
+    want = 'SFit'
 class _Prop_Expression_To_Match(aetools.NProperty):
-	"""Expression To Match - Regular expression which describes folders to skip """
-	which = 'SF01'
-	want = 'TEXT'
+    """Expression To Match - Regular expression which describes folders to skip """
+    which = 'SF01'
+    want = 'TEXT'
 class _Prop_Skip_Find_And_Compare_Operations(aetools.NProperty):
-	"""Skip Find And Compare Operations - Matching folders will be skipped during find and compare operations """
-	which = 'SF03'
-	want = 'bool'
+    """Skip Find And Compare Operations - Matching folders will be skipped during find and compare operations """
+    which = 'SF03'
+    want = 'bool'
 class _Prop_Skip_Project_Operations(aetools.NProperty):
-	"""Skip Project Operations - Matching folders will be skipped during project operations """
-	which = 'SF02'
-	want = 'bool'
+    """Skip Project Operations - Matching folders will be skipped during project operations """
+    which = 'SF02'
+    want = 'bool'
 
 class Shielded_Folders(aetools.ComponentItem):
-	"""Shielded Folders - Folders skipped when performing project and find-and-compare operations """
-	want = 'SHFL'
+    """Shielded Folders - Folders skipped when performing project and find-and-compare operations """
+    want = 'SHFL'
 class _Prop_Shielded_Items(aetools.NProperty):
-	"""Shielded Items -  """
-	which = 'SFis'
-	want = 'SFit'
+    """Shielded Items -  """
+    which = 'SFis'
+    want = 'SFit'
 
 class Syntax_Coloring(aetools.ComponentItem):
-	"""Syntax Coloring -  """
-	want = 'SNTX'
+    """Syntax Coloring -  """
+    want = 'SNTX'
 class _Prop_Comment_Color(aetools.NProperty):
-	"""Comment Color - The color for comments. """
-	which = 'GH02'
-	want = 'cRGB'
+    """Comment Color - The color for comments. """
+    which = 'GH02'
+    want = 'cRGB'
 class _Prop_Keyword_Color(aetools.NProperty):
-	"""Keyword Color - The color for language keywords. """
-	which = 'GH03'
-	want = 'cRGB'
+    """Keyword Color - The color for language keywords. """
+    which = 'GH03'
+    want = 'cRGB'
 class _Prop_String_Color(aetools.NProperty):
-	"""String Color - The color for strings. """
-	which = 'GH04'
-	want = 'cRGB'
+    """String Color - The color for strings. """
+    which = 'GH04'
+    want = 'cRGB'
 class _Prop_Syntax_Coloring(aetools.NProperty):
-	"""Syntax Coloring - Mark keywords and comments with color. """
-	which = 'GH01'
-	want = 'bool'
+    """Syntax Coloring - Mark keywords and comments with color. """
+    which = 'GH01'
+    want = 'bool'
 
 class Segment(aetools.ComponentItem):
-	"""Segment - A segment or group in the project """
-	want = 'Seg '
+    """Segment - A segment or group in the project """
+    want = 'Seg '
 class _Prop_filecount(aetools.NProperty):
-	"""filecount -  """
-	which = 'NumF'
-	want = 'shor'
+    """filecount -  """
+    which = 'NumF'
+    want = 'shor'
 class _Prop_seg_2d_locked(aetools.NProperty):
-	"""seg-locked - Is the segment locked ? [68K only] """
-	which = 'PLck'
-	want = 'bool'
+    """seg-locked - Is the segment locked ? [68K only] """
+    which = 'PLck'
+    want = 'bool'
 class _Prop_seg_2d_preloaded(aetools.NProperty):
-	"""seg-preloaded - Is the segment preloaded ? [68K only] """
-	which = 'Prel'
-	want = 'bool'
+    """seg-preloaded - Is the segment preloaded ? [68K only] """
+    which = 'Prel'
+    want = 'bool'
 class _Prop_seg_2d_protected(aetools.NProperty):
-	"""seg-protected - Is the segment protected ? [68K only] """
-	which = 'Prot'
-	want = 'bool'
+    """seg-protected - Is the segment protected ? [68K only] """
+    which = 'Prot'
+    want = 'bool'
 class _Prop_seg_2d_purgeable(aetools.NProperty):
-	"""seg-purgeable - Is the segment purgeable ? [68K only] """
-	which = 'Purg'
-	want = 'bool'
+    """seg-purgeable - Is the segment purgeable ? [68K only] """
+    which = 'Purg'
+    want = 'bool'
 class _Prop_seg_2d_system_heap(aetools.NProperty):
-	"""seg-system heap - Is the segment loaded into the system heap ? [68K only] """
-	which = 'SysH'
-	want = 'bool'
+    """seg-system heap - Is the segment loaded into the system heap ? [68K only] """
+    which = 'SysH'
+    want = 'bool'
 
 class ProjectFile(aetools.ComponentItem):
-	"""ProjectFile - A file contained in a project """
-	want = 'SrcF'
+    """ProjectFile - A file contained in a project """
+    want = 'SrcF'
 class _Prop_codesize(aetools.NProperty):
-	"""codesize - The size of this file\xd5s code. """
-	which = 'CSiz'
-	want = 'long'
+    """codesize - The size of this file\xd5s code. """
+    which = 'CSiz'
+    want = 'long'
 class _Prop_datasize(aetools.NProperty):
-	"""datasize - The size of this file\xd5s data. """
-	which = 'DSiz'
-	want = 'long'
+    """datasize - The size of this file\xd5s data. """
+    which = 'DSiz'
+    want = 'long'
 class _Prop_filetype(aetools.NProperty):
-	"""filetype - What kind of file is this ? """
-	which = 'SrcT'
-	want = 'SrcT'
+    """filetype - What kind of file is this ? """
+    which = 'SrcT'
+    want = 'SrcT'
 class _Prop_includes(aetools.NProperty):
-	"""includes -  """
-	which = 'IncF'
-	want = 'fss '
+    """includes -  """
+    which = 'IncF'
+    want = 'fss '
 class _Prop_initialize_before(aetools.NProperty):
-	"""initialize before - Initialize the shared library before the main application. """
-	which = 'Bfor'
-	want = 'bool'
+    """initialize before - Initialize the shared library before the main application. """
+    which = 'Bfor'
+    want = 'bool'
 class _Prop_symbols(aetools.NProperty):
-	"""symbols - Are debugging symbols generated for this file ? """
-	which = 'SymG'
-	want = 'bool'
+    """symbols - Are debugging symbols generated for this file ? """
+    which = 'SymG'
+    want = 'bool'
 class _Prop_up_to_date(aetools.NProperty):
-	"""up to date - Has the file been compiled since its last modification ? """
-	which = 'UpTD'
-	want = 'bool'
+    """up to date - Has the file been compiled since its last modification ? """
+    which = 'UpTD'
+    want = 'bool'
 class _Prop_weak_link(aetools.NProperty):
-	"""weak link - Is this file imported weakly into the project ? [PowerPC only] """
-	which = 'Weak'
-	want = 'bool'
+    """weak link - Is this file imported weakly into the project ? [PowerPC only] """
+    which = 'Weak'
+    want = 'bool'
 
 class Source_Tree(aetools.ComponentItem):
-	"""Source Tree - User-defined source tree root """
-	want = 'SrcT'
+    """Source Tree - User-defined source tree root """
+    want = 'SrcT'
 class _Prop_path(aetools.NProperty):
-	"""path - path for the user-defined source tree root """
-	which = 'Path'
-	want = 'TEXT'
+    """path - path for the user-defined source tree root """
+    which = 'Path'
+    want = 'TEXT'
 class _Prop_path_kind(aetools.NProperty):
-	"""path kind - kind of path """
-	which = 'Kind'
-	want = 'STKd'
+    """path kind - kind of path """
+    which = 'Kind'
+    want = 'STKd'
 
 class Target_Settings(aetools.ComponentItem):
-	"""Target Settings - Contains the definitions of a project\xd5s target. """
-	want = 'TARG'
+    """Target Settings - Contains the definitions of a project\xd5s target. """
+    want = 'TARG'
 class _Prop_Linker(aetools.NProperty):
-	"""Linker - The name of the current linker. """
-	which = 'TA01'
-	want = 'TEXT'
+    """Linker - The name of the current linker. """
+    which = 'TA01'
+    want = 'TEXT'
 class _Prop_Output_Directory_Location(aetools.NProperty):
-	"""Output Directory Location - Location of output directory """
-	which = 'TA16'
-	want = 'RlPt'
+    """Output Directory Location - Location of output directory """
+    which = 'TA16'
+    want = 'RlPt'
 class _Prop_Output_Directory_Origin(aetools.NProperty):
-	"""Output Directory Origin - Origin of path to output directory. Usage of this property is deprecated. Use the \xd2Output Directory Location\xd3 property instead. """
-	which = 'TA12'
-	want = 'PPrm'
+    """Output Directory Origin - Origin of path to output directory. Usage of this property is deprecated. Use the \xd2Output Directory Location\xd3 property instead. """
+    which = 'TA12'
+    want = 'PPrm'
 class _Prop_Output_Directory_Path(aetools.NProperty):
-	"""Output Directory Path - Path to output directory. Usage of this property is deprecated. Use the \xd2Output Directory Location\xd3 property instead. """
-	which = 'TA11'
-	want = 'TEXT'
+    """Output Directory Path - Path to output directory. Usage of this property is deprecated. Use the \xd2Output Directory Location\xd3 property instead. """
+    which = 'TA11'
+    want = 'TEXT'
 class _Prop_Post_Linker(aetools.NProperty):
-	"""Post Linker -  """
-	which = 'TA09'
-	want = 'TEXT'
+    """Post Linker -  """
+    which = 'TA09'
+    want = 'TEXT'
 class _Prop_Pre_Linker(aetools.NProperty):
-	"""Pre Linker -  """
-	which = 'TA13'
-	want = 'TEXT'
+    """Pre Linker -  """
+    which = 'TA13'
+    want = 'TEXT'
 class _Prop_Target_Name(aetools.NProperty):
-	"""Target Name -  """
-	which = 'TA10'
-	want = 'TEXT'
+    """Target Name -  """
+    which = 'TA10'
+    want = 'TEXT'
 class _Prop_Use_Relative_Paths(aetools.NProperty):
-	"""Use Relative Paths - Save project entries using relative paths """
-	which = 'TA15'
-	want = 'bool'
+    """Use Relative Paths - Save project entries using relative paths """
+    which = 'TA15'
+    want = 'bool'
 
 class Target_Source_Trees(aetools.ComponentItem):
-	"""Target Source Trees - Target-specific user-defined source tree roots """
-	want = 'TSTs'
+    """Target Source Trees - Target-specific user-defined source tree roots """
+    want = 'TSTs'
 
 class VCS_Setup(aetools.ComponentItem):
-	"""VCS Setup - The version control system preferences. """
-	want = 'VCSs'
+    """VCS Setup - The version control system preferences. """
+    want = 'VCSs'
 class _Prop_Always_Prompt(aetools.NProperty):
-	"""Always Prompt - Always show login dialog """
-	which = 'VC07'
-	want = 'bool'
+    """Always Prompt - Always show login dialog """
+    which = 'VC07'
+    want = 'bool'
 class _Prop_Auto_Connect(aetools.NProperty):
-	"""Auto Connect - Automatically connect to database when starting. """
-	which = 'VC05'
-	want = 'bool'
+    """Auto Connect - Automatically connect to database when starting. """
+    which = 'VC05'
+    want = 'bool'
 class _Prop_Connection_Method(aetools.NProperty):
-	"""Connection Method - Name of Version Control System to use. """
-	which = 'VC02'
-	want = 'TEXT'
+    """Connection Method - Name of Version Control System to use. """
+    which = 'VC02'
+    want = 'TEXT'
 class _Prop_Database_Path(aetools.NProperty):
-	"""Database Path - Path to the VCS database. """
-	which = 'VC09'
-	want = 'RlPt'
+    """Database Path - Path to the VCS database. """
+    which = 'VC09'
+    want = 'RlPt'
 class _Prop_Local_Path(aetools.NProperty):
-	"""Local Path - Path to the local root """
-	which = 'VC10'
-	want = 'RlPt'
+    """Local Path - Path to the local root """
+    which = 'VC10'
+    want = 'RlPt'
 class _Prop_Mount_Volume(aetools.NProperty):
-	"""Mount Volume - Attempt to mount the database volume if it isn't available. """
-	which = 'VC08'
-	want = 'bool'
+    """Mount Volume - Attempt to mount the database volume if it isn't available. """
+    which = 'VC08'
+    want = 'bool'
 class _Prop_Password(aetools.NProperty):
-	"""Password - The password for the VCS. """
-	which = 'VC04'
-	want = 'TEXT'
+    """Password - The password for the VCS. """
+    which = 'VC04'
+    want = 'TEXT'
 class _Prop_Store_Password(aetools.NProperty):
-	"""Store Password - Store the password. """
-	which = 'VC06'
-	want = 'bool'
+    """Store Password - Store the password. """
+    which = 'VC06'
+    want = 'bool'
 class _Prop_Use_Global_Settings(aetools.NProperty):
-	"""Use Global Settings - Use the global VCS settings by default """
-	which = 'VC11'
-	want = 'bool'
+    """Use Global Settings - Use the global VCS settings by default """
+    which = 'VC11'
+    want = 'bool'
 class _Prop_Username(aetools.NProperty):
-	"""Username - The user name for the VCS. """
-	which = 'VC03'
-	want = 'TEXT'
+    """Username - The user name for the VCS. """
+    which = 'VC03'
+    want = 'TEXT'
 class _Prop_VCS_Active(aetools.NProperty):
-	"""VCS Active - Use Version Control """
-	which = 'VC01'
-	want = 'bool'
+    """VCS Active - Use Version Control """
+    which = 'VC01'
+    want = 'bool'
 
 class Font(aetools.ComponentItem):
-	"""Font -  """
-	want = 'mFNT'
+    """Font -  """
+    want = 'mFNT'
 class _Prop_Auto_Indent(aetools.NProperty):
-	"""Auto Indent - Indent new lines automatically. """
-	which = 'FN01'
-	want = 'bool'
+    """Auto Indent - Indent new lines automatically. """
+    which = 'FN01'
+    want = 'bool'
 class _Prop_Tab_Indents_Selection(aetools.NProperty):
-	"""Tab Indents Selection - Tab indents selection when multiple lines are selected """
-	which = 'FN03'
-	want = 'bool'
+    """Tab Indents Selection - Tab indents selection when multiple lines are selected """
+    which = 'FN03'
+    want = 'bool'
 class _Prop_Tab_Inserts_Spaces(aetools.NProperty):
-	"""Tab Inserts Spaces - Insert spaces instead of tab character """
-	which = 'FN04'
-	want = 'bool'
+    """Tab Inserts Spaces - Insert spaces instead of tab character """
+    which = 'FN04'
+    want = 'bool'
 class _Prop_Tab_Size(aetools.NProperty):
-	"""Tab Size -  """
-	which = 'FN02'
-	want = 'shor'
+    """Tab Size -  """
+    which = 'FN02'
+    want = 'shor'
 class _Prop_Text_Font(aetools.NProperty):
-	"""Text Font - The font used in editing windows. """
-	which = 'ptxf'
-	want = 'TEXT'
+    """Text Font - The font used in editing windows. """
+    which = 'ptxf'
+    want = 'TEXT'
 class _Prop_Text_Size(aetools.NProperty):
-	"""Text Size - The size of the text in an editing window. """
-	which = 'ptps'
-	want = 'shor'
+    """Text Size - The size of the text in an editing window. """
+    which = 'ptps'
+    want = 'shor'
 Browser_Coloring._superclassnames = []
 Browser_Coloring._privpropdict = {
-	'Browser_Keywords' : _Prop_Browser_Keywords,
-	'Classes_Color' : _Prop_Classes_Color,
-	'Constants_Color' : _Prop_Constants_Color,
-	'Enums_Color' : _Prop_Enums_Color,
-	'Functions_Color' : _Prop_Functions_Color,
-	'Globals_Color' : _Prop_Globals_Color,
-	'Macros_Color' : _Prop_Macros_Color,
-	'Template_Commands_in_Menu' : _Prop_Template_Commands_in_Menu,
-	'Templates_Color' : _Prop_Templates_Color,
-	'Typedefs_Color' : _Prop_Typedefs_Color,
+    'Browser_Keywords' : _Prop_Browser_Keywords,
+    'Classes_Color' : _Prop_Classes_Color,
+    'Constants_Color' : _Prop_Constants_Color,
+    'Enums_Color' : _Prop_Enums_Color,
+    'Functions_Color' : _Prop_Functions_Color,
+    'Globals_Color' : _Prop_Globals_Color,
+    'Macros_Color' : _Prop_Macros_Color,
+    'Template_Commands_in_Menu' : _Prop_Template_Commands_in_Menu,
+    'Templates_Color' : _Prop_Templates_Color,
+    'Typedefs_Color' : _Prop_Typedefs_Color,
 }
 Browser_Coloring._privelemdict = {
 }
 Build_Settings._superclassnames = []
 Build_Settings._privpropdict = {
-	'Build_Before_Running' : _Prop_Build_Before_Running,
-	'Compiler_Thread_Stack_Size' : _Prop_Compiler_Thread_Stack_Size,
-	'Completion_Sound' : _Prop_Completion_Sound,
-	'Failure_Sound' : _Prop_Failure_Sound,
-	'Include_Cache_Size' : _Prop_Include_Cache_Size,
-	'Save_Before_Building' : _Prop_Save_Before_Building,
-	'Success_Sound' : _Prop_Success_Sound,
+    'Build_Before_Running' : _Prop_Build_Before_Running,
+    'Compiler_Thread_Stack_Size' : _Prop_Compiler_Thread_Stack_Size,
+    'Completion_Sound' : _Prop_Completion_Sound,
+    'Failure_Sound' : _Prop_Failure_Sound,
+    'Include_Cache_Size' : _Prop_Include_Cache_Size,
+    'Save_Before_Building' : _Prop_Save_Before_Building,
+    'Success_Sound' : _Prop_Success_Sound,
 }
 Build_Settings._privelemdict = {
 }
 base_class._superclassnames = []
 base_class._privpropdict = {
-	'access' : _Prop_access,
-	'class_' : _Prop_class_,
-	'virtual' : _Prop_virtual,
+    'access' : _Prop_access,
+    'class_' : _Prop_class_,
+    'virtual' : _Prop_virtual,
 }
 base_class._privelemdict = {
 }
 Custom_Keywords._superclassnames = []
 Custom_Keywords._privpropdict = {
-	'Custom_Color_1' : _Prop_Custom_Color_1,
-	'Custom_Color_2' : _Prop_Custom_Color_2,
-	'Custom_Color_3' : _Prop_Custom_Color_3,
-	'Custom_Color_4' : _Prop_Custom_Color_4,
+    'Custom_Color_1' : _Prop_Custom_Color_1,
+    'Custom_Color_2' : _Prop_Custom_Color_2,
+    'Custom_Color_3' : _Prop_Custom_Color_3,
+    'Custom_Color_4' : _Prop_Custom_Color_4,
 }
 Custom_Keywords._privelemdict = {
 }
@@ -1685,450 +1685,450 @@ browser_catalog._superclassnames = []
 browser_catalog._privpropdict = {
 }
 browser_catalog._privelemdict = {
-	'class_' : class_,
+    'class_' : class_,
 }
 class_._superclassnames = []
 class_._privpropdict = {
-	'all_subclasses' : _Prop_all_subclasses,
-	'declaration_end_offset' : _Prop_declaration_end_offset,
-	'declaration_file' : _Prop_declaration_file,
-	'declaration_start_offset' : _Prop_declaration_start_offset,
-	'language' : _Prop_language,
-	'name' : _Prop_name,
-	'subclasses' : _Prop_subclasses,
+    'all_subclasses' : _Prop_all_subclasses,
+    'declaration_end_offset' : _Prop_declaration_end_offset,
+    'declaration_file' : _Prop_declaration_file,
+    'declaration_start_offset' : _Prop_declaration_start_offset,
+    'language' : _Prop_language,
+    'name' : _Prop_name,
+    'subclasses' : _Prop_subclasses,
 }
 class_._privelemdict = {
-	'base_class' : base_class,
-	'data_member' : data_member,
-	'member_function' : member_function,
+    'base_class' : base_class,
+    'data_member' : data_member,
+    'member_function' : member_function,
 }
 Debugger_Display._superclassnames = []
 Debugger_Display._privpropdict = {
-	'Default_Array_Size' : _Prop_Default_Array_Size,
-	'Show_As_Decimal' : _Prop_Show_As_Decimal,
-	'Show_Locals' : _Prop_Show_Locals,
-	'Show_Variable_Types' : _Prop_Show_Variable_Types,
-	'Sort_By_Method' : _Prop_Sort_By_Method,
-	'Threads_in_Window' : _Prop_Threads_in_Window,
-	'Use_RTTI' : _Prop_Use_RTTI,
-	'Variable_Changed_Hilite' : _Prop_Variable_Changed_Hilite,
-	'Variable_Hints' : _Prop_Variable_Hints,
-	'Watchpoint_Hilite' : _Prop_Watchpoint_Hilite,
+    'Default_Array_Size' : _Prop_Default_Array_Size,
+    'Show_As_Decimal' : _Prop_Show_As_Decimal,
+    'Show_Locals' : _Prop_Show_Locals,
+    'Show_Variable_Types' : _Prop_Show_Variable_Types,
+    'Sort_By_Method' : _Prop_Sort_By_Method,
+    'Threads_in_Window' : _Prop_Threads_in_Window,
+    'Use_RTTI' : _Prop_Use_RTTI,
+    'Variable_Changed_Hilite' : _Prop_Variable_Changed_Hilite,
+    'Variable_Hints' : _Prop_Variable_Hints,
+    'Watchpoint_Hilite' : _Prop_Watchpoint_Hilite,
 }
 Debugger_Display._privelemdict = {
 }
 Debugger_Global._superclassnames = []
 Debugger_Global._privpropdict = {
-	'Auto_Target_Libraries' : _Prop_Auto_Target_Libraries,
-	'Cache_Edited_Files' : _Prop_Cache_Edited_Files,
-	'Confirm_Kill' : _Prop_Confirm_Kill,
-	'Dont_Step_in_Runtime' : _Prop_Dont_Step_in_Runtime,
-	'File_Cache_Duration' : _Prop_File_Cache_Duration,
-	'Ignore_Mod_Dates' : _Prop_Ignore_Mod_Dates,
-	'Launch_Apps_on_Open' : _Prop_Launch_Apps_on_Open,
-	'Open_All_Classes' : _Prop_Open_All_Classes,
-	'Select_Stack_Crawl' : _Prop_Select_Stack_Crawl,
-	'Stop_at_Main' : _Prop_Stop_at_Main,
+    'Auto_Target_Libraries' : _Prop_Auto_Target_Libraries,
+    'Cache_Edited_Files' : _Prop_Cache_Edited_Files,
+    'Confirm_Kill' : _Prop_Confirm_Kill,
+    'Dont_Step_in_Runtime' : _Prop_Dont_Step_in_Runtime,
+    'File_Cache_Duration' : _Prop_File_Cache_Duration,
+    'Ignore_Mod_Dates' : _Prop_Ignore_Mod_Dates,
+    'Launch_Apps_on_Open' : _Prop_Launch_Apps_on_Open,
+    'Open_All_Classes' : _Prop_Open_All_Classes,
+    'Select_Stack_Crawl' : _Prop_Select_Stack_Crawl,
+    'Stop_at_Main' : _Prop_Stop_at_Main,
 }
 Debugger_Global._privelemdict = {
 }
 Debugger_Target._superclassnames = []
 Debugger_Target._privpropdict = {
-	'Auto_Target_Libraries' : _Prop_Auto_Target_Libraries,
-	'Cache_symbolics' : _Prop_Cache_symbolics,
-	'Data_Update_Interval' : _Prop_Data_Update_Interval,
-	'Log_System_Messages' : _Prop_Log_System_Messages,
-	'Relocated_Executable_Path' : _Prop_Relocated_Executable_Path,
-	'Stop_at_temp_breakpoint' : _Prop_Stop_at_temp_breakpoint,
-	'Temp_Breakpoint_Type' : _Prop_Temp_Breakpoint_Type,
-	'Temp_breakpoint_names' : _Prop_Temp_breakpoint_names,
-	'Update_Data_While_Running' : _Prop_Update_Data_While_Running,
+    'Auto_Target_Libraries' : _Prop_Auto_Target_Libraries,
+    'Cache_symbolics' : _Prop_Cache_symbolics,
+    'Data_Update_Interval' : _Prop_Data_Update_Interval,
+    'Log_System_Messages' : _Prop_Log_System_Messages,
+    'Relocated_Executable_Path' : _Prop_Relocated_Executable_Path,
+    'Stop_at_temp_breakpoint' : _Prop_Stop_at_temp_breakpoint,
+    'Temp_Breakpoint_Type' : _Prop_Temp_Breakpoint_Type,
+    'Temp_breakpoint_names' : _Prop_Temp_breakpoint_names,
+    'Update_Data_While_Running' : _Prop_Update_Data_While_Running,
 }
 Debugger_Target._privelemdict = {
 }
 Debugger_Windowing._superclassnames = []
 Debugger_Windowing._privpropdict = {
-	'Debugging_Start_Action' : _Prop_Debugging_Start_Action,
-	'Do_Nothing_To_Projects' : _Prop_Do_Nothing_To_Projects,
+    'Debugging_Start_Action' : _Prop_Debugging_Start_Action,
+    'Do_Nothing_To_Projects' : _Prop_Do_Nothing_To_Projects,
 }
 Debugger_Windowing._privelemdict = {
 }
 data_member._superclassnames = []
 data_member._privpropdict = {
-	'access' : _Prop_access,
-	'declaration_end_offset' : _Prop_declaration_end_offset,
-	'declaration_start_offset' : _Prop_declaration_start_offset,
-	'name' : _Prop_name,
-	'static' : _Prop_static,
+    'access' : _Prop_access,
+    'declaration_end_offset' : _Prop_declaration_end_offset,
+    'declaration_start_offset' : _Prop_declaration_start_offset,
+    'name' : _Prop_name,
+    'static' : _Prop_static,
 }
 data_member._privelemdict = {
 }
 Editor._superclassnames = []
 Editor._privpropdict = {
-	'Background_Color' : _Prop_Background_Color,
-	'Balance' : _Prop_Balance,
-	'Context_Popup_Delay' : _Prop_Context_Popup_Delay,
-	'Default_Text_File_Format' : _Prop_Default_Text_File_Format,
-	'Dynamic_Scroll' : _Prop_Dynamic_Scroll,
-	'Flash_Delay' : _Prop_Flash_Delay,
-	'Left_Margin_Line_Select' : _Prop_Left_Margin_Line_Select,
-	'Main_Text_Color' : _Prop_Main_Text_Color,
-	'Relaxed_C_Popup_Parsing' : _Prop_Relaxed_C_Popup_Parsing,
-	'Remember_Font' : _Prop_Remember_Font,
-	'Remember_Selection' : _Prop_Remember_Selection,
-	'Remember_Window' : _Prop_Remember_Window,
-	'Sort_Function_Popup' : _Prop_Sort_Function_Popup,
-	'Use_Drag__26__Drop_Editing' : _Prop_Use_Drag__26__Drop_Editing,
-	'Use_Multiple_Undo' : _Prop_Use_Multiple_Undo,
+    'Background_Color' : _Prop_Background_Color,
+    'Balance' : _Prop_Balance,
+    'Context_Popup_Delay' : _Prop_Context_Popup_Delay,
+    'Default_Text_File_Format' : _Prop_Default_Text_File_Format,
+    'Dynamic_Scroll' : _Prop_Dynamic_Scroll,
+    'Flash_Delay' : _Prop_Flash_Delay,
+    'Left_Margin_Line_Select' : _Prop_Left_Margin_Line_Select,
+    'Main_Text_Color' : _Prop_Main_Text_Color,
+    'Relaxed_C_Popup_Parsing' : _Prop_Relaxed_C_Popup_Parsing,
+    'Remember_Font' : _Prop_Remember_Font,
+    'Remember_Selection' : _Prop_Remember_Selection,
+    'Remember_Window' : _Prop_Remember_Window,
+    'Sort_Function_Popup' : _Prop_Sort_Function_Popup,
+    'Use_Drag__26__Drop_Editing' : _Prop_Use_Drag__26__Drop_Editing,
+    'Use_Multiple_Undo' : _Prop_Use_Multiple_Undo,
 }
 Editor._privelemdict = {
 }
 Environment_Variable._superclassnames = []
 Environment_Variable._privpropdict = {
-	'name' : _Prop_name,
-	'value' : _Prop_value,
+    'name' : _Prop_name,
+    'value' : _Prop_value,
 }
 Environment_Variable._privelemdict = {
 }
 Error_Information._superclassnames = []
 Error_Information._privpropdict = {
-	'disk_file' : _Prop_disk_file,
-	'lineNumber' : _Prop_lineNumber,
-	'message' : _Prop_message,
-	'messageKind' : _Prop_messageKind,
+    'disk_file' : _Prop_disk_file,
+    'lineNumber' : _Prop_lineNumber,
+    'message' : _Prop_message,
+    'messageKind' : _Prop_messageKind,
 }
 Error_Information._privelemdict = {
 }
 Function_Information._superclassnames = []
 Function_Information._privpropdict = {
-	'disk_file' : _Prop_disk_file,
-	'lineNumber' : _Prop_lineNumber,
+    'disk_file' : _Prop_disk_file,
+    'lineNumber' : _Prop_lineNumber,
 }
 Function_Information._privelemdict = {
 }
 File_Mappings._superclassnames = []
 File_Mappings._privpropdict = {
-	'Mappings' : _Prop_Mappings,
+    'Mappings' : _Prop_Mappings,
 }
 File_Mappings._privelemdict = {
 }
 File_Mapping._superclassnames = []
 File_Mapping._privpropdict = {
-	'Compiler' : _Prop_Compiler,
-	'Extension' : _Prop_Extension,
-	'File_Type' : _Prop_File_Type,
-	'Ignored_by_Make' : _Prop_Ignored_by_Make,
-	'Launchable' : _Prop_Launchable,
-	'Precompiled' : _Prop_Precompiled,
-	'Resource_File' : _Prop_Resource_File,
+    'Compiler' : _Prop_Compiler,
+    'Extension' : _Prop_Extension,
+    'File_Type' : _Prop_File_Type,
+    'Ignored_by_Make' : _Prop_Ignored_by_Make,
+    'Launchable' : _Prop_Launchable,
+    'Precompiled' : _Prop_Precompiled,
+    'Resource_File' : _Prop_Resource_File,
 }
 File_Mapping._privelemdict = {
 }
 Global_Source_Trees._superclassnames = []
 Global_Source_Trees._privpropdict = {
-	'Source_Trees' : _Prop_Source_Trees,
+    'Source_Trees' : _Prop_Source_Trees,
 }
 Global_Source_Trees._privelemdict = {
 }
 Extras._superclassnames = []
 Extras._privpropdict = {
-	'Automatic_Toolbar_Help' : _Prop_Automatic_Toolbar_Help,
-	'External_Reference' : _Prop_External_Reference,
-	'Full_Screen_Zoom' : _Prop_Full_Screen_Zoom,
-	'Recent_Editor_Count' : _Prop_Recent_Editor_Count,
-	'Recent_Project_Count' : _Prop_Recent_Project_Count,
-	'Use_Editor_Extensions' : _Prop_Use_Editor_Extensions,
-	'Use_External_Editor' : _Prop_Use_External_Editor,
-	'Use_Script_Menu' : _Prop_Use_Script_Menu,
-	'Use_ToolServer_Menu' : _Prop_Use_ToolServer_Menu,
+    'Automatic_Toolbar_Help' : _Prop_Automatic_Toolbar_Help,
+    'External_Reference' : _Prop_External_Reference,
+    'Full_Screen_Zoom' : _Prop_Full_Screen_Zoom,
+    'Recent_Editor_Count' : _Prop_Recent_Editor_Count,
+    'Recent_Project_Count' : _Prop_Recent_Project_Count,
+    'Use_Editor_Extensions' : _Prop_Use_Editor_Extensions,
+    'Use_External_Editor' : _Prop_Use_External_Editor,
+    'Use_Script_Menu' : _Prop_Use_Script_Menu,
+    'Use_ToolServer_Menu' : _Prop_Use_ToolServer_Menu,
 }
 Extras._privelemdict = {
 }
 Build_Extras._superclassnames = []
 Build_Extras._privpropdict = {
-	'Browser_Active' : _Prop_Browser_Active,
-	'Cache_Subproject_Data' : _Prop_Cache_Subproject_Data,
-	'Dump_Browser_Info' : _Prop_Dump_Browser_Info,
-	'Modification_Date_Caching' : _Prop_Modification_Date_Caching,
+    'Browser_Active' : _Prop_Browser_Active,
+    'Cache_Subproject_Data' : _Prop_Cache_Subproject_Data,
+    'Dump_Browser_Info' : _Prop_Dump_Browser_Info,
+    'Modification_Date_Caching' : _Prop_Modification_Date_Caching,
 }
 Build_Extras._privelemdict = {
 }
 member_function._superclassnames = []
 member_function._privpropdict = {
-	'access' : _Prop_access,
-	'declaration_end_offset' : _Prop_declaration_end_offset,
-	'declaration_file' : _Prop_declaration_file,
-	'declaration_start_offset' : _Prop_declaration_start_offset,
-	'implementation_end_offset' : _Prop_implementation_end_offset,
-	'implementation_file' : _Prop_implementation_file,
-	'implementation_start_offset' : _Prop_implementation_start_offset,
-	'name' : _Prop_name,
-	'static' : _Prop_static,
-	'virtual' : _Prop_virtual,
+    'access' : _Prop_access,
+    'declaration_end_offset' : _Prop_declaration_end_offset,
+    'declaration_file' : _Prop_declaration_file,
+    'declaration_start_offset' : _Prop_declaration_start_offset,
+    'implementation_end_offset' : _Prop_implementation_end_offset,
+    'implementation_file' : _Prop_implementation_file,
+    'implementation_start_offset' : _Prop_implementation_start_offset,
+    'name' : _Prop_name,
+    'static' : _Prop_static,
+    'virtual' : _Prop_virtual,
 }
 member_function._privelemdict = {
 }
 Access_Paths._superclassnames = []
 Access_Paths._privpropdict = {
-	'Always_Full_Search' : _Prop_Always_Full_Search,
-	'Convert_Paths' : _Prop_Convert_Paths,
-	'Require_Framework_Includes' : _Prop_Require_Framework_Includes,
-	'System_Paths' : _Prop_System_Paths,
-	'User_Paths' : _Prop_User_Paths,
+    'Always_Full_Search' : _Prop_Always_Full_Search,
+    'Convert_Paths' : _Prop_Convert_Paths,
+    'Require_Framework_Includes' : _Prop_Require_Framework_Includes,
+    'System_Paths' : _Prop_System_Paths,
+    'User_Paths' : _Prop_User_Paths,
 }
 Access_Paths._privelemdict = {
 }
 Path_Information._superclassnames = []
 Path_Information._privpropdict = {
-	'format' : _Prop_format,
-	'framework' : _Prop_framework,
-	'host_flags' : _Prop_host_flags,
-	'name' : _Prop_name,
-	'origin' : _Prop_origin,
-	'recursive' : _Prop_recursive,
-	'root' : _Prop_root,
+    'format' : _Prop_format,
+    'framework' : _Prop_framework,
+    'host_flags' : _Prop_host_flags,
+    'name' : _Prop_name,
+    'origin' : _Prop_origin,
+    'recursive' : _Prop_recursive,
+    'root' : _Prop_root,
 }
 Path_Information._privelemdict = {
 }
 Plugin_Settings._superclassnames = []
 Plugin_Settings._privpropdict = {
-	'Disable_Third_Party_COM_Plugins' : _Prop_Disable_Third_Party_COM_Plugins,
-	'Plugin_Diagnostics_Level' : _Prop_Plugin_Diagnostics_Level,
+    'Disable_Third_Party_COM_Plugins' : _Prop_Disable_Third_Party_COM_Plugins,
+    'Plugin_Diagnostics_Level' : _Prop_Plugin_Diagnostics_Level,
 }
 Plugin_Settings._privelemdict = {
 }
 Runtime_Settings._superclassnames = []
 Runtime_Settings._privpropdict = {
-	'Command_Line_Arguments' : _Prop_Command_Line_Arguments,
-	'Environment_Variables' : _Prop_Environment_Variables,
-	'Host_Application' : _Prop_Host_Application,
-	'Working_Directory' : _Prop_Working_Directory,
+    'Command_Line_Arguments' : _Prop_Command_Line_Arguments,
+    'Environment_Variables' : _Prop_Environment_Variables,
+    'Host_Application' : _Prop_Host_Application,
+    'Working_Directory' : _Prop_Working_Directory,
 }
 Runtime_Settings._privelemdict = {
 }
 Relative_Path._superclassnames = []
 Relative_Path._privpropdict = {
-	'format' : _Prop_format,
-	'name' : _Prop_name,
-	'origin' : _Prop_origin,
-	'root' : _Prop_root,
+    'format' : _Prop_format,
+    'name' : _Prop_name,
+    'origin' : _Prop_origin,
+    'root' : _Prop_root,
 }
 Relative_Path._privelemdict = {
 }
 Shielded_Folder._superclassnames = []
 Shielded_Folder._privpropdict = {
-	'Expression_To_Match' : _Prop_Expression_To_Match,
-	'Skip_Find_And_Compare_Operations' : _Prop_Skip_Find_And_Compare_Operations,
-	'Skip_Project_Operations' : _Prop_Skip_Project_Operations,
+    'Expression_To_Match' : _Prop_Expression_To_Match,
+    'Skip_Find_And_Compare_Operations' : _Prop_Skip_Find_And_Compare_Operations,
+    'Skip_Project_Operations' : _Prop_Skip_Project_Operations,
 }
 Shielded_Folder._privelemdict = {
 }
 Shielded_Folders._superclassnames = []
 Shielded_Folders._privpropdict = {
-	'Shielded_Items' : _Prop_Shielded_Items,
+    'Shielded_Items' : _Prop_Shielded_Items,
 }
 Shielded_Folders._privelemdict = {
 }
 Syntax_Coloring._superclassnames = []
 Syntax_Coloring._privpropdict = {
-	'Comment_Color' : _Prop_Comment_Color,
-	'Custom_Color_1' : _Prop_Custom_Color_1,
-	'Custom_Color_2' : _Prop_Custom_Color_2,
-	'Custom_Color_3' : _Prop_Custom_Color_3,
-	'Custom_Color_4' : _Prop_Custom_Color_4,
-	'Keyword_Color' : _Prop_Keyword_Color,
-	'String_Color' : _Prop_String_Color,
-	'Syntax_Coloring' : _Prop_Syntax_Coloring,
+    'Comment_Color' : _Prop_Comment_Color,
+    'Custom_Color_1' : _Prop_Custom_Color_1,
+    'Custom_Color_2' : _Prop_Custom_Color_2,
+    'Custom_Color_3' : _Prop_Custom_Color_3,
+    'Custom_Color_4' : _Prop_Custom_Color_4,
+    'Keyword_Color' : _Prop_Keyword_Color,
+    'String_Color' : _Prop_String_Color,
+    'Syntax_Coloring' : _Prop_Syntax_Coloring,
 }
 Syntax_Coloring._privelemdict = {
 }
 Segment._superclassnames = []
 Segment._privpropdict = {
-	'filecount' : _Prop_filecount,
-	'name' : _Prop_name,
-	'seg_2d_locked' : _Prop_seg_2d_locked,
-	'seg_2d_preloaded' : _Prop_seg_2d_preloaded,
-	'seg_2d_protected' : _Prop_seg_2d_protected,
-	'seg_2d_purgeable' : _Prop_seg_2d_purgeable,
-	'seg_2d_system_heap' : _Prop_seg_2d_system_heap,
+    'filecount' : _Prop_filecount,
+    'name' : _Prop_name,
+    'seg_2d_locked' : _Prop_seg_2d_locked,
+    'seg_2d_preloaded' : _Prop_seg_2d_preloaded,
+    'seg_2d_protected' : _Prop_seg_2d_protected,
+    'seg_2d_purgeable' : _Prop_seg_2d_purgeable,
+    'seg_2d_system_heap' : _Prop_seg_2d_system_heap,
 }
 Segment._privelemdict = {
 }
 ProjectFile._superclassnames = []
 ProjectFile._privpropdict = {
-	'codesize' : _Prop_codesize,
-	'datasize' : _Prop_datasize,
-	'disk_file' : _Prop_disk_file,
-	'filetype' : _Prop_filetype,
-	'includes' : _Prop_includes,
-	'initialize_before' : _Prop_initialize_before,
-	'name' : _Prop_name,
-	'symbols' : _Prop_symbols,
-	'up_to_date' : _Prop_up_to_date,
-	'weak_link' : _Prop_weak_link,
+    'codesize' : _Prop_codesize,
+    'datasize' : _Prop_datasize,
+    'disk_file' : _Prop_disk_file,
+    'filetype' : _Prop_filetype,
+    'includes' : _Prop_includes,
+    'initialize_before' : _Prop_initialize_before,
+    'name' : _Prop_name,
+    'symbols' : _Prop_symbols,
+    'up_to_date' : _Prop_up_to_date,
+    'weak_link' : _Prop_weak_link,
 }
 ProjectFile._privelemdict = {
 }
 Source_Tree._superclassnames = []
 Source_Tree._privpropdict = {
-	'format' : _Prop_format,
-	'name' : _Prop_name,
-	'path' : _Prop_path,
-	'path_kind' : _Prop_path_kind,
+    'format' : _Prop_format,
+    'name' : _Prop_name,
+    'path' : _Prop_path,
+    'path_kind' : _Prop_path_kind,
 }
 Source_Tree._privelemdict = {
 }
 Target_Settings._superclassnames = []
 Target_Settings._privpropdict = {
-	'Linker' : _Prop_Linker,
-	'Output_Directory_Location' : _Prop_Output_Directory_Location,
-	'Output_Directory_Origin' : _Prop_Output_Directory_Origin,
-	'Output_Directory_Path' : _Prop_Output_Directory_Path,
-	'Post_Linker' : _Prop_Post_Linker,
-	'Pre_Linker' : _Prop_Pre_Linker,
-	'Target_Name' : _Prop_Target_Name,
-	'Use_Relative_Paths' : _Prop_Use_Relative_Paths,
+    'Linker' : _Prop_Linker,
+    'Output_Directory_Location' : _Prop_Output_Directory_Location,
+    'Output_Directory_Origin' : _Prop_Output_Directory_Origin,
+    'Output_Directory_Path' : _Prop_Output_Directory_Path,
+    'Post_Linker' : _Prop_Post_Linker,
+    'Pre_Linker' : _Prop_Pre_Linker,
+    'Target_Name' : _Prop_Target_Name,
+    'Use_Relative_Paths' : _Prop_Use_Relative_Paths,
 }
 Target_Settings._privelemdict = {
 }
 Target_Source_Trees._superclassnames = []
 Target_Source_Trees._privpropdict = {
-	'Source_Trees' : _Prop_Source_Trees,
+    'Source_Trees' : _Prop_Source_Trees,
 }
 Target_Source_Trees._privelemdict = {
 }
 VCS_Setup._superclassnames = []
 VCS_Setup._privpropdict = {
-	'Always_Prompt' : _Prop_Always_Prompt,
-	'Auto_Connect' : _Prop_Auto_Connect,
-	'Connection_Method' : _Prop_Connection_Method,
-	'Database_Path' : _Prop_Database_Path,
-	'Local_Path' : _Prop_Local_Path,
-	'Mount_Volume' : _Prop_Mount_Volume,
-	'Password' : _Prop_Password,
-	'Store_Password' : _Prop_Store_Password,
-	'Use_Global_Settings' : _Prop_Use_Global_Settings,
-	'Username' : _Prop_Username,
-	'VCS_Active' : _Prop_VCS_Active,
+    'Always_Prompt' : _Prop_Always_Prompt,
+    'Auto_Connect' : _Prop_Auto_Connect,
+    'Connection_Method' : _Prop_Connection_Method,
+    'Database_Path' : _Prop_Database_Path,
+    'Local_Path' : _Prop_Local_Path,
+    'Mount_Volume' : _Prop_Mount_Volume,
+    'Password' : _Prop_Password,
+    'Store_Password' : _Prop_Store_Password,
+    'Use_Global_Settings' : _Prop_Use_Global_Settings,
+    'Username' : _Prop_Username,
+    'VCS_Active' : _Prop_VCS_Active,
 }
 VCS_Setup._privelemdict = {
 }
 Font._superclassnames = []
 Font._privpropdict = {
-	'Auto_Indent' : _Prop_Auto_Indent,
-	'Tab_Indents_Selection' : _Prop_Tab_Indents_Selection,
-	'Tab_Inserts_Spaces' : _Prop_Tab_Inserts_Spaces,
-	'Tab_Size' : _Prop_Tab_Size,
-	'Text_Font' : _Prop_Text_Font,
-	'Text_Size' : _Prop_Text_Size,
+    'Auto_Indent' : _Prop_Auto_Indent,
+    'Tab_Indents_Selection' : _Prop_Tab_Indents_Selection,
+    'Tab_Inserts_Spaces' : _Prop_Tab_Inserts_Spaces,
+    'Tab_Size' : _Prop_Tab_Size,
+    'Text_Font' : _Prop_Text_Font,
+    'Text_Size' : _Prop_Text_Size,
 }
 Font._privelemdict = {
 }
 _Enum_Acce = {
-	'public' : 'Publ',	# 
-	'protected' : 'Prot',	# 
-	'private' : 'Priv',	# 
+    'public' : 'Publ',	# 
+    'protected' : 'Prot',	# 
+    'private' : 'Priv',	# 
 }
 
 _Enum_BXbr = {
-	'Always_Build' : 'BXb1',	# Always build the target before running.
-	'Ask_Build' : 'BXb2',	# Ask before building the target when running.
-	'Never_Build' : 'BXb3',	# Never before building the target before running.
+    'Always_Build' : 'BXb1',	# Always build the target before running.
+    'Ask_Build' : 'BXb2',	# Ask before building the target when running.
+    'Never_Build' : 'BXb3',	# Never before building the target before running.
 }
 
 _Enum_DbSA = {
-	'No_Action' : 'DSA1',	# Don\xd5t do anything to non-debug windows
-	'Hide_Windows' : 'DSA2',	# Hide non-debugging windows
-	'Collapse_Windows' : 'DSA3',	# Collapse non-debugging windows
-	'Close_Windows' : 'DSA4',	# Close non-debugging windows
+    'No_Action' : 'DSA1',	# Don\xd5t do anything to non-debug windows
+    'Hide_Windows' : 'DSA2',	# Hide non-debugging windows
+    'Collapse_Windows' : 'DSA3',	# Collapse non-debugging windows
+    'Close_Windows' : 'DSA4',	# Close non-debugging windows
 }
 
 _Enum_DgBL = {
-	'Always' : 'DgB0',	# Always build before debugging.
-	'Never' : 'DgB1',	# Never build before debugging.
-	'Ask' : 'DgB2',	# Ask about building before debugging.
+    'Always' : 'DgB0',	# Always build before debugging.
+    'Never' : 'DgB1',	# Never build before debugging.
+    'Ask' : 'DgB2',	# Ask about building before debugging.
 }
 
 _Enum_ErrT = {
-	'information' : 'ErIn',	# 
-	'compiler_warning' : 'ErCW',	# 
-	'compiler_error' : 'ErCE',	# 
-	'definition' : 'ErDf',	# 
-	'linker_warning' : 'ErLW',	# 
-	'linker_error' : 'ErLE',	# 
-	'find_result' : 'ErFn',	# 
-	'generic_error' : 'ErGn',	# 
+    'information' : 'ErIn',	# 
+    'compiler_warning' : 'ErCW',	# 
+    'compiler_error' : 'ErCE',	# 
+    'definition' : 'ErDf',	# 
+    'linker_warning' : 'ErLW',	# 
+    'linker_error' : 'ErLE',	# 
+    'find_result' : 'ErFn',	# 
+    'generic_error' : 'ErGn',	# 
 }
 
 _Enum_Inte = {
-	'never_interact' : 'eNvr',	# Never allow user interactions
-	'interact_with_self' : 'eInS',	# Allow user interaction only when an AppleEvent is sent from within CodeWarrior
-	'interact_with_local' : 'eInL',	# Allow user interaction when AppleEvents are sent from applications on the same machine (default)
-	'interact_with_all' : 'eInA',	# Allow user interaction from both local and remote AppleEvents
+    'never_interact' : 'eNvr',	# Never allow user interactions
+    'interact_with_self' : 'eInS',	# Allow user interaction only when an AppleEvent is sent from within CodeWarrior
+    'interact_with_local' : 'eInL',	# Allow user interaction when AppleEvents are sent from applications on the same machine (default)
+    'interact_with_all' : 'eInA',	# Allow user interaction from both local and remote AppleEvents
 }
 
 _Enum_Lang = {
-	'C' : 'LC  ',	# 
-	'C_2b__2b_' : 'LC++',	# 
-	'Pascal' : 'LP  ',	# 
-	'Object_Pascal' : 'LP++',	# 
-	'Java' : 'LJav',	# 
-	'Assembler' : 'LAsm',	# 
-	'Unknown' : 'L?  ',	# 
+    'C' : 'LC  ',	# 
+    'C_2b__2b_' : 'LC++',	# 
+    'Pascal' : 'LP  ',	# 
+    'Object_Pascal' : 'LP++',	# 
+    'Java' : 'LJav',	# 
+    'Assembler' : 'LAsm',	# 
+    'Unknown' : 'L?  ',	# 
 }
 
 _Enum_PPrm = {
-	'absolute' : 'Abso',	# An absolute path name, including volume name.
-	'project_relative' : 'PRel',	# A path relative to the current project\xd5s folder.
-	'shell_relative' : 'SRel',	# A path relative to the CodeWarrior\xaa folder.
-	'system_relative' : 'YRel',	# A path relative to the system folder
-	'root_relative' : 'RRel',	# 
+    'absolute' : 'Abso',	# An absolute path name, including volume name.
+    'project_relative' : 'PRel',	# A path relative to the current project\xd5s folder.
+    'shell_relative' : 'SRel',	# A path relative to the CodeWarrior\xaa folder.
+    'system_relative' : 'YRel',	# A path relative to the system folder
+    'root_relative' : 'RRel',	# 
 }
 
 _Enum_PXdg = {
-	'Diagnose_None' : 'PXd1',	# No Plugin Diagnostics.
-	'Diagnose_Errors' : 'PXd2',	# Plugin Diagnostics for errors only.
-	'Diagnose_All' : 'PXd3',	# Plugin Diagnostics for everything.
+    'Diagnose_None' : 'PXd1',	# No Plugin Diagnostics.
+    'Diagnose_Errors' : 'PXd2',	# Plugin Diagnostics for errors only.
+    'Diagnose_All' : 'PXd3',	# Plugin Diagnostics for everything.
 }
 
 _Enum_PthF = {
-	'Generic_Path' : 'PFGn',	# 
-	'MacOS_Path' : 'PFMc',	# MacOS path using colon as separator
-	'Windows_Path' : 'PFWn',	# Windows path using backslash as separator
-	'Unix_Path' : 'PFUx',	# Unix path using slash as separator
+    'Generic_Path' : 'PFGn',	# 
+    'MacOS_Path' : 'PFMc',	# MacOS path using colon as separator
+    'Windows_Path' : 'PFWn',	# Windows path using backslash as separator
+    'Unix_Path' : 'PFUx',	# Unix path using slash as separator
 }
 
 _Enum_RefP = {
-	'Think_Reference' : 'DanR',	# 
-	'QuickView' : 'ALTV',	# 
+    'Think_Reference' : 'DanR',	# 
+    'QuickView' : 'ALTV',	# 
 }
 
 _Enum_STKd = {
-	'Absolute_Path' : 'STK0',	# The \xd2path\xd3 property is an absolute path to the location of the source tree.
-	'Registry_Key' : 'STK1',	# The \xd2path\xd3 property is the name of a registry key that contains the path to the root.
-	'Environment_Variable' : 'STK2',	# The \xd2path\xd3 property is the name of an environment variable that contains the path to the root.
+    'Absolute_Path' : 'STK0',	# The \xd2path\xd3 property is an absolute path to the location of the source tree.
+    'Registry_Key' : 'STK1',	# The \xd2path\xd3 property is the name of a registry key that contains the path to the root.
+    'Environment_Variable' : 'STK2',	# The \xd2path\xd3 property is the name of an environment variable that contains the path to the root.
 }
 
 _Enum_SrcT = {
-	'source' : 'FTxt',	# A source file (.c, .cp, .p, etc).
-	'unknown' : 'FUnk',	# An unknown file type.
+    'source' : 'FTxt',	# A source file (.c, .cp, .p, etc).
+    'unknown' : 'FUnk',	# An unknown file type.
 }
 
 _Enum_TmpB = {
-	'User_Specified' : 'Usrs',	# Use user specified symbols when setting temporary breakpoints on program launch.
-	'Default' : 'Dflt',	# Use system default symbols when setting temporary breakpoints on program launch.
+    'User_Specified' : 'Usrs',	# Use user specified symbols when setting temporary breakpoints on program launch.
+    'Default' : 'Dflt',	# Use system default symbols when setting temporary breakpoints on program launch.
 }
 
 _Enum_TxtF = {
-	'MacOS' : 'TxF0',	# MacOS text format
-	'DOS' : 'TxF1',	# DOS text format
-	'Unix' : 'TxF2',	# Unix text format
+    'MacOS' : 'TxF0',	# MacOS text format
+    'DOS' : 'TxF1',	# DOS text format
+    'Unix' : 'TxF2',	# Unix text format
 }
 
 _Enum_savo = {
-	'yes' : 'yes ',	# Save changes
-	'no' : 'no  ',	# Do not save changes
-	'ask' : 'ask ',	# Ask the user whether to save
+    'yes' : 'yes ',	# Save changes
+    'no' : 'no  ',	# Do not save changes
+    'ask' : 'ask ',	# Ask the user whether to save
 }
 
 
@@ -2136,40 +2136,238 @@ _Enum_savo = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'BRKW' : Browser_Coloring,
-	'BSTG' : Build_Settings,
-	'BsCl' : base_class,
-	'CUKW' : Custom_Keywords,
-	'Cata' : browser_catalog,
-	'Clas' : class_,
-	'DbDS' : Debugger_Display,
-	'DbGL' : Debugger_Global,
-	'DbTG' : Debugger_Target,
-	'DbWN' : Debugger_Windowing,
-	'DtMb' : data_member,
-	'EDTR' : Editor,
-	'EnvV' : Environment_Variable,
-	'ErrM' : Error_Information,
-	'FDef' : Function_Information,
-	'FLMP' : File_Mappings,
-	'FMap' : File_Mapping,
-	'GSTs' : Global_Source_Trees,
-	'GXTR' : Extras,
-	'LXTR' : Build_Extras,
-	'MbFn' : member_function,
-	'PATH' : Access_Paths,
-	'PInf' : Path_Information,
-	'PSTG' : Plugin_Settings,
-	'RSTG' : Runtime_Settings,
-	'RlPt' : Relative_Path,
-	'SFit' : Shielded_Folder,
-	'SHFL' : Shielded_Folders,
-	'SNTX' : Syntax_Coloring,
-	'Seg ' : Segment,
-	'SrcF' : ProjectFile,
-	'SrcT' : Source_Tree,
-	'TARG' : Target_Settings,
-	'TSTs' : Target_Source_Trees,
-	'VCSs' : VCS_Setup,
-	'mFNT' : Font,
+    'BRKW' : Browser_Coloring,
+    'BSTG' : Build_Settings,
+    'BsCl' : base_class,
+    'CUKW' : Custom_Keywords,
+    'Cata' : browser_catalog,
+    'Clas' : class_,
+    'DbDS' : Debugger_Display,
+    'DbGL' : Debugger_Global,
+    'DbTG' : Debugger_Target,
+    'DbWN' : Debugger_Windowing,
+    'DtMb' : data_member,
+    'EDTR' : Editor,
+    'EnvV' : Environment_Variable,
+    'ErrM' : Error_Information,
+    'FDef' : Function_Information,
+    'FLMP' : File_Mappings,
+    'FMap' : File_Mapping,
+    'GSTs' : Global_Source_Trees,
+    'GXTR' : Extras,
+    'LXTR' : Build_Extras,
+    'MbFn' : member_function,
+    'PATH' : Access_Paths,
+    'PInf' : Path_Information,
+    'PSTG' : Plugin_Settings,
+    'RSTG' : Runtime_Settings,
+    'RlPt' : Relative_Path,
+    'SFit' : Shielded_Folder,
+    'SHFL' : Shielded_Folders,
+    'SNTX' : Syntax_Coloring,
+    'Seg ' : Segment,
+    'SrcF' : ProjectFile,
+    'SrcT' : Source_Tree,
+    'TARG' : Target_Settings,
+    'TSTs' : Target_Source_Trees,
+    'VCSs' : VCS_Setup,
+    'mFNT' : Font,
+}
+
+_propdeclarations = {
+    'Acce' : _Prop_access,
+    'BW00' : _Prop_Browser_Keywords,
+    'BW01' : _Prop_Classes_Color,
+    'BW02' : _Prop_Constants_Color,
+    'BW03' : _Prop_Enums_Color,
+    'BW04' : _Prop_Functions_Color,
+    'BW05' : _Prop_Globals_Color,
+    'BW06' : _Prop_Macros_Color,
+    'BW07' : _Prop_Templates_Color,
+    'BW08' : _Prop_Typedefs_Color,
+    'BW10' : _Prop_Template_Commands_in_Menu,
+    'BX01' : _Prop_Completion_Sound,
+    'BX02' : _Prop_Success_Sound,
+    'BX03' : _Prop_Failure_Sound,
+    'BX04' : _Prop_Build_Before_Running,
+    'BX05' : _Prop_Include_Cache_Size,
+    'BX06' : _Prop_Compiler_Thread_Stack_Size,
+    'BX07' : _Prop_Save_Before_Building,
+    'Bfor' : _Prop_initialize_before,
+    'CSiz' : _Prop_codesize,
+    'Clas' : _Prop_class_,
+    'DSiz' : _Prop_datasize,
+    'Db01' : _Prop_Show_Variable_Types,
+    'Db02' : _Prop_Sort_By_Method,
+    'Db03' : _Prop_Use_RTTI,
+    'Db04' : _Prop_Threads_in_Window,
+    'Db05' : _Prop_Variable_Hints,
+    'Db06' : _Prop_Watchpoint_Hilite,
+    'Db07' : _Prop_Variable_Changed_Hilite,
+    'Db08' : _Prop_Default_Array_Size,
+    'Db09' : _Prop_Show_Locals,
+    'Db10' : _Prop_Show_As_Decimal,
+    'DcEn' : _Prop_declaration_end_offset,
+    'DcFl' : _Prop_declaration_file,
+    'DcSt' : _Prop_declaration_start_offset,
+    'DfEn' : _Prop_implementation_end_offset,
+    'DfFl' : _Prop_implementation_file,
+    'DfSt' : _Prop_implementation_start_offset,
+    'Dg01' : _Prop_Ignore_Mod_Dates,
+    'Dg02' : _Prop_Open_All_Classes,
+    'Dg03' : _Prop_Launch_Apps_on_Open,
+    'Dg04' : _Prop_Confirm_Kill,
+    'Dg05' : _Prop_Stop_at_Main,
+    'Dg06' : _Prop_Select_Stack_Crawl,
+    'Dg07' : _Prop_Dont_Step_in_Runtime,
+    'Dg11' : _Prop_Auto_Target_Libraries,
+    'Dg12' : _Prop_Cache_Edited_Files,
+    'Dg13' : _Prop_File_Cache_Duration,
+    'Dt02' : _Prop_Log_System_Messages,
+    'Dt08' : _Prop_Update_Data_While_Running,
+    'Dt09' : _Prop_Data_Update_Interval,
+    'Dt10' : _Prop_Relocated_Executable_Path,
+    'Dt13' : _Prop_Stop_at_temp_breakpoint,
+    'Dt14' : _Prop_Temp_breakpoint_names,
+    'Dt15' : _Prop_Cache_symbolics,
+    'Dt16' : _Prop_Temp_Breakpoint_Type,
+    'Dw01' : _Prop_Debugging_Start_Action,
+    'Dw02' : _Prop_Do_Nothing_To_Projects,
+    'ED01' : _Prop_Flash_Delay,
+    'ED02' : _Prop_Dynamic_Scroll,
+    'ED03' : _Prop_Balance,
+    'ED04' : _Prop_Use_Drag__26__Drop_Editing,
+    'ED06' : _Prop_Sort_Function_Popup,
+    'ED07' : _Prop_Use_Multiple_Undo,
+    'ED08' : _Prop_Remember_Font,
+    'ED09' : _Prop_Remember_Selection,
+    'ED10' : _Prop_Remember_Window,
+    'ED12' : _Prop_Main_Text_Color,
+    'ED13' : _Prop_Background_Color,
+    'ED14' : _Prop_Context_Popup_Delay,
+    'ED15' : _Prop_Relaxed_C_Popup_Parsing,
+    'ED16' : _Prop_Left_Margin_Line_Select,
+    'ED17' : _Prop_Default_Text_File_Format,
+    'EX04' : _Prop_Modification_Date_Caching,
+    'EX07' : _Prop_Full_Screen_Zoom,
+    'EX08' : _Prop_External_Reference,
+    'EX09' : _Prop_Browser_Active,
+    'EX10' : _Prop_Use_Editor_Extensions,
+    'EX11' : _Prop_Use_External_Editor,
+    'EX12' : _Prop_Use_Script_Menu,
+    'EX16' : _Prop_Recent_Editor_Count,
+    'EX17' : _Prop_Recent_Project_Count,
+    'EX18' : _Prop_Use_ToolServer_Menu,
+    'EX19' : _Prop_Automatic_Toolbar_Help,
+    'EX30' : _Prop_Dump_Browser_Info,
+    'EX31' : _Prop_Cache_Subproject_Data,
+    'ErrL' : _Prop_lineNumber,
+    'ErrS' : _Prop_message,
+    'ErrT' : _Prop_messageKind,
+    'FMps' : _Prop_Mappings,
+    'FN01' : _Prop_Auto_Indent,
+    'FN02' : _Prop_Tab_Size,
+    'FN03' : _Prop_Tab_Indents_Selection,
+    'FN04' : _Prop_Tab_Inserts_Spaces,
+    'Frmt' : _Prop_format,
+    'Frmw' : _Prop_framework,
+    'GH01' : _Prop_Syntax_Coloring,
+    'GH02' : _Prop_Comment_Color,
+    'GH03' : _Prop_Keyword_Color,
+    'GH04' : _Prop_String_Color,
+    'GH05' : _Prop_Custom_Color_1,
+    'GH06' : _Prop_Custom_Color_2,
+    'GH07' : _Prop_Custom_Color_3,
+    'GH08' : _Prop_Custom_Color_4,
+    'HstF' : _Prop_host_flags,
+    'IncF' : _Prop_includes,
+    'Kind' : _Prop_path_kind,
+    'Lang' : _Prop_language,
+    'NumF' : _Prop_filecount,
+    'Orig' : _Prop_origin,
+    'PA01' : _Prop_User_Paths,
+    'PA02' : _Prop_Always_Full_Search,
+    'PA03' : _Prop_System_Paths,
+    'PA04' : _Prop_Convert_Paths,
+    'PA05' : _Prop_Require_Framework_Includes,
+    'PLck' : _Prop_seg_2d_locked,
+    'PR04' : _Prop_File_Type,
+    'PX01' : _Prop_Plugin_Diagnostics_Level,
+    'PX02' : _Prop_Disable_Third_Party_COM_Plugins,
+    'Path' : _Prop_path,
+    'Prel' : _Prop_seg_2d_preloaded,
+    'Prot' : _Prop_seg_2d_protected,
+    'Purg' : _Prop_seg_2d_purgeable,
+    'RS01' : _Prop_Host_Application,
+    'RS02' : _Prop_Command_Line_Arguments,
+    'RS03' : _Prop_Working_Directory,
+    'RS04' : _Prop_Environment_Variables,
+    'Recu' : _Prop_recursive,
+    'Root' : _Prop_root,
+    'SF01' : _Prop_Expression_To_Match,
+    'SF02' : _Prop_Skip_Project_Operations,
+    'SF03' : _Prop_Skip_Find_And_Compare_Operations,
+    'SFis' : _Prop_Shielded_Items,
+    'ST01' : _Prop_Source_Trees,
+    'SrcT' : _Prop_filetype,
+    'Stat' : _Prop_static,
+    'SubA' : _Prop_all_subclasses,
+    'SubC' : _Prop_subclasses,
+    'SymG' : _Prop_symbols,
+    'SysH' : _Prop_seg_2d_system_heap,
+    'TA01' : _Prop_Linker,
+    'TA02' : _Prop_Extension,
+    'TA03' : _Prop_Precompiled,
+    'TA04' : _Prop_Resource_File,
+    'TA05' : _Prop_Launchable,
+    'TA06' : _Prop_Ignored_by_Make,
+    'TA07' : _Prop_Compiler,
+    'TA09' : _Prop_Post_Linker,
+    'TA10' : _Prop_Target_Name,
+    'TA11' : _Prop_Output_Directory_Path,
+    'TA12' : _Prop_Output_Directory_Origin,
+    'TA13' : _Prop_Pre_Linker,
+    'TA15' : _Prop_Use_Relative_Paths,
+    'TA16' : _Prop_Output_Directory_Location,
+    'UpTD' : _Prop_up_to_date,
+    'VC01' : _Prop_VCS_Active,
+    'VC02' : _Prop_Connection_Method,
+    'VC03' : _Prop_Username,
+    'VC04' : _Prop_Password,
+    'VC05' : _Prop_Auto_Connect,
+    'VC06' : _Prop_Store_Password,
+    'VC07' : _Prop_Always_Prompt,
+    'VC08' : _Prop_Mount_Volume,
+    'VC09' : _Prop_Database_Path,
+    'VC10' : _Prop_Local_Path,
+    'VC11' : _Prop_Use_Global_Settings,
+    'Valu' : _Prop_value,
+    'Virt' : _Prop_virtual,
+    'Weak' : _Prop_weak_link,
+    'file' : _Prop_disk_file,
+    'pnam' : _Prop_name,
+    'ptps' : _Prop_Text_Size,
+    'ptxf' : _Prop_Text_Font,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+    'Acce' : _Enum_Acce,
+    'BXbr' : _Enum_BXbr,
+    'DbSA' : _Enum_DbSA,
+    'DgBL' : _Enum_DgBL,
+    'ErrT' : _Enum_ErrT,
+    'Inte' : _Enum_Inte,
+    'Lang' : _Enum_Lang,
+    'PPrm' : _Enum_PPrm,
+    'PXdg' : _Enum_PXdg,
+    'PthF' : _Enum_PthF,
+    'RefP' : _Enum_RefP,
+    'STKd' : _Enum_STKd,
+    'SrcT' : _Enum_SrcT,
+    'TmpB' : _Enum_TmpB,
+    'TxtF' : _Enum_TxtF,
+    'savo' : _Enum_savo,
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Required.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Required.py
index 75f4cd3..a1b6c33 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Required.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Required.py
@@ -13,35 +13,35 @@ _code = 'reqd'
 from StdSuites.Required_Suite import *
 class Required_Events(Required_Suite_Events):
 
-	_argmap_open = {
-		'converting' : 'Conv',
-	}
-
-	def open(self, _object, _attributes={}, **_arguments):
-		"""open: Open the specified object(s)
-		Required argument: list of objects to open
-		Keyword argument converting: Whether to convert project to latest version (yes/no; default is ask).
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'odoc'
-
-		aetools.keysubst(_arguments, self._argmap_open)
-		_arguments['----'] = _object
-
-		aetools.enumsubst(_arguments, 'Conv', _Enum_Conv)
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    _argmap_open = {
+        'converting' : 'Conv',
+    }
+
+    def open(self, _object, _attributes={}, **_arguments):
+        """open: Open the specified object(s)
+        Required argument: list of objects to open
+        Keyword argument converting: Whether to convert project to latest version (yes/no; default is ask).
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'odoc'
+
+        aetools.keysubst(_arguments, self._argmap_open)
+        _arguments['----'] = _object
+
+        aetools.enumsubst(_arguments, 'Conv', _Enum_Conv)
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 _Enum_Conv = {
-	'yes' : 'yes ',	# Convert the project if necessary on open
-	'no' : 'no  ',	# Do not convert the project if needed on open
+    'yes' : 'yes ',	# Convert the project if necessary on open
+    'no' : 'no  ',	# Do not convert the project if needed on open
 }
 
 
@@ -50,3 +50,13 @@ _Enum_Conv = {
 #
 _classdeclarations = {
 }
+
+_propdeclarations = {
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+    'Conv' : _Enum_Conv,
+}
diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Standard_Suite.py
index 2879818..abc846a 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/Standard_Suite.py
@@ -13,351 +13,351 @@ _code = 'CoRe'
 from StdSuites.Standard_Suite import *
 class Standard_Suite_Events(Standard_Suite_Events):
 
-	_argmap_close = {
-		'saving' : 'savo',
-		'saving_in' : 'kfil',
-	}
-
-	def close(self, _object, _attributes={}, **_arguments):
-		"""close: close an object
-		Required argument: the object to close
-		Keyword argument saving: specifies whether or not changes should be saved before closing
-		Keyword argument saving_in: the file in which to save the object
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'core'
-		_subcode = 'clos'
-
-		aetools.keysubst(_arguments, self._argmap_close)
-		_arguments['----'] = _object
-
-		aetools.enumsubst(_arguments, 'savo', _Enum_savo)
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_count = {
-		'each' : 'kocl',
-	}
-
-	def count(self, _object, _attributes={}, **_arguments):
-		"""count: return the number of elements of a particular class within an object
-		Required argument: the object whose elements are to be counted
-		Keyword argument each: the class of the elements to be counted. Keyword 'each' is optional in AppleScript
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the number of elements
-		"""
-		_code = 'core'
-		_subcode = 'cnte'
-
-		aetools.keysubst(_arguments, self._argmap_count)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_get = {
-		'as' : 'rtyp',
-	}
-
-	def get(self, _object, _attributes={}, **_arguments):
-		"""get: get the data for an object
-		Required argument: the object whose data is to be returned
-		Keyword argument as: the desired types for the data, in order of preference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: The data from the object
-		"""
-		_code = 'core'
-		_subcode = 'getd'
-
-		aetools.keysubst(_arguments, self._argmap_get)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_make = {
-		'new' : 'kocl',
-		'as' : 'rtyp',
-		'at' : 'insh',
-		'with_data' : 'data',
-		'with_properties' : 'prdt',
-	}
-
-	def make(self, _no_object=None, _attributes={}, **_arguments):
-		"""make: make a new element
-		Keyword argument new: the class of the new element\xd1keyword 'new' is optional in AppleScript
-		Keyword argument as: the desired types for the data, in order of preference
-		Keyword argument at: the location at which to insert the element
-		Keyword argument with_data: the initial data for the element
-		Keyword argument with_properties: the initial values for the properties of the element
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: to the new object(s)
-		"""
-		_code = 'core'
-		_subcode = 'crel'
-
-		aetools.keysubst(_arguments, self._argmap_make)
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def select(self, _object=None, _attributes={}, **_arguments):
-		"""select: select the specified object
-		Required argument: the object to select
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'misc'
-		_subcode = 'slct'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_set = {
-		'to' : 'data',
-	}
-
-	def set(self, _object, _attributes={}, **_arguments):
-		"""set: set an object's data
-		Required argument: the object to change
-		Keyword argument to: the new value
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'core'
-		_subcode = 'setd'
-
-		aetools.keysubst(_arguments, self._argmap_set)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    _argmap_close = {
+        'saving' : 'savo',
+        'saving_in' : 'kfil',
+    }
+
+    def close(self, _object, _attributes={}, **_arguments):
+        """close: close an object
+        Required argument: the object to close
+        Keyword argument saving: specifies whether or not changes should be saved before closing
+        Keyword argument saving_in: the file in which to save the object
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'core'
+        _subcode = 'clos'
+
+        aetools.keysubst(_arguments, self._argmap_close)
+        _arguments['----'] = _object
+
+        aetools.enumsubst(_arguments, 'savo', _Enum_savo)
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_count = {
+        'each' : 'kocl',
+    }
+
+    def count(self, _object, _attributes={}, **_arguments):
+        """count: return the number of elements of a particular class within an object
+        Required argument: the object whose elements are to be counted
+        Keyword argument each: the class of the elements to be counted. Keyword 'each' is optional in AppleScript
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the number of elements
+        """
+        _code = 'core'
+        _subcode = 'cnte'
+
+        aetools.keysubst(_arguments, self._argmap_count)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_get = {
+        'as' : 'rtyp',
+    }
+
+    def get(self, _object, _attributes={}, **_arguments):
+        """get: get the data for an object
+        Required argument: the object whose data is to be returned
+        Keyword argument as: the desired types for the data, in order of preference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: The data from the object
+        """
+        _code = 'core'
+        _subcode = 'getd'
+
+        aetools.keysubst(_arguments, self._argmap_get)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_make = {
+        'new' : 'kocl',
+        'as' : 'rtyp',
+        'at' : 'insh',
+        'with_data' : 'data',
+        'with_properties' : 'prdt',
+    }
+
+    def make(self, _no_object=None, _attributes={}, **_arguments):
+        """make: make a new element
+        Keyword argument new: the class of the new element\xd1keyword 'new' is optional in AppleScript
+        Keyword argument as: the desired types for the data, in order of preference
+        Keyword argument at: the location at which to insert the element
+        Keyword argument with_data: the initial data for the element
+        Keyword argument with_properties: the initial values for the properties of the element
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: to the new object(s)
+        """
+        _code = 'core'
+        _subcode = 'crel'
+
+        aetools.keysubst(_arguments, self._argmap_make)
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def select(self, _object=None, _attributes={}, **_arguments):
+        """select: select the specified object
+        Required argument: the object to select
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'misc'
+        _subcode = 'slct'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_set = {
+        'to' : 'data',
+    }
+
+    def set(self, _object, _attributes={}, **_arguments):
+        """set: set an object's data
+        Required argument: the object to change
+        Keyword argument to: the new value
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'core'
+        _subcode = 'setd'
+
+        aetools.keysubst(_arguments, self._argmap_set)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 class application(aetools.ComponentItem):
-	"""application - an application program """
-	want = 'capp'
+    """application - an application program """
+    want = 'capp'
 class _Prop_user_interaction(aetools.NProperty):
-	"""user interaction - user interaction level """
-	which = 'inte'
-	want = 'Inte'
+    """user interaction - user interaction level """
+    which = 'inte'
+    want = 'Inte'
 #        element 'cwin' as ['indx', 'name', 'rang']
 #        element 'docu' as ['indx', 'name', 'rang']
 
 class character(aetools.ComponentItem):
-	"""character - a character """
-	want = 'cha '
+    """character - a character """
+    want = 'cha '
 class _Prop_length(aetools.NProperty):
-	"""length - length in characters of this object """
-	which = 'pLen'
-	want = 'long'
+    """length - length in characters of this object """
+    which = 'pLen'
+    want = 'long'
 class _Prop_offset(aetools.NProperty):
-	"""offset - offset of a text object from the beginning of the document (first char has offset 1) """
-	which = 'pOff'
-	want = 'long'
+    """offset - offset of a text object from the beginning of the document (first char has offset 1) """
+    which = 'pOff'
+    want = 'long'
 
 class insertion_point(aetools.ComponentItem):
-	"""insertion point - An insertion location between two objects """
-	want = 'cins'
+    """insertion point - An insertion location between two objects """
+    want = 'cins'
 
 class line(aetools.ComponentItem):
-	"""line - lines of text """
-	want = 'clin'
+    """line - lines of text """
+    want = 'clin'
 class _Prop_index(aetools.NProperty):
-	"""index - index of a line object from the beginning of the document (first line has index 1) """
-	which = 'pidx'
-	want = 'long'
+    """index - index of a line object from the beginning of the document (first line has index 1) """
+    which = 'pidx'
+    want = 'long'
 #        element 'cha ' as ['indx', 'rang', 'rele']
 
 lines = line
 
 class selection_2d_object(aetools.ComponentItem):
-	"""selection-object - the selection visible to the user """
-	want = 'csel'
+    """selection-object - the selection visible to the user """
+    want = 'csel'
 class _Prop_contents(aetools.NProperty):
-	"""contents - the contents of the selection """
-	which = 'pcnt'
-	want = 'type'
+    """contents - the contents of the selection """
+    which = 'pcnt'
+    want = 'type'
 #        element 'cha ' as ['indx', 'rele', 'rang', 'test']
 #        element 'clin' as ['indx', 'rang', 'rele']
 #        element 'ctxt' as ['rang']
 
 class text(aetools.ComponentItem):
-	"""text - Text """
-	want = 'ctxt'
+    """text - Text """
+    want = 'ctxt'
 #        element 'cha ' as ['indx', 'rele', 'rang']
 #        element 'cins' as ['rele']
 #        element 'clin' as ['indx', 'rang', 'rele']
 #        element 'ctxt' as ['rang']
 
 class window(aetools.ComponentItem):
-	"""window - A window """
-	want = 'cwin'
+    """window - A window """
+    want = 'cwin'
 class _Prop_bounds(aetools.NProperty):
-	"""bounds - the boundary rectangle for the window """
-	which = 'pbnd'
-	want = 'qdrt'
+    """bounds - the boundary rectangle for the window """
+    which = 'pbnd'
+    want = 'qdrt'
 class _Prop_document(aetools.NProperty):
-	"""document - the document that owns this window """
-	which = 'docu'
-	want = 'docu'
+    """document - the document that owns this window """
+    which = 'docu'
+    want = 'docu'
 class _Prop_name(aetools.NProperty):
-	"""name - the title of the window """
-	which = 'pnam'
-	want = 'itxt'
+    """name - the title of the window """
+    which = 'pnam'
+    want = 'itxt'
 class _Prop_position(aetools.NProperty):
-	"""position - upper left coordinates of window """
-	which = 'ppos'
-	want = 'QDpt'
+    """position - upper left coordinates of window """
+    which = 'ppos'
+    want = 'QDpt'
 class _Prop_visible(aetools.NProperty):
-	"""visible - is the window visible? """
-	which = 'pvis'
-	want = 'bool'
+    """visible - is the window visible? """
+    which = 'pvis'
+    want = 'bool'
 class _Prop_zoomed(aetools.NProperty):
-	"""zoomed - Is the window zoomed? """
-	which = 'pzum'
-	want = 'bool'
+    """zoomed - Is the window zoomed? """
+    which = 'pzum'
+    want = 'bool'
 
 windows = window
 
 class document(aetools.ComponentItem):
-	"""document - a document """
-	want = 'docu'
+    """document - a document """
+    want = 'docu'
 class _Prop_file_permissions(aetools.NProperty):
-	"""file permissions - the file permissions for the document """
-	which = 'PERM'
-	want = 'PERM'
+    """file permissions - the file permissions for the document """
+    which = 'PERM'
+    want = 'PERM'
 class _Prop_kind(aetools.NProperty):
-	"""kind - the kind of document """
-	which = 'DKND'
-	want = 'DKND'
+    """kind - the kind of document """
+    which = 'DKND'
+    want = 'DKND'
 class _Prop_location(aetools.NProperty):
-	"""location - the file of the document """
-	which = 'FILE'
-	want = 'fss '
+    """location - the file of the document """
+    which = 'FILE'
+    want = 'fss '
 class _Prop_window(aetools.NProperty):
-	"""window - the window of the document. """
-	which = 'cwin'
-	want = 'cwin'
+    """window - the window of the document. """
+    which = 'cwin'
+    want = 'cwin'
 
 documents = document
 
 class files(aetools.ComponentItem):
-	"""files - Every file """
-	want = 'file'
+    """files - Every file """
+    want = 'file'
 
 file = files
 application._superclassnames = []
 application._privpropdict = {
-	'user_interaction' : _Prop_user_interaction,
+    'user_interaction' : _Prop_user_interaction,
 }
 application._privelemdict = {
-	'document' : document,
-	'window' : window,
+    'document' : document,
+    'window' : window,
 }
 character._superclassnames = []
 character._privpropdict = {
-	'length' : _Prop_length,
-	'offset' : _Prop_offset,
+    'length' : _Prop_length,
+    'offset' : _Prop_offset,
 }
 character._privelemdict = {
 }
 insertion_point._superclassnames = []
 insertion_point._privpropdict = {
-	'length' : _Prop_length,
-	'offset' : _Prop_offset,
+    'length' : _Prop_length,
+    'offset' : _Prop_offset,
 }
 insertion_point._privelemdict = {
 }
 line._superclassnames = []
 line._privpropdict = {
-	'index' : _Prop_index,
-	'length' : _Prop_length,
-	'offset' : _Prop_offset,
+    'index' : _Prop_index,
+    'length' : _Prop_length,
+    'offset' : _Prop_offset,
 }
 line._privelemdict = {
-	'character' : character,
+    'character' : character,
 }
 selection_2d_object._superclassnames = []
 selection_2d_object._privpropdict = {
-	'contents' : _Prop_contents,
-	'length' : _Prop_length,
-	'offset' : _Prop_offset,
+    'contents' : _Prop_contents,
+    'length' : _Prop_length,
+    'offset' : _Prop_offset,
 }
 selection_2d_object._privelemdict = {
-	'character' : character,
-	'line' : line,
-	'text' : text,
+    'character' : character,
+    'line' : line,
+    'text' : text,
 }
 text._superclassnames = []
 text._privpropdict = {
-	'length' : _Prop_length,
-	'offset' : _Prop_offset,
+    'length' : _Prop_length,
+    'offset' : _Prop_offset,
 }
 text._privelemdict = {
-	'character' : character,
-	'insertion_point' : insertion_point,
-	'line' : line,
-	'text' : text,
+    'character' : character,
+    'insertion_point' : insertion_point,
+    'line' : line,
+    'text' : text,
 }
 window._superclassnames = []
 window._privpropdict = {
-	'bounds' : _Prop_bounds,
-	'document' : _Prop_document,
-	'index' : _Prop_index,
-	'name' : _Prop_name,
-	'position' : _Prop_position,
-	'visible' : _Prop_visible,
-	'zoomed' : _Prop_zoomed,
+    'bounds' : _Prop_bounds,
+    'document' : _Prop_document,
+    'index' : _Prop_index,
+    'name' : _Prop_name,
+    'position' : _Prop_position,
+    'visible' : _Prop_visible,
+    'zoomed' : _Prop_zoomed,
 }
 window._privelemdict = {
 }
 document._superclassnames = []
 document._privpropdict = {
-	'file_permissions' : _Prop_file_permissions,
-	'index' : _Prop_index,
-	'kind' : _Prop_kind,
-	'location' : _Prop_location,
-	'name' : _Prop_name,
-	'window' : _Prop_window,
+    'file_permissions' : _Prop_file_permissions,
+    'index' : _Prop_index,
+    'kind' : _Prop_kind,
+    'location' : _Prop_location,
+    'name' : _Prop_name,
+    'window' : _Prop_window,
 }
 document._privelemdict = {
 }
@@ -371,13 +371,37 @@ files._privelemdict = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'capp' : application,
-	'cha ' : character,
-	'cins' : insertion_point,
-	'clin' : line,
-	'csel' : selection_2d_object,
-	'ctxt' : text,
-	'cwin' : window,
-	'docu' : document,
-	'file' : files,
+    'capp' : application,
+    'cha ' : character,
+    'cins' : insertion_point,
+    'clin' : line,
+    'csel' : selection_2d_object,
+    'ctxt' : text,
+    'cwin' : window,
+    'docu' : document,
+    'file' : files,
+}
+
+_propdeclarations = {
+    'DKND' : _Prop_kind,
+    'FILE' : _Prop_location,
+    'PERM' : _Prop_file_permissions,
+    'cwin' : _Prop_window,
+    'docu' : _Prop_document,
+    'inte' : _Prop_user_interaction,
+    'pLen' : _Prop_length,
+    'pOff' : _Prop_offset,
+    'pbnd' : _Prop_bounds,
+    'pcnt' : _Prop_contents,
+    'pidx' : _Prop_index,
+    'pnam' : _Prop_name,
+    'ppos' : _Prop_position,
+    'pvis' : _Prop_visible,
+    'pzum' : _Prop_zoomed,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
index a68de96..84c817d 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
@@ -10,19 +10,19 @@ import Required
 
 
 _code_to_module = {
-	'CWIE' : CodeWarrior_suite,
-	'CoRe' : Standard_Suite,
-	'MMPR' : Metrowerks_Shell_Suite,
-	'reqd' : Required,
+    'CWIE' : CodeWarrior_suite,
+    'CoRe' : Standard_Suite,
+    'MMPR' : Metrowerks_Shell_Suite,
+    'reqd' : Required,
 }
 
 
 
 _code_to_fullname = {
-	'CWIE' : ('CodeWarrior.CodeWarrior_suite', 'CodeWarrior_suite'),
-	'CoRe' : ('CodeWarrior.Standard_Suite', 'Standard_Suite'),
-	'MMPR' : ('CodeWarrior.Metrowerks_Shell_Suite', 'Metrowerks_Shell_Suite'),
-	'reqd' : ('CodeWarrior.Required', 'Required'),
+    'CWIE' : ('CodeWarrior.CodeWarrior_suite', 'CodeWarrior_suite'),
+    'CoRe' : ('CodeWarrior.Standard_Suite', 'Standard_Suite'),
+    'MMPR' : ('CodeWarrior.Metrowerks_Shell_Suite', 'Metrowerks_Shell_Suite'),
+    'reqd' : ('CodeWarrior.Required', 'Required'),
 }
 
 from CodeWarrior_suite import *
@@ -31,31 +31,22 @@ from Metrowerks_Shell_Suite import *
 from Required 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', {}))
+    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(character)
-getbaseclasses(text)
-getbaseclasses(window)
-getbaseclasses(file)
-getbaseclasses(line)
-getbaseclasses(selection_2d_object)
-getbaseclasses(application)
-getbaseclasses(insertion_point)
-getbaseclasses(document)
 getbaseclasses(single_class_browser)
 getbaseclasses(project_document)
 getbaseclasses(symbol_browser)
@@ -109,82 +100,91 @@ getbaseclasses(Font)
 getbaseclasses(Target_Source_Trees)
 getbaseclasses(Debugger_Display)
 getbaseclasses(class_)
+getbaseclasses(character)
+getbaseclasses(text)
+getbaseclasses(window)
+getbaseclasses(file)
+getbaseclasses(line)
+getbaseclasses(selection_2d_object)
+getbaseclasses(application)
+getbaseclasses(insertion_point)
+getbaseclasses(document)
 
 #
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'cha ' : character,
-	'ctxt' : text,
-	'cwin' : window,
-	'file' : file,
-	'clin' : line,
-	'csel' : selection_2d_object,
-	'capp' : application,
-	'cins' : insertion_point,
-	'docu' : document,
-	'1BRW' : single_class_browser,
-	'PRJD' : project_document,
-	'SYMB' : symbol_browser,
-	'EDIT' : editor_document,
-	'COMP' : file_compare_document,
-	'BROW' : class_browser,
-	'SBTG' : subtarget,
-	'MSSG' : message_document,
-	'INSP' : project_inspector,
-	'TXTD' : text_document,
-	'CTLG' : catalog_document,
-	'HIER' : class_hierarchy,
-	'TRGT' : target,
-	'PRGS' : build_progress_document,
-	'SRCF' : target_file,
-	'TOOL' : ToolServer_worksheet,
-	'1HIR' : single_class_hierarchy,
-	'FMap' : File_Mapping,
-	'Cata' : browser_catalog,
-	'BSTG' : Build_Settings,
-	'SrcF' : ProjectFile,
-	'BRKW' : Browser_Coloring,
-	'ErrM' : Error_Information,
-	'VCSs' : VCS_Setup,
-	'EDTR' : Editor,
-	'SHFL' : Shielded_Folders,
-	'SFit' : Shielded_Folder,
-	'CUKW' : Custom_Keywords,
-	'PInf' : Path_Information,
-	'FLMP' : File_Mappings,
-	'Seg ' : Segment,
-	'DbTG' : Debugger_Target,
-	'FDef' : Function_Information,
-	'PATH' : Access_Paths,
-	'GXTR' : Extras,
-	'DbWN' : Debugger_Windowing,
-	'GSTs' : Global_Source_Trees,
-	'SNTX' : Syntax_Coloring,
-	'BsCl' : base_class,
-	'RlPt' : Relative_Path,
-	'TARG' : Target_Settings,
-	'EnvV' : Environment_Variable,
-	'SrcT' : Source_Tree,
-	'DbGL' : Debugger_Global,
-	'MbFn' : member_function,
-	'RSTG' : Runtime_Settings,
-	'PSTG' : Plugin_Settings,
-	'DtMb' : data_member,
-	'LXTR' : Build_Extras,
-	'mFNT' : Font,
-	'TSTs' : Target_Source_Trees,
-	'DbDS' : Debugger_Display,
-	'Clas' : class_,
+    '1BRW' : single_class_browser,
+    'PRJD' : project_document,
+    'SYMB' : symbol_browser,
+    'EDIT' : editor_document,
+    'COMP' : file_compare_document,
+    'BROW' : class_browser,
+    'SBTG' : subtarget,
+    'MSSG' : message_document,
+    'INSP' : project_inspector,
+    'TXTD' : text_document,
+    'CTLG' : catalog_document,
+    'HIER' : class_hierarchy,
+    'TRGT' : target,
+    'PRGS' : build_progress_document,
+    'SRCF' : target_file,
+    'TOOL' : ToolServer_worksheet,
+    '1HIR' : single_class_hierarchy,
+    'FMap' : File_Mapping,
+    'Cata' : browser_catalog,
+    'BSTG' : Build_Settings,
+    'SrcF' : ProjectFile,
+    'BRKW' : Browser_Coloring,
+    'ErrM' : Error_Information,
+    'VCSs' : VCS_Setup,
+    'EDTR' : Editor,
+    'SHFL' : Shielded_Folders,
+    'SFit' : Shielded_Folder,
+    'CUKW' : Custom_Keywords,
+    'PInf' : Path_Information,
+    'FLMP' : File_Mappings,
+    'Seg ' : Segment,
+    'DbTG' : Debugger_Target,
+    'FDef' : Function_Information,
+    'PATH' : Access_Paths,
+    'GXTR' : Extras,
+    'DbWN' : Debugger_Windowing,
+    'GSTs' : Global_Source_Trees,
+    'SNTX' : Syntax_Coloring,
+    'BsCl' : base_class,
+    'RlPt' : Relative_Path,
+    'TARG' : Target_Settings,
+    'EnvV' : Environment_Variable,
+    'SrcT' : Source_Tree,
+    'DbGL' : Debugger_Global,
+    'MbFn' : member_function,
+    'RSTG' : Runtime_Settings,
+    'PSTG' : Plugin_Settings,
+    'DtMb' : data_member,
+    'LXTR' : Build_Extras,
+    'mFNT' : Font,
+    'TSTs' : Target_Source_Trees,
+    'DbDS' : Debugger_Display,
+    'Clas' : class_,
+    'cha ' : character,
+    'ctxt' : text,
+    'cwin' : window,
+    'file' : file,
+    'clin' : line,
+    'csel' : selection_2d_object,
+    'capp' : application,
+    'cins' : insertion_point,
+    'docu' : document,
 }
 
 
 class CodeWarrior(CodeWarrior_suite_Events,
-		Standard_Suite_Events,
-		Metrowerks_Shell_Suite_Events,
-		Required_Events,
-		aetools.TalkTo):
-	_signature = 'CWIE'
+        Standard_Suite_Events,
+        Metrowerks_Shell_Suite_Events,
+        Required_Events,
+        aetools.TalkTo):
+    _signature = 'CWIE'
 
-	_moduleName = 'CodeWarrior'
+    _moduleName = 'CodeWarrior'
 
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 bcf1120..bce9e76 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py
@@ -12,72 +12,72 @@ _code = 'MSIE'
 
 class Microsoft_Internet_Explorer_Events:
 
-	def GetSource(self, _object=None, _attributes={}, **_arguments):
-		"""GetSource: Get the HTML source of a browser window
-		Required argument: Window Identifier of window from which to get the source. No value means get the source from the frontmost window.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: undocumented, typecode 'TEXT'
-		"""
-		_code = 'MSIE'
-		_subcode = 'SORC'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def PrintBrowserWindow(self, _object=None, _attributes={}, **_arguments):
-		"""PrintBrowserWindow: Print contents of browser window (HTML)
-		Required argument: Window Identifier of the window to print. No value means print the frontmost browser window.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'misc'
-		_subcode = 'pWND'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_do_script = {
-		'window' : 'WIND',
-	}
-
-	def do_script(self, _object, _attributes={}, **_arguments):
-		"""do script: Execute script commands
-		Required argument: JavaScript text to execute
-		Keyword argument window: optional Window Identifier (as supplied by the ListWindows event) specifying context in which to execute the script
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Return value
-		"""
-		_code = 'misc'
-		_subcode = 'dosc'
-
-		aetools.keysubst(_arguments, self._argmap_do_script)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    def GetSource(self, _object=None, _attributes={}, **_arguments):
+        """GetSource: Get the HTML source of a browser window
+        Required argument: Window Identifier of window from which to get the source. No value means get the source from the frontmost window.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: undocumented, typecode 'TEXT'
+        """
+        _code = 'MSIE'
+        _subcode = 'SORC'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def PrintBrowserWindow(self, _object=None, _attributes={}, **_arguments):
+        """PrintBrowserWindow: Print contents of browser window (HTML)
+        Required argument: Window Identifier of the window to print. No value means print the frontmost browser window.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'misc'
+        _subcode = 'pWND'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_do_script = {
+        'window' : 'WIND',
+    }
+
+    def do_script(self, _object, _attributes={}, **_arguments):
+        """do script: Execute script commands
+        Required argument: JavaScript text to execute
+        Keyword argument window: optional Window Identifier (as supplied by the ListWindows event) specifying context in which to execute the script
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: Return value
+        """
+        _code = 'misc'
+        _subcode = 'dosc'
+
+        aetools.keysubst(_arguments, self._argmap_do_script)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 #
@@ -85,3 +85,12 @@ class Microsoft_Internet_Explorer_Events:
 #
 _classdeclarations = {
 }
+
+_propdeclarations = {
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+}
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/Netscape_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Netscape_Suite.py
index 3d91737..c274e70 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Netscape_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Netscape_Suite.py
@@ -12,25 +12,25 @@ _code = 'MOSS'
 
 class Netscape_Suite_Events:
 
-	def Open_bookmark(self, _object=None, _attributes={}, **_arguments):
-		"""Open bookmark: Opens a bookmark file
-		Required argument: If not available, reloads the current bookmark file
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MOSS'
-		_subcode = 'book'
+    def Open_bookmark(self, _object=None, _attributes={}, **_arguments):
+        """Open bookmark: Opens a bookmark file
+        Required argument: If not available, reloads the current bookmark file
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'MOSS'
+        _subcode = 'book'
 
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
 
 
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 #
@@ -38,3 +38,12 @@ class Netscape_Suite_Events:
 #
 _classdeclarations = {
 }
+
+_propdeclarations = {
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+}
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/Required_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Required_Suite.py
index 987da0d..e023acd 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Required_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Required_Suite.py
@@ -13,83 +13,83 @@ _code = 'reqd'
 from StdSuites.Required_Suite import *
 class Required_Suite_Events(Required_Suite_Events):
 
-	def open(self, _object, _attributes={}, **_arguments):
-		"""open: Open documents
-		Required argument: undocumented, typecode 'alis'
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'odoc'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def print_(self, _object, _attributes={}, **_arguments):
-		"""print: Print documents
-		Required argument: undocumented, typecode 'alis'
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'pdoc'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def quit(self, _no_object=None, _attributes={}, **_arguments):
-		"""quit: Quit application
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'quit'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def run(self, _no_object=None, _attributes={}, **_arguments):
-		"""run: 
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'oapp'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    def open(self, _object, _attributes={}, **_arguments):
+        """open: Open documents
+        Required argument: undocumented, typecode 'alis'
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'odoc'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def print_(self, _object, _attributes={}, **_arguments):
+        """print: Print documents
+        Required argument: undocumented, typecode 'alis'
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'pdoc'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def quit(self, _no_object=None, _attributes={}, **_arguments):
+        """quit: Quit application
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'quit'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def run(self, _no_object=None, _attributes={}, **_arguments):
+        """run: 
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'oapp'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 #
@@ -97,3 +97,12 @@ class Required_Suite_Events(Required_Suite_Events):
 #
 _classdeclarations = {
 }
+
+_propdeclarations = {
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+}
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/Standard_Suite.py
index b7aff28..b9cbbcd 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Standard_Suite.py
@@ -12,43 +12,43 @@ _code = '****'
 
 class Standard_Suite_Events:
 
-	_argmap_get = {
-		'as' : 'rtyp',
-	}
+    _argmap_get = {
+        'as' : 'rtyp',
+    }
 
-	def get(self, _object, _attributes={}, **_arguments):
-		"""get: 
-		Required argument: an AE object reference
-		Keyword argument as: undocumented, typecode 'type'
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'core'
-		_subcode = 'getd'
+    def get(self, _object, _attributes={}, **_arguments):
+        """get: 
+        Required argument: an AE object reference
+        Keyword argument as: undocumented, typecode 'type'
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'core'
+        _subcode = 'getd'
 
-		aetools.keysubst(_arguments, self._argmap_get)
-		_arguments['----'] = _object
+        aetools.keysubst(_arguments, self._argmap_get)
+        _arguments['----'] = _object
 
 
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 class application(aetools.ComponentItem):
-	"""application - An application program """
-	want = 'capp'
+    """application - An application program """
+    want = 'capp'
 class _Prop_selected_text(aetools.NProperty):
-	"""selected text - the selected text """
-	which = 'stxt'
-	want = 'TEXT'
+    """selected text - the selected text """
+    which = 'stxt'
+    want = 'TEXT'
 application._superclassnames = []
 application._privpropdict = {
-	'selected_text' : _Prop_selected_text,
+    'selected_text' : _Prop_selected_text,
 }
 application._privelemdict = {
 }
@@ -57,5 +57,15 @@ application._privelemdict = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'capp' : application,
+    'capp' : application,
+}
+
+_propdeclarations = {
+    'stxt' : _Prop_selected_text,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/URL_Suite.py b/Lib/plat-mac/lib-scriptpackages/Explorer/URL_Suite.py
index 1cb939d..e234546 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/URL_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/URL_Suite.py
@@ -12,30 +12,30 @@ _code = 'GURL'
 
 class URL_Suite_Events:
 
-	_argmap_GetURL = {
-		'to' : 'dest',
-	}
+    _argmap_GetURL = {
+        'to' : 'dest',
+    }
 
-	def GetURL(self, _object, _attributes={}, **_arguments):
-		"""GetURL: Open the URL (and optionally save it to disk)
-		Required argument: URL to open
-		Keyword argument to: File into which to save resource located at URL.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'GURL'
-		_subcode = 'GURL'
+    def GetURL(self, _object, _attributes={}, **_arguments):
+        """GetURL: Open the URL (and optionally save it to disk)
+        Required argument: URL to open
+        Keyword argument to: File into which to save resource located at URL.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'GURL'
+        _subcode = 'GURL'
 
-		aetools.keysubst(_arguments, self._argmap_GetURL)
-		_arguments['----'] = _object
+        aetools.keysubst(_arguments, self._argmap_GetURL)
+        _arguments['----'] = _object
 
 
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 #
@@ -43,3 +43,12 @@ class URL_Suite_Events:
 #
 _classdeclarations = {
 }
+
+_propdeclarations = {
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+}
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 3d46135..a05d795 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/Web_Browser_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/Web_Browser_Suite.py
@@ -12,202 +12,202 @@ _code = 'WWW!'
 
 class Web_Browser_Suite_Events:
 
-	def Activate(self, _object=None, _attributes={}, **_arguments):
-		"""Activate: Activate Internet Explorer and optionally select window designated by Window Identifier.
-		Required argument: Window Identifier
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Window Identifier of window to activate
-		"""
-		_code = 'WWW!'
-		_subcode = 'ACTV'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def CloseAllWindows(self, _no_object=None, _attributes={}, **_arguments):
-		"""CloseAllWindows: Closes all windows
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Success
-		"""
-		_code = 'WWW!'
-		_subcode = 'CLSA'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_CloseWindow = {
-		'ID' : 'WIND',
-		'Title' : 'TITL',
-	}
-
-	def CloseWindow(self, _no_object=None, _attributes={}, **_arguments):
-		"""CloseWindow: Close the window specified by either Window Identifier or Title. If no parameter is specified, close the top window.
-		Keyword argument ID: ID of the window to close. (Can use -1 for top window)
-		Keyword argument Title: Title of the window to close
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Success
-		"""
-		_code = 'WWW!'
-		_subcode = 'CLOS'
-
-		aetools.keysubst(_arguments, self._argmap_CloseWindow)
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def GetWindowInfo(self, _object, _attributes={}, **_arguments):
-		"""GetWindowInfo: Returns a window info record (URL/Title) for the specified window.
-		Required argument: Window Identifier of the window
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns:   
-		"""
-		_code = 'WWW!'
-		_subcode = 'WNFO'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def ListWindows(self, _no_object=None, _attributes={}, **_arguments):
-		"""ListWindows: Returns list of Window Identifiers for all open windows.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: undocumented, typecode 'list'
-		"""
-		_code = 'WWW!'
-		_subcode = 'LSTW'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_OpenURL = {
-		'to' : 'INTO',
-		'toWindow' : 'WIND',
-		'Flags' : 'FLGS',
-		'FormData' : 'POST',
-		'MIME_Type' : 'MIME',
-	}
-
-	def OpenURL(self, _object, _attributes={}, **_arguments):
-		"""OpenURL: Retrieves URL off the Web.
-		Required argument: Fully-qualified URL
-		Keyword argument to: Target file for saving downloaded data
-		Keyword argument toWindow: Target window for resource at URL (-1 for top window, 0 for new window)
-		Keyword argument Flags: Valid Flags settings are: 1-Ignore the document cache; 2-Ignore the image cache; 4-Operate in background mode.
-		Keyword argument FormData: data to post
-		Keyword argument MIME_Type: MIME type of data being posted
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'WWW!'
-		_subcode = 'OURL'
-
-		aetools.keysubst(_arguments, self._argmap_OpenURL)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_ParseAnchor = {
-		'withURL' : 'RELA',
-	}
-
-	def ParseAnchor(self, _object, _attributes={}, **_arguments):
-		"""ParseAnchor: Combines a base URL and a relative URL to produce a fully-qualified URL
-		Required argument: Base URL
-		Keyword argument withURL: Relative URL that is combined with the Base URL (in the direct object) to produce a fully-qualified URL.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Fully-qualified URL
-		"""
-		_code = 'WWW!'
-		_subcode = 'PRSA'
-
-		aetools.keysubst(_arguments, self._argmap_ParseAnchor)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_ShowFile = {
-		'MIME_Type' : 'MIME',
-		'Window_Identifier' : 'WIND',
-		'URL' : 'URL ',
-	}
-
-	def ShowFile(self, _object, _attributes={}, **_arguments):
-		"""ShowFile: FileSpec containing data of specified MIME type to be rendered in window specified by Window Identifier.
-		Required argument: The file
-		Keyword argument MIME_Type: MIME type
-		Keyword argument Window_Identifier: Identifier of the target window for the URL. (Can use -1 for top window)
-		Keyword argument URL: URL that allows this document to be reloaded.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'WWW!'
-		_subcode = 'SHWF'
-
-		aetools.keysubst(_arguments, self._argmap_ShowFile)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    def Activate(self, _object=None, _attributes={}, **_arguments):
+        """Activate: Activate Internet Explorer and optionally select window designated by Window Identifier.
+        Required argument: Window Identifier
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: Window Identifier of window to activate
+        """
+        _code = 'WWW!'
+        _subcode = 'ACTV'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def CloseAllWindows(self, _no_object=None, _attributes={}, **_arguments):
+        """CloseAllWindows: Closes all windows
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: Success
+        """
+        _code = 'WWW!'
+        _subcode = 'CLSA'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_CloseWindow = {
+        'ID' : 'WIND',
+        'Title' : 'TITL',
+    }
+
+    def CloseWindow(self, _no_object=None, _attributes={}, **_arguments):
+        """CloseWindow: Close the window specified by either Window Identifier or Title. If no parameter is specified, close the top window.
+        Keyword argument ID: ID of the window to close. (Can use -1 for top window)
+        Keyword argument Title: Title of the window to close
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: Success
+        """
+        _code = 'WWW!'
+        _subcode = 'CLOS'
+
+        aetools.keysubst(_arguments, self._argmap_CloseWindow)
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def GetWindowInfo(self, _object, _attributes={}, **_arguments):
+        """GetWindowInfo: Returns a window info record (URL/Title) for the specified window.
+        Required argument: Window Identifier of the window
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns:   
+        """
+        _code = 'WWW!'
+        _subcode = 'WNFO'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def ListWindows(self, _no_object=None, _attributes={}, **_arguments):
+        """ListWindows: Returns list of Window Identifiers for all open windows.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: undocumented, typecode 'list'
+        """
+        _code = 'WWW!'
+        _subcode = 'LSTW'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_OpenURL = {
+        'to' : 'INTO',
+        'toWindow' : 'WIND',
+        'Flags' : 'FLGS',
+        'FormData' : 'POST',
+        'MIME_Type' : 'MIME',
+    }
+
+    def OpenURL(self, _object, _attributes={}, **_arguments):
+        """OpenURL: Retrieves URL off the Web.
+        Required argument: Fully-qualified URL
+        Keyword argument to: Target file for saving downloaded data
+        Keyword argument toWindow: Target window for resource at URL (-1 for top window, 0 for new window)
+        Keyword argument Flags: Valid Flags settings are: 1-Ignore the document cache; 2-Ignore the image cache; 4-Operate in background mode.
+        Keyword argument FormData: data to post
+        Keyword argument MIME_Type: MIME type of data being posted
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'WWW!'
+        _subcode = 'OURL'
+
+        aetools.keysubst(_arguments, self._argmap_OpenURL)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_ParseAnchor = {
+        'withURL' : 'RELA',
+    }
+
+    def ParseAnchor(self, _object, _attributes={}, **_arguments):
+        """ParseAnchor: Combines a base URL and a relative URL to produce a fully-qualified URL
+        Required argument: Base URL
+        Keyword argument withURL: Relative URL that is combined with the Base URL (in the direct object) to produce a fully-qualified URL.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: Fully-qualified URL
+        """
+        _code = 'WWW!'
+        _subcode = 'PRSA'
+
+        aetools.keysubst(_arguments, self._argmap_ParseAnchor)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_ShowFile = {
+        'MIME_Type' : 'MIME',
+        'Window_Identifier' : 'WIND',
+        'URL' : 'URL ',
+    }
+
+    def ShowFile(self, _object, _attributes={}, **_arguments):
+        """ShowFile: FileSpec containing data of specified MIME type to be rendered in window specified by Window Identifier.
+        Required argument: The file
+        Keyword argument MIME_Type: MIME type
+        Keyword argument Window_Identifier: Identifier of the target window for the URL. (Can use -1 for top window)
+        Keyword argument URL: URL that allows this document to be reloaded.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'WWW!'
+        _subcode = 'SHWF'
+
+        aetools.keysubst(_arguments, self._argmap_ShowFile)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 #
@@ -215,3 +215,12 @@ class Web_Browser_Suite_Events:
 #
 _classdeclarations = {
 }
+
+_propdeclarations = {
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+}
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py b/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py
index 3fac0f82..796e646 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py
@@ -12,23 +12,23 @@ import Required_Suite
 
 
 _code_to_module = {
-	'****' : Standard_Suite,
-	'GURL' : URL_Suite,
-	'MOSS' : Netscape_Suite,
-	'MSIE' : Microsoft_Internet_Explorer,
-	'WWW!' : Web_Browser_Suite,
-	'reqd' : Required_Suite,
+    '****' : Standard_Suite,
+    'GURL' : URL_Suite,
+    'MOSS' : Netscape_Suite,
+    'MSIE' : Microsoft_Internet_Explorer,
+    'WWW!' : Web_Browser_Suite,
+    'reqd' : Required_Suite,
 }
 
 
 
 _code_to_fullname = {
-	'****' : ('Explorer.Standard_Suite', 'Standard_Suite'),
-	'GURL' : ('Explorer.URL_Suite', 'URL_Suite'),
-	'MOSS' : ('Explorer.Netscape_Suite', 'Netscape_Suite'),
-	'MSIE' : ('Explorer.Microsoft_Internet_Explorer', 'Microsoft_Internet_Explorer'),
-	'WWW!' : ('Explorer.Web_Browser_Suite', 'Web_Browser_Suite'),
-	'reqd' : ('Explorer.Required_Suite', 'Required_Suite'),
+    '****' : ('Explorer.Standard_Suite', 'Standard_Suite'),
+    'GURL' : ('Explorer.URL_Suite', 'URL_Suite'),
+    'MOSS' : ('Explorer.Netscape_Suite', 'Netscape_Suite'),
+    'MSIE' : ('Explorer.Microsoft_Internet_Explorer', 'Microsoft_Internet_Explorer'),
+    'WWW!' : ('Explorer.Web_Browser_Suite', 'Web_Browser_Suite'),
+    'reqd' : ('Explorer.Required_Suite', 'Required_Suite'),
 }
 
 from Standard_Suite import *
@@ -39,16 +39,16 @@ from Web_Browser_Suite import *
 from Required_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', {}))
+    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
 
@@ -61,18 +61,18 @@ getbaseclasses(application)
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'capp' : application,
+    'capp' : application,
 }
 
 
 class Explorer(Standard_Suite_Events,
-		URL_Suite_Events,
-		Netscape_Suite_Events,
-		Microsoft_Internet_Explorer_Events,
-		Web_Browser_Suite_Events,
-		Required_Suite_Events,
-		aetools.TalkTo):
-	_signature = 'MSIE'
+        URL_Suite_Events,
+        Netscape_Suite_Events,
+        Microsoft_Internet_Explorer_Events,
+        Web_Browser_Suite_Events,
+        Required_Suite_Events,
+        aetools.TalkTo):
+    _signature = 'MSIE'
 
-	_moduleName = 'Explorer'
+    _moduleName = 'Explorer'
 
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 08b9e76..e495ef4 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Containers_and_folders.py
@@ -12,44 +12,44 @@ _code = 'fndr'
 
 class Containers_and_folders_Events:
 
-	pass
+    pass
 
 
 class disk(aetools.ComponentItem):
-	"""disk - A disk """
-	want = 'cdis'
+    """disk - A disk """
+    want = 'cdis'
 class _Prop__3c_Inheritance_3e_(aetools.NProperty):
-	"""<Inheritance> - inherits some of its properties from the container class """
-	which = 'c@#^'
-	want = 'ctnr'
+    """<Inheritance> - inherits some of its properties from the container class """
+    which = 'c@#^'
+    want = 'ctnr'
 class _Prop_capacity(aetools.NProperty):
-	"""capacity - the total number of bytes (free or used) on the disk """
-	which = 'capa'
-	want = 'comp'
+    """capacity - the total number of bytes (free or used) on the disk """
+    which = 'capa'
+    want = 'comp'
 class _Prop_ejectable(aetools.NProperty):
-	"""ejectable - Can the media be ejected (floppies, CD's, and so on)? """
-	which = 'isej'
-	want = 'bool'
+    """ejectable - Can the media be ejected (floppies, CD's, and so on)? """
+    which = 'isej'
+    want = 'bool'
 class _Prop_format(aetools.NProperty):
-	"""format - the filesystem format of this disk """
-	which = 'dfmt'
-	want = 'edfm'
+    """format - the filesystem format of this disk """
+    which = 'dfmt'
+    want = 'edfm'
 class _Prop_free_space(aetools.NProperty):
-	"""free space - the number of free bytes left on the disk """
-	which = 'frsp'
-	want = 'comp'
+    """free space - the number of free bytes left on the disk """
+    which = 'frsp'
+    want = 'comp'
 class _Prop_ignore_privileges(aetools.NProperty):
-	"""ignore privileges - Ignore permissions on this disk? """
-	which = 'igpr'
-	want = 'bool'
+    """ignore privileges - Ignore permissions on this disk? """
+    which = 'igpr'
+    want = 'bool'
 class _Prop_local_volume(aetools.NProperty):
-	"""local volume - Is the media a local volume (as opposed to a file server)? """
-	which = 'isrv'
-	want = 'bool'
+    """local volume - Is the media a local volume (as opposed to a file server)? """
+    which = 'isrv'
+    want = 'bool'
 class _Prop_startup(aetools.NProperty):
-	"""startup - Is this disk the boot disk? """
-	which = 'istd'
-	want = 'bool'
+    """startup - Is this disk the boot disk? """
+    which = 'istd'
+    want = 'bool'
 #        element 'alia' as ['indx', 'name']
 #        element 'appf' as ['indx', 'name', 'ID  ']
 #        element 'cfol' as ['indx', 'name', 'ID  ']
@@ -64,8 +64,8 @@ class _Prop_startup(aetools.NProperty):
 disks = disk
 
 class desktop_2d_object(aetools.ComponentItem):
-	"""desktop-object - Desktop-object is the class of the \xd2desktop\xd3 object """
-	want = 'cdsk'
+    """desktop-object - Desktop-object is the class of the \xd2desktop\xd3 object """
+    want = 'cdsk'
 #        element 'alia' as ['indx', 'name']
 #        element 'appf' as ['indx', 'name', 'ID  ']
 #        element 'cdis' as ['indx', 'name']
@@ -79,8 +79,8 @@ class desktop_2d_object(aetools.ComponentItem):
 #        element 'pack' as ['indx', 'name']
 
 class folder(aetools.ComponentItem):
-	"""folder - A folder """
-	want = 'cfol'
+    """folder - A folder """
+    want = 'cfol'
 #        element 'alia' as ['indx', 'name']
 #        element 'appf' as ['indx', 'name', 'ID  ']
 #        element 'cfol' as ['indx', 'name', 'ID  ']
@@ -95,28 +95,28 @@ class folder(aetools.ComponentItem):
 folders = folder
 
 class container(aetools.ComponentItem):
-	"""container - An item that contains other items """
-	want = 'ctnr'
+    """container - An item that contains other items """
+    want = 'ctnr'
 class _Prop_completely_expanded(aetools.NProperty):
-	"""completely expanded - (NOT AVAILABLE YET) Are the container and all of its children opened as outlines? (can only be set for containers viewed as lists) """
-	which = 'pexc'
-	want = 'bool'
+    """completely expanded - (NOT AVAILABLE YET) Are the container and all of its children opened as outlines? (can only be set for containers viewed as lists) """
+    which = 'pexc'
+    want = 'bool'
 class _Prop_container_window(aetools.NProperty):
-	"""container window - the container window for this folder """
-	which = 'cwnd'
-	want = 'obj '
+    """container window - the container window for this folder """
+    which = 'cwnd'
+    want = 'obj '
 class _Prop_entire_contents(aetools.NProperty):
-	"""entire contents - the entire contents of the container, including the contents of its children """
-	which = 'ects'
-	want = 'obj '
+    """entire contents - the entire contents of the container, including the contents of its children """
+    which = 'ects'
+    want = 'obj '
 class _Prop_expandable(aetools.NProperty):
-	"""expandable - (NOT AVAILABLE YET) Is the container capable of being expanded as an outline? """
-	which = 'pexa'
-	want = 'bool'
+    """expandable - (NOT AVAILABLE YET) Is the container capable of being expanded as an outline? """
+    which = 'pexa'
+    want = 'bool'
 class _Prop_expanded(aetools.NProperty):
-	"""expanded - (NOT AVAILABLE YET) Is the container opened as an outline? (can only be set for containers viewed as lists) """
-	which = 'pexp'
-	want = 'bool'
+    """expanded - (NOT AVAILABLE YET) Is the container opened as an outline? (can only be set for containers viewed as lists) """
+    which = 'pexp'
+    want = 'bool'
 #        element 'alia' as ['indx', 'name']
 #        element 'appf' as ['indx', 'name', 'ID  ']
 #        element 'cfol' as ['indx', 'name', 'ID  ']
@@ -131,12 +131,12 @@ class _Prop_expanded(aetools.NProperty):
 containers = container
 
 class trash_2d_object(aetools.ComponentItem):
-	"""trash-object - Trash-object is the class of the \xd2trash\xd3 object """
-	want = 'ctrs'
+    """trash-object - Trash-object is the class of the \xd2trash\xd3 object """
+    want = 'ctrs'
 class _Prop_warns_before_emptying(aetools.NProperty):
-	"""warns before emptying - Display a dialog when emptying the trash? """
-	which = 'warn'
-	want = 'bool'
+    """warns before emptying - Display a dialog when emptying the trash? """
+    which = 'warn'
+    want = 'bool'
 #        element 'alia' as ['indx', 'name']
 #        element 'appf' as ['indx', 'name', 'ID  ']
 #        element 'cfol' as ['indx', 'name', 'ID  ']
@@ -151,106 +151,129 @@ disk._superclassnames = ['container']
 import Files
 import Finder_items
 disk._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'capacity' : _Prop_capacity,
-	'ejectable' : _Prop_ejectable,
-	'format' : _Prop_format,
-	'free_space' : _Prop_free_space,
-	'ignore_privileges' : _Prop_ignore_privileges,
-	'local_volume' : _Prop_local_volume,
-	'startup' : _Prop_startup,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'capacity' : _Prop_capacity,
+    'ejectable' : _Prop_ejectable,
+    'format' : _Prop_format,
+    'free_space' : _Prop_free_space,
+    'ignore_privileges' : _Prop_ignore_privileges,
+    'local_volume' : _Prop_local_volume,
+    'startup' : _Prop_startup,
 }
 disk._privelemdict = {
-	'alias_file' : Files.alias_file,
-	'application_file' : Files.application_file,
-	'clipping' : Files.clipping,
-	'container' : container,
-	'document_file' : Files.document_file,
-	'file' : Files.file,
-	'folder' : folder,
-	'internet_location_file' : Files.internet_location_file,
-	'item' : Finder_items.item,
-	'package' : Files.package,
+    'alias_file' : Files.alias_file,
+    'application_file' : Files.application_file,
+    'clipping' : Files.clipping,
+    'container' : container,
+    'document_file' : Files.document_file,
+    'file' : Files.file,
+    'folder' : folder,
+    'internet_location_file' : Files.internet_location_file,
+    'item' : Finder_items.item,
+    'package' : Files.package,
 }
 desktop_2d_object._superclassnames = ['container']
 desktop_2d_object._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 desktop_2d_object._privelemdict = {
-	'alias_file' : Files.alias_file,
-	'application_file' : Files.application_file,
-	'clipping' : Files.clipping,
-	'container' : container,
-	'disk' : disk,
-	'document_file' : Files.document_file,
-	'file' : Files.file,
-	'folder' : folder,
-	'internet_location_file' : Files.internet_location_file,
-	'item' : Finder_items.item,
-	'package' : Files.package,
+    'alias_file' : Files.alias_file,
+    'application_file' : Files.application_file,
+    'clipping' : Files.clipping,
+    'container' : container,
+    'disk' : disk,
+    'document_file' : Files.document_file,
+    'file' : Files.file,
+    'folder' : folder,
+    'internet_location_file' : Files.internet_location_file,
+    'item' : Finder_items.item,
+    'package' : Files.package,
 }
 folder._superclassnames = ['container']
 folder._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 folder._privelemdict = {
-	'alias_file' : Files.alias_file,
-	'application_file' : Files.application_file,
-	'clipping' : Files.clipping,
-	'container' : container,
-	'document_file' : Files.document_file,
-	'file' : Files.file,
-	'folder' : folder,
-	'internet_location_file' : Files.internet_location_file,
-	'item' : Finder_items.item,
-	'package' : Files.package,
+    'alias_file' : Files.alias_file,
+    'application_file' : Files.application_file,
+    'clipping' : Files.clipping,
+    'container' : container,
+    'document_file' : Files.document_file,
+    'file' : Files.file,
+    'folder' : folder,
+    'internet_location_file' : Files.internet_location_file,
+    'item' : Finder_items.item,
+    'package' : Files.package,
 }
 container._superclassnames = ['item']
 container._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'completely_expanded' : _Prop_completely_expanded,
-	'container_window' : _Prop_container_window,
-	'entire_contents' : _Prop_entire_contents,
-	'expandable' : _Prop_expandable,
-	'expanded' : _Prop_expanded,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'completely_expanded' : _Prop_completely_expanded,
+    'container_window' : _Prop_container_window,
+    'entire_contents' : _Prop_entire_contents,
+    'expandable' : _Prop_expandable,
+    'expanded' : _Prop_expanded,
 }
 container._privelemdict = {
-	'alias_file' : Files.alias_file,
-	'application_file' : Files.application_file,
-	'clipping' : Files.clipping,
-	'container' : container,
-	'document_file' : Files.document_file,
-	'file' : Files.file,
-	'folder' : folder,
-	'internet_location_file' : Files.internet_location_file,
-	'item' : Finder_items.item,
-	'package' : Files.package,
+    'alias_file' : Files.alias_file,
+    'application_file' : Files.application_file,
+    'clipping' : Files.clipping,
+    'container' : container,
+    'document_file' : Files.document_file,
+    'file' : Files.file,
+    'folder' : folder,
+    'internet_location_file' : Files.internet_location_file,
+    'item' : Finder_items.item,
+    'package' : Files.package,
 }
 trash_2d_object._superclassnames = ['container']
 trash_2d_object._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'warns_before_emptying' : _Prop_warns_before_emptying,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'warns_before_emptying' : _Prop_warns_before_emptying,
 }
 trash_2d_object._privelemdict = {
-	'alias_file' : Files.alias_file,
-	'application_file' : Files.application_file,
-	'clipping' : Files.clipping,
-	'container' : container,
-	'document_file' : Files.document_file,
-	'file' : Files.file,
-	'folder' : folder,
-	'internet_location_file' : Files.internet_location_file,
-	'item' : Finder_items.item,
-	'package' : Files.package,
+    'alias_file' : Files.alias_file,
+    'application_file' : Files.application_file,
+    'clipping' : Files.clipping,
+    'container' : container,
+    'document_file' : Files.document_file,
+    'file' : Files.file,
+    'folder' : folder,
+    'internet_location_file' : Files.internet_location_file,
+    'item' : Finder_items.item,
+    'package' : Files.package,
 }
 
 #
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'cdis' : disk,
-	'cdsk' : desktop_2d_object,
-	'cfol' : folder,
-	'ctnr' : container,
-	'ctrs' : trash_2d_object,
+    'cdis' : disk,
+    'cdsk' : desktop_2d_object,
+    'cfol' : folder,
+    'ctnr' : container,
+    'ctrs' : trash_2d_object,
+}
+
+_propdeclarations = {
+    'c@#^' : _Prop__3c_Inheritance_3e_,
+    'capa' : _Prop_capacity,
+    'cwnd' : _Prop_container_window,
+    'dfmt' : _Prop_format,
+    'ects' : _Prop_entire_contents,
+    'frsp' : _Prop_free_space,
+    'igpr' : _Prop_ignore_privileges,
+    'isej' : _Prop_ejectable,
+    'isrv' : _Prop_local_volume,
+    'istd' : _Prop_startup,
+    'pexa' : _Prop_expandable,
+    'pexc' : _Prop_completely_expanded,
+    'pexp' : _Prop_expanded,
+    'warn' : _Prop_warns_before_emptying,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Enumerations.py b/Lib/plat-mac/lib-scriptpackages/Finder/Enumerations.py
index e87d914..38336cc 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Enumerations.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Enumerations.py
@@ -13,109 +13,109 @@ _code = 'tpnm'
 from StdSuites.Type_Names_Suite import *
 class Enumerations_Events(Type_Names_Suite_Events):
 
-	pass
+    pass
 
 _Enum_earr = {
-	'not_arranged' : 'narr',	# 
-	'snap_to_grid' : 'grda',	# 
-	'arranged_by_name' : 'nama',	# 
-	'arranged_by_modification_date' : 'mdta',	# 
-	'arranged_by_creation_date' : 'cdta',	# 
-	'arranged_by_size' : 'siza',	# 
-	'arranged_by_kind' : 'kina',	# 
-	'arranged_by_label' : 'laba',	# 
+    'not_arranged' : 'narr',	# 
+    'snap_to_grid' : 'grda',	# 
+    'arranged_by_name' : 'nama',	# 
+    'arranged_by_modification_date' : 'mdta',	# 
+    'arranged_by_creation_date' : 'cdta',	# 
+    'arranged_by_size' : 'siza',	# 
+    'arranged_by_kind' : 'kina',	# 
+    'arranged_by_label' : 'laba',	# 
 }
 
 _Enum_ecvw = {
-	'icon_view' : 'icnv',	# 
-	'list_view' : 'lsvw',	# 
-	'column_view' : 'clvw',	# 
+    'icon_view' : 'icnv',	# 
+    'list_view' : 'lsvw',	# 
+    'column_view' : 'clvw',	# 
 }
 
 _Enum_edfm = {
-	'Mac_OS_format' : 'dfhf',	# 
-	'Mac_OS_Extended_format' : 'dfh+',	# 
-	'UFS_format' : 'dfuf',	# 
-	'NFS_format' : 'dfnf',	# 
-	'audio_format' : 'dfau',	# 
-	'ProDOS_format' : 'dfpr',	# 
-	'MS_2d_DOS_format' : 'dfms',	# 
-	'ISO_9660_format' : 'df96',	# 
-	'High_Sierra_format' : 'dfhs',	# 
-	'QuickTake_format' : 'dfqt',	# 
-	'Apple_Photo_format' : 'dfph',	# 
-	'AppleShare_format' : 'dfas',	# 
-	'UDF_format' : 'dfud',	# 
-	'WebDAV_format' : 'dfwd',	# 
-	'FTP_format' : 'dfft',	# 
-	'Packet_2d_written_UDF_format' : 'dfpu',	# 
-	'unknown_format' : 'df??',	# 
+    'Mac_OS_format' : 'dfhf',	# 
+    'Mac_OS_Extended_format' : 'dfh+',	# 
+    'UFS_format' : 'dfuf',	# 
+    'NFS_format' : 'dfnf',	# 
+    'audio_format' : 'dfau',	# 
+    'ProDOS_format' : 'dfpr',	# 
+    'MS_2d_DOS_format' : 'dfms',	# 
+    'ISO_9660_format' : 'df96',	# 
+    'High_Sierra_format' : 'dfhs',	# 
+    'QuickTake_format' : 'dfqt',	# 
+    'Apple_Photo_format' : 'dfph',	# 
+    'AppleShare_format' : 'dfas',	# 
+    'UDF_format' : 'dfud',	# 
+    'WebDAV_format' : 'dfwd',	# 
+    'FTP_format' : 'dfft',	# 
+    'Packet_2d_written_UDF_format' : 'dfpu',	# 
+    'unknown_format' : 'df??',	# 
 }
 
 _Enum_elsv = {
-	'name_column' : 'elsn',	# 
-	'modification_date_column' : 'elsm',	# 
-	'creation_date_column' : 'elsc',	# 
-	'size_column' : 'elss',	# 
-	'kind_column' : 'elsk',	# 
-	'label_column' : 'elsl',	# 
-	'version_column' : 'elsv',	# 
-	'comment_column' : 'elsC',	# 
+    'name_column' : 'elsn',	# 
+    'modification_date_column' : 'elsm',	# 
+    'creation_date_column' : 'elsc',	# 
+    'size_column' : 'elss',	# 
+    'kind_column' : 'elsk',	# 
+    'label_column' : 'elsl',	# 
+    'version_column' : 'elsv',	# 
+    'comment_column' : 'elsC',	# 
 }
 
 _Enum_ipnl = {
-	'General_Information_panel' : 'gpnl',	# 
-	'Sharing_panel' : 'spnl',	# 
-	'Memory_panel' : 'mpnl',	# 
-	'Preview_panel' : 'vpnl',	# 
-	'Application_panel' : 'apnl',	# 
-	'Languages_panel' : 'pklg',	# 
-	'Plugins_panel' : 'pkpg',	# 
-	'Name__26__Extension_panel' : 'npnl',	# 
-	'Comments_panel' : 'cpnl',	# 
-	'Content_Index_panel' : 'cinl',	# 
+    'General_Information_panel' : 'gpnl',	# 
+    'Sharing_panel' : 'spnl',	# 
+    'Memory_panel' : 'mpnl',	# 
+    'Preview_panel' : 'vpnl',	# 
+    'Application_panel' : 'apnl',	# 
+    'Languages_panel' : 'pklg',	# 
+    'Plugins_panel' : 'pkpg',	# 
+    'Name__26__Extension_panel' : 'npnl',	# 
+    'Comments_panel' : 'cpnl',	# 
+    'Content_Index_panel' : 'cinl',	# 
 }
 
 _Enum_isiz = {
-	'mini' : 'miic',	# 
-	'small' : 'smic',	# 
-	'large' : 'lgic',	# 
+    'mini' : 'miic',	# 
+    'small' : 'smic',	# 
+    'large' : 'lgic',	# 
 }
 
 _Enum_lvic = {
-	'small_icon' : 'smic',	# 
-	'large_icon' : 'lgic',	# 
+    'small_icon' : 'smic',	# 
+    'large_icon' : 'lgic',	# 
 }
 
 _Enum_priv = {
-	'read_only' : 'read',	# 
-	'read_write' : 'rdwr',	# 
-	'write_only' : 'writ',	# 
-	'none' : 'none',	# 
+    'read_only' : 'read',	# 
+    'read_write' : 'rdwr',	# 
+    'write_only' : 'writ',	# 
+    'none' : 'none',	# 
 }
 
 _Enum_sodr = {
-	'normal' : 'snrm',	# 
-	'reversed' : 'srvs',	# 
+    'normal' : 'snrm',	# 
+    'reversed' : 'srvs',	# 
 }
 
 _Enum_vwby = {
-	'conflicts' : 'cflc',	# 
-	'existing_items' : 'exsi',	# 
-	'small_icon' : 'smic',	# 
-	'icon' : 'iimg',	# 
-	'name' : 'pnam',	# 
-	'modification_date' : 'asmo',	# 
-	'size' : 'ptsz',	# 
-	'kind' : 'kind',	# 
-	'comment' : 'comt',	# 
-	'label' : 'labi',	# 
-	'version' : 'vers',	# 
-	'creation_date' : 'ascd',	# 
-	'small_button' : 'smbu',	# 
-	'large_button' : 'lgbu',	# 
-	'grid' : 'grid',	# 
-	'all' : 'kyal',	# 
+    'conflicts' : 'cflc',	# 
+    'existing_items' : 'exsi',	# 
+    'small_icon' : 'smic',	# 
+    'icon' : 'iimg',	# 
+    'name' : 'pnam',	# 
+    'modification_date' : 'asmo',	# 
+    'size' : 'ptsz',	# 
+    'kind' : 'kind',	# 
+    'comment' : 'comt',	# 
+    'label' : 'labi',	# 
+    'version' : 'vers',	# 
+    'creation_date' : 'ascd',	# 
+    'small_button' : 'smbu',	# 
+    'large_button' : 'lgbu',	# 
+    'grid' : 'grid',	# 
+    'all' : 'kyal',	# 
 }
 
 
@@ -124,3 +124,22 @@ _Enum_vwby = {
 #
 _classdeclarations = {
 }
+
+_propdeclarations = {
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+    'earr' : _Enum_earr,
+    'ecvw' : _Enum_ecvw,
+    'edfm' : _Enum_edfm,
+    'elsv' : _Enum_elsv,
+    'ipnl' : _Enum_ipnl,
+    'isiz' : _Enum_isiz,
+    'lvic' : _Enum_lvic,
+    'priv' : _Enum_priv,
+    'sodr' : _Enum_sodr,
+    'vwby' : _Enum_vwby,
+}
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Files.py b/Lib/plat-mac/lib-scriptpackages/Finder/Files.py
index 37cf458..ddbe1ba 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Files.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Files.py
@@ -12,164 +12,164 @@ _code = 'fndr'
 
 class Files_Events:
 
-	pass
+    pass
 
 
 class alias_file(aetools.ComponentItem):
-	"""alias file - An alias file (created with \xd2Make Alias\xd3) """
-	want = 'alia'
+    """alias file - An alias file (created with \xd2Make Alias\xd3) """
+    want = 'alia'
 class _Prop__3c_Inheritance_3e_(aetools.NProperty):
-	"""<Inheritance> - inherits some of its properties from the file class """
-	which = 'c@#^'
-	want = 'file'
+    """<Inheritance> - inherits some of its properties from the file class """
+    which = 'c@#^'
+    want = 'file'
 class _Prop_original_item(aetools.NProperty):
-	"""original item - the original item pointed to by the alias """
-	which = 'orig'
-	want = 'obj '
+    """original item - the original item pointed to by the alias """
+    which = 'orig'
+    want = 'obj '
 
 alias_files = alias_file
 
 class application_file(aetools.ComponentItem):
-	"""application file - An application's file on disk """
-	want = 'appf'
+    """application file - An application's file on disk """
+    want = 'appf'
 class _Prop_accepts_high_level_events(aetools.NProperty):
-	"""accepts high level events - Is the application high-level event aware? (OBSOLETE: always returns true) """
-	which = 'isab'
-	want = 'bool'
+    """accepts high level events - Is the application high-level event aware? (OBSOLETE: always returns true) """
+    which = 'isab'
+    want = 'bool'
 class _Prop_has_scripting_terminology(aetools.NProperty):
-	"""has scripting terminology - Does the process have a scripting terminology, i.e., can it be scripted? """
-	which = 'hscr'
-	want = 'bool'
+    """has scripting terminology - Does the process have a scripting terminology, i.e., can it be scripted? """
+    which = 'hscr'
+    want = 'bool'
 class _Prop_minimum_size(aetools.NProperty):
-	"""minimum size - the smallest memory size with which the application can be launched """
-	which = 'mprt'
-	want = 'long'
+    """minimum size - the smallest memory size with which the application can be launched """
+    which = 'mprt'
+    want = 'long'
 class _Prop_opens_in_Classic(aetools.NProperty):
-	"""opens in Classic - Should the application launch in the Classic environment? """
-	which = 'Clsc'
-	want = 'bool'
+    """opens in Classic - Should the application launch in the Classic environment? """
+    which = 'Clsc'
+    want = 'bool'
 class _Prop_preferred_size(aetools.NProperty):
-	"""preferred size - the memory size with which the application will be launched """
-	which = 'appt'
-	want = 'long'
+    """preferred size - the memory size with which the application will be launched """
+    which = 'appt'
+    want = 'long'
 class _Prop_suggested_size(aetools.NProperty):
-	"""suggested size - the memory size with which the developer recommends the application be launched """
-	which = 'sprt'
-	want = 'long'
+    """suggested size - the memory size with which the developer recommends the application be launched """
+    which = 'sprt'
+    want = 'long'
 
 application_files = application_file
 
 class clipping(aetools.ComponentItem):
-	"""clipping - A clipping """
-	want = 'clpf'
+    """clipping - A clipping """
+    want = 'clpf'
 class _Prop_clipping_window(aetools.NProperty):
-	"""clipping window - (NOT AVAILABLE YET) the clipping window for this clipping """
-	which = 'lwnd'
-	want = 'obj '
+    """clipping window - (NOT AVAILABLE YET) the clipping window for this clipping """
+    which = 'lwnd'
+    want = 'obj '
 
 clippings = clipping
 
 class document_file(aetools.ComponentItem):
-	"""document file - A document file """
-	want = 'docf'
+    """document file - A document file """
+    want = 'docf'
 
 document_files = document_file
 
 class file(aetools.ComponentItem):
-	"""file - A file """
-	want = 'file'
+    """file - A file """
+    want = 'file'
 class _Prop_creator_type(aetools.NProperty):
-	"""creator type - the OSType identifying the application that created the item """
-	which = 'fcrt'
-	want = 'type'
+    """creator type - the OSType identifying the application that created the item """
+    which = 'fcrt'
+    want = 'type'
 class _Prop_file_type(aetools.NProperty):
-	"""file type - the OSType identifying the type of data contained in the item """
-	which = 'asty'
-	want = 'type'
+    """file type - the OSType identifying the type of data contained in the item """
+    which = 'asty'
+    want = 'type'
 class _Prop_product_version(aetools.NProperty):
-	"""product version - the version of the product (visible at the top of the \xd2Get Info\xd3 window) """
-	which = 'ver2'
-	want = 'utxt'
+    """product version - the version of the product (visible at the top of the \xd2Get Info\xd3 window) """
+    which = 'ver2'
+    want = 'utxt'
 class _Prop_stationery(aetools.NProperty):
-	"""stationery - Is the file a stationery pad? """
-	which = 'pspd'
-	want = 'bool'
+    """stationery - Is the file a stationery pad? """
+    which = 'pspd'
+    want = 'bool'
 class _Prop_version(aetools.NProperty):
-	"""version - the version of the file (visible at the bottom of the \xd2Get Info\xd3 window) """
-	which = 'vers'
-	want = 'utxt'
+    """version - the version of the file (visible at the bottom of the \xd2Get Info\xd3 window) """
+    which = 'vers'
+    want = 'utxt'
 
 files = file
 
 class internet_location_file(aetools.ComponentItem):
-	"""internet location file - An file containing an internet location """
-	want = 'inlf'
+    """internet location file - An file containing an internet location """
+    want = 'inlf'
 class _Prop_location(aetools.NProperty):
-	"""location - the internet location """
-	which = 'iloc'
-	want = 'utxt'
+    """location - the internet location """
+    which = 'iloc'
+    want = 'utxt'
 
 internet_location_files = internet_location_file
 
 class package(aetools.ComponentItem):
-	"""package - A package """
-	want = 'pack'
+    """package - A package """
+    want = 'pack'
 
 packages = package
 alias_file._superclassnames = ['file']
 alias_file._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'original_item' : _Prop_original_item,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'original_item' : _Prop_original_item,
 }
 alias_file._privelemdict = {
 }
 application_file._superclassnames = ['file']
 application_file._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'accepts_high_level_events' : _Prop_accepts_high_level_events,
-	'has_scripting_terminology' : _Prop_has_scripting_terminology,
-	'minimum_size' : _Prop_minimum_size,
-	'opens_in_Classic' : _Prop_opens_in_Classic,
-	'preferred_size' : _Prop_preferred_size,
-	'suggested_size' : _Prop_suggested_size,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'accepts_high_level_events' : _Prop_accepts_high_level_events,
+    'has_scripting_terminology' : _Prop_has_scripting_terminology,
+    'minimum_size' : _Prop_minimum_size,
+    'opens_in_Classic' : _Prop_opens_in_Classic,
+    'preferred_size' : _Prop_preferred_size,
+    'suggested_size' : _Prop_suggested_size,
 }
 application_file._privelemdict = {
 }
 clipping._superclassnames = ['file']
 clipping._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'clipping_window' : _Prop_clipping_window,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'clipping_window' : _Prop_clipping_window,
 }
 clipping._privelemdict = {
 }
 document_file._superclassnames = ['file']
 document_file._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 document_file._privelemdict = {
 }
 import Finder_items
 file._superclassnames = ['item']
 file._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'creator_type' : _Prop_creator_type,
-	'file_type' : _Prop_file_type,
-	'product_version' : _Prop_product_version,
-	'stationery' : _Prop_stationery,
-	'version' : _Prop_version,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'creator_type' : _Prop_creator_type,
+    'file_type' : _Prop_file_type,
+    'product_version' : _Prop_product_version,
+    'stationery' : _Prop_stationery,
+    'version' : _Prop_version,
 }
 file._privelemdict = {
 }
 internet_location_file._superclassnames = ['file']
 internet_location_file._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'location' : _Prop_location,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'location' : _Prop_location,
 }
 internet_location_file._privelemdict = {
 }
 package._superclassnames = ['item']
 package._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 package._privelemdict = {
 }
@@ -178,11 +178,35 @@ package._privelemdict = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'alia' : alias_file,
-	'appf' : application_file,
-	'clpf' : clipping,
-	'docf' : document_file,
-	'file' : file,
-	'inlf' : internet_location_file,
-	'pack' : package,
+    'alia' : alias_file,
+    'appf' : application_file,
+    'clpf' : clipping,
+    'docf' : document_file,
+    'file' : file,
+    'inlf' : internet_location_file,
+    'pack' : package,
+}
+
+_propdeclarations = {
+    'Clsc' : _Prop_opens_in_Classic,
+    'appt' : _Prop_preferred_size,
+    'asty' : _Prop_file_type,
+    'c@#^' : _Prop__3c_Inheritance_3e_,
+    'fcrt' : _Prop_creator_type,
+    'hscr' : _Prop_has_scripting_terminology,
+    'iloc' : _Prop_location,
+    'isab' : _Prop_accepts_high_level_events,
+    'lwnd' : _Prop_clipping_window,
+    'mprt' : _Prop_minimum_size,
+    'orig' : _Prop_original_item,
+    'pspd' : _Prop_stationery,
+    'sprt' : _Prop_suggested_size,
+    'ver2' : _Prop_product_version,
+    'vers' : _Prop_version,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py b/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py
index feb7660..9c5381a 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Finder_Basics.py
@@ -12,107 +12,107 @@ _code = 'fndr'
 
 class Finder_Basics_Events:
 
-	def copy(self, _no_object=None, _attributes={}, **_arguments):
-		"""copy: (NOT AVAILABLE YET) Copy the selected items to the clipboard (the Finder must be the front application)
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'misc'
-		_subcode = 'copy'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_sort = {
-		'by' : 'by  ',
-	}
-
-	def sort(self, _object, _attributes={}, **_arguments):
-		"""sort: (NOT AVAILABLE YET) Return the specified object(s) in a sorted list
-		Required argument: a list of finder objects to sort
-		Keyword argument by: the property to sort the items by (name, index, date, etc.)
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the sorted items in their new order
-		"""
-		_code = 'DATA'
-		_subcode = 'SORT'
-
-		aetools.keysubst(_arguments, self._argmap_sort)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    def copy(self, _no_object=None, _attributes={}, **_arguments):
+        """copy: (NOT AVAILABLE YET) Copy the selected items to the clipboard (the Finder must be the front application)
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'misc'
+        _subcode = 'copy'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_sort = {
+        'by' : 'by  ',
+    }
+
+    def sort(self, _object, _attributes={}, **_arguments):
+        """sort: (NOT AVAILABLE YET) Return the specified object(s) in a sorted list
+        Required argument: a list of finder objects to sort
+        Keyword argument by: the property to sort the items by (name, index, date, etc.)
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the sorted items in their new order
+        """
+        _code = 'DATA'
+        _subcode = 'SORT'
+
+        aetools.keysubst(_arguments, self._argmap_sort)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 class application(aetools.ComponentItem):
-	"""application - The Finder """
-	want = 'capp'
+    """application - The Finder """
+    want = 'capp'
 class _Prop_Finder_preferences(aetools.NProperty):
-	"""Finder preferences - (NOT AVAILABLE YET) Various preferences that apply to the Finder as a whole """
-	which = 'pfrp'
-	want = 'cprf'
+    """Finder preferences - (NOT AVAILABLE YET) Various preferences that apply to the Finder as a whole """
+    which = 'pfrp'
+    want = 'cprf'
 class _Prop_clipboard(aetools.NProperty):
-	"""clipboard - (NOT AVAILABLE YET) the Finder\xd5s clipboard window """
-	which = 'pcli'
-	want = 'obj '
+    """clipboard - (NOT AVAILABLE YET) the Finder\xd5s clipboard window """
+    which = 'pcli'
+    want = 'obj '
 class _Prop_desktop(aetools.NProperty):
-	"""desktop - the desktop """
-	which = 'desk'
-	want = 'cdsk'
+    """desktop - the desktop """
+    which = 'desk'
+    want = 'cdsk'
 class _Prop_frontmost(aetools.NProperty):
-	"""frontmost - Is the Finder the frontmost process? """
-	which = 'pisf'
-	want = 'bool'
+    """frontmost - Is the Finder the frontmost process? """
+    which = 'pisf'
+    want = 'bool'
 class _Prop_home(aetools.NProperty):
-	"""home - the home directory """
-	which = 'home'
-	want = 'cfol'
+    """home - the home directory """
+    which = 'home'
+    want = 'cfol'
 class _Prop_insertion_location(aetools.NProperty):
-	"""insertion location - the container in which a new folder would appear if \xd2New Folder\xd3 was selected """
-	which = 'pins'
-	want = 'obj '
+    """insertion location - the container in which a new folder would appear if \xd2New Folder\xd3 was selected """
+    which = 'pins'
+    want = 'obj '
 class _Prop_name(aetools.NProperty):
-	"""name - the Finder\xd5s name """
-	which = 'pnam'
-	want = 'itxt'
+    """name - the Finder\xd5s name """
+    which = 'pnam'
+    want = 'itxt'
 class _Prop_product_version(aetools.NProperty):
-	"""product version - the version of the System software running on this computer """
-	which = 'ver2'
-	want = 'utxt'
+    """product version - the version of the System software running on this computer """
+    which = 'ver2'
+    want = 'utxt'
 class _Prop_selection(aetools.NProperty):
-	"""selection - the selection in the frontmost Finder window """
-	which = 'sele'
-	want = 'obj '
+    """selection - the selection in the frontmost Finder window """
+    which = 'sele'
+    want = 'obj '
 class _Prop_startup_disk(aetools.NProperty):
-	"""startup disk - the startup disk """
-	which = 'sdsk'
-	want = 'cdis'
+    """startup disk - the startup disk """
+    which = 'sdsk'
+    want = 'cdis'
 class _Prop_trash(aetools.NProperty):
-	"""trash - the trash """
-	which = 'trsh'
-	want = 'ctrs'
+    """trash - the trash """
+    which = 'trsh'
+    want = 'ctrs'
 class _Prop_version(aetools.NProperty):
-	"""version - the version of the Finder """
-	which = 'vers'
-	want = 'utxt'
+    """version - the version of the Finder """
+    which = 'vers'
+    want = 'utxt'
 class _Prop_visible(aetools.NProperty):
-	"""visible - Is the Finder\xd5s layer visible? """
-	which = 'pvis'
-	want = 'bool'
+    """visible - Is the Finder\xd5s layer visible? """
+    which = 'pvis'
+    want = 'bool'
 #        element 'alia' as ['indx', 'name']
 #        element 'appf' as ['indx', 'name', 'ID  ']
 #        element 'brow' as ['indx', 'ID  ']
@@ -133,40 +133,62 @@ import Window_classes
 import Containers_and_folders
 import Finder_items
 application._privpropdict = {
-	'Finder_preferences' : _Prop_Finder_preferences,
-	'clipboard' : _Prop_clipboard,
-	'desktop' : _Prop_desktop,
-	'frontmost' : _Prop_frontmost,
-	'home' : _Prop_home,
-	'insertion_location' : _Prop_insertion_location,
-	'name' : _Prop_name,
-	'product_version' : _Prop_product_version,
-	'selection' : _Prop_selection,
-	'startup_disk' : _Prop_startup_disk,
-	'trash' : _Prop_trash,
-	'version' : _Prop_version,
-	'visible' : _Prop_visible,
+    'Finder_preferences' : _Prop_Finder_preferences,
+    'clipboard' : _Prop_clipboard,
+    'desktop' : _Prop_desktop,
+    'frontmost' : _Prop_frontmost,
+    'home' : _Prop_home,
+    'insertion_location' : _Prop_insertion_location,
+    'name' : _Prop_name,
+    'product_version' : _Prop_product_version,
+    'selection' : _Prop_selection,
+    'startup_disk' : _Prop_startup_disk,
+    'trash' : _Prop_trash,
+    'version' : _Prop_version,
+    'visible' : _Prop_visible,
 }
 application._privelemdict = {
-	'Finder_window' : Window_classes.Finder_window,
-	'alias_file' : Files.alias_file,
-	'application_file' : Files.application_file,
-	'clipping' : Files.clipping,
-	'clipping_window' : Window_classes.clipping_window,
-	'container' : Containers_and_folders.container,
-	'disk' : Containers_and_folders.disk,
-	'document_file' : Files.document_file,
-	'file' : Files.file,
-	'folder' : Containers_and_folders.folder,
-	'internet_location_file' : Files.internet_location_file,
-	'item' : Finder_items.item,
-	'package' : Files.package,
-	'window' : Window_classes.window,
+    'Finder_window' : Window_classes.Finder_window,
+    'alias_file' : Files.alias_file,
+    'application_file' : Files.application_file,
+    'clipping' : Files.clipping,
+    'clipping_window' : Window_classes.clipping_window,
+    'container' : Containers_and_folders.container,
+    'disk' : Containers_and_folders.disk,
+    'document_file' : Files.document_file,
+    'file' : Files.file,
+    'folder' : Containers_and_folders.folder,
+    'internet_location_file' : Files.internet_location_file,
+    'item' : Finder_items.item,
+    'package' : Files.package,
+    'window' : Window_classes.window,
 }
 
 #
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'capp' : application,
+    'capp' : application,
+}
+
+_propdeclarations = {
+    'desk' : _Prop_desktop,
+    'home' : _Prop_home,
+    'pcli' : _Prop_clipboard,
+    'pfrp' : _Prop_Finder_preferences,
+    'pins' : _Prop_insertion_location,
+    'pisf' : _Prop_frontmost,
+    'pnam' : _Prop_name,
+    'pvis' : _Prop_visible,
+    'sdsk' : _Prop_startup_disk,
+    'sele' : _Prop_selection,
+    'trsh' : _Prop_trash,
+    'ver2' : _Prop_product_version,
+    'vers' : _Prop_version,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Finder_items.py b/Lib/plat-mac/lib-scriptpackages/Finder/Finder_items.py
index 6f52667..7120ea6 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Finder_items.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Finder_items.py
@@ -12,301 +12,301 @@ _code = 'fndr'
 
 class Finder_items_Events:
 
-	def add_to_favorites(self, _object, _attributes={}, **_arguments):
-		"""add to favorites: (NOT AVAILABLE YET) Add the items to the user\xd5s Favorites
-		Required argument: the items to add to the collection of Favorites
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'fndr'
-		_subcode = 'ffav'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_clean_up = {
-		'by' : 'by  ',
-	}
-
-	def clean_up(self, _object, _attributes={}, **_arguments):
-		"""clean up: (NOT AVAILABLE YET) Arrange items in window nicely (only applies to open windows in icon view that are not kept arranged)
-		Required argument: the window to clean up
-		Keyword argument by: the order in which to clean up the objects (name, index, date, etc.)
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'fndr'
-		_subcode = 'fclu'
-
-		aetools.keysubst(_arguments, self._argmap_clean_up)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def eject(self, _object=None, _attributes={}, **_arguments):
-		"""eject: Eject the specified disk(s)
-		Required argument: the disk(s) to eject
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'fndr'
-		_subcode = 'ejct'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def empty(self, _object=None, _attributes={}, **_arguments):
-		"""empty: Empty the trash
-		Required argument: \xd2empty\xd3 and \xd2empty trash\xd3 both do the same thing
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'fndr'
-		_subcode = 'empt'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def erase(self, _object, _attributes={}, **_arguments):
-		"""erase: (NOT AVAILABLE) Erase the specified disk(s)
-		Required argument: the items to erase
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'fndr'
-		_subcode = 'fera'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def reveal(self, _object, _attributes={}, **_arguments):
-		"""reveal: Bring the specified object(s) into view
-		Required argument: the object to be made visible
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'misc'
-		_subcode = 'mvis'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_update = {
-		'necessity' : 'nec?',
-		'registering_applications' : 'reg?',
-	}
-
-	def update(self, _object, _attributes={}, **_arguments):
-		"""update: Update the display of the specified object(s) to match their on-disk representation
-		Required argument: the item to update
-		Keyword argument necessity: only update if necessary (i.e. a finder window is open).  default is false
-		Keyword argument registering_applications: register applications. default is true
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'fndr'
-		_subcode = 'fupd'
-
-		aetools.keysubst(_arguments, self._argmap_update)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    def add_to_favorites(self, _object, _attributes={}, **_arguments):
+        """add to favorites: (NOT AVAILABLE YET) Add the items to the user\xd5s Favorites
+        Required argument: the items to add to the collection of Favorites
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'fndr'
+        _subcode = 'ffav'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_clean_up = {
+        'by' : 'by  ',
+    }
+
+    def clean_up(self, _object, _attributes={}, **_arguments):
+        """clean up: (NOT AVAILABLE YET) Arrange items in window nicely (only applies to open windows in icon view that are not kept arranged)
+        Required argument: the window to clean up
+        Keyword argument by: the order in which to clean up the objects (name, index, date, etc.)
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'fndr'
+        _subcode = 'fclu'
+
+        aetools.keysubst(_arguments, self._argmap_clean_up)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def eject(self, _object=None, _attributes={}, **_arguments):
+        """eject: Eject the specified disk(s)
+        Required argument: the disk(s) to eject
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'fndr'
+        _subcode = 'ejct'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def empty(self, _object=None, _attributes={}, **_arguments):
+        """empty: Empty the trash
+        Required argument: \xd2empty\xd3 and \xd2empty trash\xd3 both do the same thing
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'fndr'
+        _subcode = 'empt'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def erase(self, _object, _attributes={}, **_arguments):
+        """erase: (NOT AVAILABLE) Erase the specified disk(s)
+        Required argument: the items to erase
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'fndr'
+        _subcode = 'fera'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def reveal(self, _object, _attributes={}, **_arguments):
+        """reveal: Bring the specified object(s) into view
+        Required argument: the object to be made visible
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'misc'
+        _subcode = 'mvis'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_update = {
+        'necessity' : 'nec?',
+        'registering_applications' : 'reg?',
+    }
+
+    def update(self, _object, _attributes={}, **_arguments):
+        """update: Update the display of the specified object(s) to match their on-disk representation
+        Required argument: the item to update
+        Keyword argument necessity: only update if necessary (i.e. a finder window is open).  default is false
+        Keyword argument registering_applications: register applications. default is true
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'fndr'
+        _subcode = 'fupd'
+
+        aetools.keysubst(_arguments, self._argmap_update)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 class item(aetools.ComponentItem):
-	"""item - An item """
-	want = 'cobj'
+    """item - An item """
+    want = 'cobj'
 class _Prop_bounds(aetools.NProperty):
-	"""bounds - the bounding rectangle of the item (can only be set for an item in a window viewed as icons or buttons) """
-	which = 'pbnd'
-	want = 'qdrt'
+    """bounds - the bounding rectangle of the item (can only be set for an item in a window viewed as icons or buttons) """
+    which = 'pbnd'
+    want = 'qdrt'
 class _Prop_comment(aetools.NProperty):
-	"""comment - the comment of the item, displayed in the \xd2Get Info\xd3 window """
-	which = 'comt'
-	want = 'utxt'
+    """comment - the comment of the item, displayed in the \xd2Get Info\xd3 window """
+    which = 'comt'
+    want = 'utxt'
 class _Prop_container(aetools.NProperty):
-	"""container - the container of the item """
-	which = 'ctnr'
-	want = 'obj '
+    """container - the container of the item """
+    which = 'ctnr'
+    want = 'obj '
 class _Prop_creation_date(aetools.NProperty):
-	"""creation date - the date on which the item was created """
-	which = 'ascd'
-	want = 'ldt '
+    """creation date - the date on which the item was created """
+    which = 'ascd'
+    want = 'ldt '
 class _Prop_description(aetools.NProperty):
-	"""description - a description of the item """
-	which = 'dscr'
-	want = 'utxt'
+    """description - a description of the item """
+    which = 'dscr'
+    want = 'utxt'
 class _Prop_disk(aetools.NProperty):
-	"""disk - the disk on which the item is stored """
-	which = 'cdis'
-	want = 'obj '
+    """disk - the disk on which the item is stored """
+    which = 'cdis'
+    want = 'obj '
 class _Prop_displayed_name(aetools.NProperty):
-	"""displayed name - the user-visible name of the item """
-	which = 'dnam'
-	want = 'utxt'
+    """displayed name - the user-visible name of the item """
+    which = 'dnam'
+    want = 'utxt'
 class _Prop_everyones_privileges(aetools.NProperty):
-	"""everyones privileges -  """
-	which = 'gstp'
-	want = 'priv'
+    """everyones privileges -  """
+    which = 'gstp'
+    want = 'priv'
 class _Prop_extension_hidden(aetools.NProperty):
-	"""extension hidden - Is the item's extension hidden from the user? """
-	which = 'hidx'
-	want = 'bool'
+    """extension hidden - Is the item's extension hidden from the user? """
+    which = 'hidx'
+    want = 'bool'
 class _Prop_group(aetools.NProperty):
-	"""group - the user or group that has special access to the container """
-	which = 'sgrp'
-	want = 'utxt'
+    """group - the user or group that has special access to the container """
+    which = 'sgrp'
+    want = 'utxt'
 class _Prop_group_privileges(aetools.NProperty):
-	"""group privileges -  """
-	which = 'gppr'
-	want = 'priv'
+    """group privileges -  """
+    which = 'gppr'
+    want = 'priv'
 class _Prop_icon(aetools.NProperty):
-	"""icon - the icon bitmap of the item """
-	which = 'iimg'
-	want = 'ifam'
+    """icon - the icon bitmap of the item """
+    which = 'iimg'
+    want = 'ifam'
 class _Prop_index(aetools.NProperty):
-	"""index - the index in the front-to-back ordering within its container """
-	which = 'pidx'
-	want = 'long'
+    """index - the index in the front-to-back ordering within its container """
+    which = 'pidx'
+    want = 'long'
 class _Prop_information_window(aetools.NProperty):
-	"""information window - the information window for the item """
-	which = 'iwnd'
-	want = 'obj '
+    """information window - the information window for the item """
+    which = 'iwnd'
+    want = 'obj '
 class _Prop_kind(aetools.NProperty):
-	"""kind - the kind of the item """
-	which = 'kind'
-	want = 'utxt'
+    """kind - the kind of the item """
+    which = 'kind'
+    want = 'utxt'
 class _Prop_label_index(aetools.NProperty):
-	"""label index - the label of the item """
-	which = 'labi'
-	want = 'long'
+    """label index - the label of the item """
+    which = 'labi'
+    want = 'long'
 class _Prop_locked(aetools.NProperty):
-	"""locked - Is the file locked? """
-	which = 'aslk'
-	want = 'bool'
+    """locked - Is the file locked? """
+    which = 'aslk'
+    want = 'bool'
 class _Prop_modification_date(aetools.NProperty):
-	"""modification date - the date on which the item was last modified """
-	which = 'asmo'
-	want = 'ldt '
+    """modification date - the date on which the item was last modified """
+    which = 'asmo'
+    want = 'ldt '
 class _Prop_name(aetools.NProperty):
-	"""name - the name of the item """
-	which = 'pnam'
-	want = 'utxt'
+    """name - the name of the item """
+    which = 'pnam'
+    want = 'utxt'
 class _Prop_name_extension(aetools.NProperty):
-	"""name extension - the name extension of the item (such as \xd2txt\xd3) """
-	which = 'nmxt'
-	want = 'utxt'
+    """name extension - the name extension of the item (such as \xd2txt\xd3) """
+    which = 'nmxt'
+    want = 'utxt'
 class _Prop_owner(aetools.NProperty):
-	"""owner - the user that owns the container """
-	which = 'sown'
-	want = 'utxt'
+    """owner - the user that owns the container """
+    which = 'sown'
+    want = 'utxt'
 class _Prop_owner_privileges(aetools.NProperty):
-	"""owner privileges -  """
-	which = 'ownr'
-	want = 'priv'
+    """owner privileges -  """
+    which = 'ownr'
+    want = 'priv'
 class _Prop_physical_size(aetools.NProperty):
-	"""physical size - the actual space used by the item on disk """
-	which = 'phys'
-	want = 'comp'
+    """physical size - the actual space used by the item on disk """
+    which = 'phys'
+    want = 'comp'
 class _Prop_position(aetools.NProperty):
-	"""position - the position of the item within its parent window (can only be set for an item in a window viewed as icons or buttons) """
-	which = 'posn'
-	want = 'QDpt'
+    """position - the position of the item within its parent window (can only be set for an item in a window viewed as icons or buttons) """
+    which = 'posn'
+    want = 'QDpt'
 class _Prop_properties(aetools.NProperty):
-	"""properties - every property of an item """
-	which = 'pALL'
-	want = 'reco'
+    """properties - every property of an item """
+    which = 'pALL'
+    want = 'reco'
 class _Prop_size(aetools.NProperty):
-	"""size - the logical size of the item """
-	which = 'ptsz'
-	want = 'comp'
+    """size - the logical size of the item """
+    which = 'ptsz'
+    want = 'comp'
 class _Prop_url(aetools.NProperty):
-	"""url - the url of the item """
-	which = 'pURL'
-	want = 'utxt'
+    """url - the url of the item """
+    which = 'pURL'
+    want = 'utxt'
 
 items = item
 item._superclassnames = []
 item._privpropdict = {
-	'bounds' : _Prop_bounds,
-	'comment' : _Prop_comment,
-	'container' : _Prop_container,
-	'creation_date' : _Prop_creation_date,
-	'description' : _Prop_description,
-	'disk' : _Prop_disk,
-	'displayed_name' : _Prop_displayed_name,
-	'everyones_privileges' : _Prop_everyones_privileges,
-	'extension_hidden' : _Prop_extension_hidden,
-	'group' : _Prop_group,
-	'group_privileges' : _Prop_group_privileges,
-	'icon' : _Prop_icon,
-	'index' : _Prop_index,
-	'information_window' : _Prop_information_window,
-	'kind' : _Prop_kind,
-	'label_index' : _Prop_label_index,
-	'locked' : _Prop_locked,
-	'modification_date' : _Prop_modification_date,
-	'name' : _Prop_name,
-	'name_extension' : _Prop_name_extension,
-	'owner' : _Prop_owner,
-	'owner_privileges' : _Prop_owner_privileges,
-	'physical_size' : _Prop_physical_size,
-	'position' : _Prop_position,
-	'properties' : _Prop_properties,
-	'size' : _Prop_size,
-	'url' : _Prop_url,
+    'bounds' : _Prop_bounds,
+    'comment' : _Prop_comment,
+    'container' : _Prop_container,
+    'creation_date' : _Prop_creation_date,
+    'description' : _Prop_description,
+    'disk' : _Prop_disk,
+    'displayed_name' : _Prop_displayed_name,
+    'everyones_privileges' : _Prop_everyones_privileges,
+    'extension_hidden' : _Prop_extension_hidden,
+    'group' : _Prop_group,
+    'group_privileges' : _Prop_group_privileges,
+    'icon' : _Prop_icon,
+    'index' : _Prop_index,
+    'information_window' : _Prop_information_window,
+    'kind' : _Prop_kind,
+    'label_index' : _Prop_label_index,
+    'locked' : _Prop_locked,
+    'modification_date' : _Prop_modification_date,
+    'name' : _Prop_name,
+    'name_extension' : _Prop_name_extension,
+    'owner' : _Prop_owner,
+    'owner_privileges' : _Prop_owner_privileges,
+    'physical_size' : _Prop_physical_size,
+    'position' : _Prop_position,
+    'properties' : _Prop_properties,
+    'size' : _Prop_size,
+    'url' : _Prop_url,
 }
 item._privelemdict = {
 }
@@ -315,5 +315,41 @@ item._privelemdict = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'cobj' : item,
+    'cobj' : item,
+}
+
+_propdeclarations = {
+    'ascd' : _Prop_creation_date,
+    'aslk' : _Prop_locked,
+    'asmo' : _Prop_modification_date,
+    'cdis' : _Prop_disk,
+    'comt' : _Prop_comment,
+    'ctnr' : _Prop_container,
+    'dnam' : _Prop_displayed_name,
+    'dscr' : _Prop_description,
+    'gppr' : _Prop_group_privileges,
+    'gstp' : _Prop_everyones_privileges,
+    'hidx' : _Prop_extension_hidden,
+    'iimg' : _Prop_icon,
+    'iwnd' : _Prop_information_window,
+    'kind' : _Prop_kind,
+    'labi' : _Prop_label_index,
+    'nmxt' : _Prop_name_extension,
+    'ownr' : _Prop_owner_privileges,
+    'pALL' : _Prop_properties,
+    'pURL' : _Prop_url,
+    'pbnd' : _Prop_bounds,
+    'phys' : _Prop_physical_size,
+    'pidx' : _Prop_index,
+    'pnam' : _Prop_name,
+    'posn' : _Prop_position,
+    'ptsz' : _Prop_size,
+    'sgrp' : _Prop_group,
+    'sown' : _Prop_owner,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Legacy_suite.py b/Lib/plat-mac/lib-scriptpackages/Finder/Legacy_suite.py
index 9418039..9bd1537 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Legacy_suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Legacy_suite.py
@@ -12,178 +12,178 @@ _code = 'fleg'
 
 class Legacy_suite_Events:
 
-	def restart(self, _no_object=None, _attributes={}, **_arguments):
-		"""restart: Restart the computer
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'fndr'
-		_subcode = 'rest'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def shut_down(self, _no_object=None, _attributes={}, **_arguments):
-		"""shut down: Shut Down the computer
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'fndr'
-		_subcode = 'shut'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def sleep(self, _no_object=None, _attributes={}, **_arguments):
-		"""sleep: Put the computer to sleep
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'fndr'
-		_subcode = 'slep'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    def restart(self, _no_object=None, _attributes={}, **_arguments):
+        """restart: Restart the computer
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'fndr'
+        _subcode = 'rest'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def shut_down(self, _no_object=None, _attributes={}, **_arguments):
+        """shut down: Shut Down the computer
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'fndr'
+        _subcode = 'shut'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def sleep(self, _no_object=None, _attributes={}, **_arguments):
+        """sleep: Put the computer to sleep
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'fndr'
+        _subcode = 'slep'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 class application(aetools.ComponentItem):
-	"""application - The Finder """
-	want = 'capp'
+    """application - The Finder """
+    want = 'capp'
 class _Prop_desktop_picture(aetools.NProperty):
-	"""desktop picture - the desktop picture of the main monitor """
-	which = 'dpic'
-	want = 'file'
+    """desktop picture - the desktop picture of the main monitor """
+    which = 'dpic'
+    want = 'file'
 
 class application_process(aetools.ComponentItem):
-	"""application process - A process launched from an application file """
-	want = 'pcap'
+    """application process - A process launched from an application file """
+    want = 'pcap'
 class _Prop__3c_Inheritance_3e_(aetools.NProperty):
-	"""<Inheritance> - inherits some of its properties from the process class """
-	which = 'c@#^'
-	want = 'prcs'
+    """<Inheritance> - inherits some of its properties from the process class """
+    which = 'c@#^'
+    want = 'prcs'
 class _Prop_application_file(aetools.NProperty):
-	"""application file - the application file from which this process was launched """
-	which = 'appf'
-	want = 'appf'
+    """application file - the application file from which this process was launched """
+    which = 'appf'
+    want = 'appf'
 
 application_processes = application_process
 
 class desk_accessory_process(aetools.ComponentItem):
-	"""desk accessory process - A process launched from a desk accessory file """
-	want = 'pcda'
+    """desk accessory process - A process launched from a desk accessory file """
+    want = 'pcda'
 class _Prop_desk_accessory_file(aetools.NProperty):
-	"""desk accessory file - the desk accessory file from which this process was launched """
-	which = 'dafi'
-	want = 'obj '
+    """desk accessory file - the desk accessory file from which this process was launched """
+    which = 'dafi'
+    want = 'obj '
 
 desk_accessory_processes = desk_accessory_process
 
 class process(aetools.ComponentItem):
-	"""process - A process running on this computer """
-	want = 'prcs'
+    """process - A process running on this computer """
+    want = 'prcs'
 class _Prop_accepts_high_level_events(aetools.NProperty):
-	"""accepts high level events - Is the process high-level event aware (accepts open application, open document, print document, and quit)? """
-	which = 'isab'
-	want = 'bool'
+    """accepts high level events - Is the process high-level event aware (accepts open application, open document, print document, and quit)? """
+    which = 'isab'
+    want = 'bool'
 class _Prop_accepts_remote_events(aetools.NProperty):
-	"""accepts remote events - Does the process accept remote events? """
-	which = 'revt'
-	want = 'bool'
+    """accepts remote events - Does the process accept remote events? """
+    which = 'revt'
+    want = 'bool'
 class _Prop_creator_type(aetools.NProperty):
-	"""creator type - the OSType of the creator of the process (the signature) """
-	which = 'fcrt'
-	want = 'type'
+    """creator type - the OSType of the creator of the process (the signature) """
+    which = 'fcrt'
+    want = 'type'
 class _Prop_file(aetools.NProperty):
-	"""file - the file from which the process was launched """
-	which = 'file'
-	want = 'obj '
+    """file - the file from which the process was launched """
+    which = 'file'
+    want = 'obj '
 class _Prop_file_type(aetools.NProperty):
-	"""file type - the OSType of the file type of the process """
-	which = 'asty'
-	want = 'type'
+    """file type - the OSType of the file type of the process """
+    which = 'asty'
+    want = 'type'
 class _Prop_frontmost(aetools.NProperty):
-	"""frontmost - Is the process the frontmost process? """
-	which = 'pisf'
-	want = 'bool'
+    """frontmost - Is the process the frontmost process? """
+    which = 'pisf'
+    want = 'bool'
 class _Prop_has_scripting_terminology(aetools.NProperty):
-	"""has scripting terminology - Does the process have a scripting terminology, i.e., can it be scripted? """
-	which = 'hscr'
-	want = 'bool'
+    """has scripting terminology - Does the process have a scripting terminology, i.e., can it be scripted? """
+    which = 'hscr'
+    want = 'bool'
 class _Prop_name(aetools.NProperty):
-	"""name - the name of the process """
-	which = 'pnam'
-	want = 'itxt'
+    """name - the name of the process """
+    which = 'pnam'
+    want = 'itxt'
 class _Prop_partition_space_used(aetools.NProperty):
-	"""partition space used - the number of bytes currently used in the process' partition """
-	which = 'pusd'
-	want = 'long'
+    """partition space used - the number of bytes currently used in the process' partition """
+    which = 'pusd'
+    want = 'long'
 class _Prop_total_partition_size(aetools.NProperty):
-	"""total partition size - the size of the partition with which the process was launched """
-	which = 'appt'
-	want = 'long'
+    """total partition size - the size of the partition with which the process was launched """
+    which = 'appt'
+    want = 'long'
 class _Prop_visible(aetools.NProperty):
-	"""visible - Is the process' layer visible? """
-	which = 'pvis'
-	want = 'bool'
+    """visible - Is the process' layer visible? """
+    which = 'pvis'
+    want = 'bool'
 
 processes = process
 application._superclassnames = []
 application._privpropdict = {
-	'desktop_picture' : _Prop_desktop_picture,
+    'desktop_picture' : _Prop_desktop_picture,
 }
 application._privelemdict = {
 }
 application_process._superclassnames = ['process']
 application_process._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'application_file' : _Prop_application_file,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'application_file' : _Prop_application_file,
 }
 application_process._privelemdict = {
 }
 desk_accessory_process._superclassnames = ['process']
 desk_accessory_process._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'desk_accessory_file' : _Prop_desk_accessory_file,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'desk_accessory_file' : _Prop_desk_accessory_file,
 }
 desk_accessory_process._privelemdict = {
 }
 process._superclassnames = []
 process._privpropdict = {
-	'accepts_high_level_events' : _Prop_accepts_high_level_events,
-	'accepts_remote_events' : _Prop_accepts_remote_events,
-	'creator_type' : _Prop_creator_type,
-	'file' : _Prop_file,
-	'file_type' : _Prop_file_type,
-	'frontmost' : _Prop_frontmost,
-	'has_scripting_terminology' : _Prop_has_scripting_terminology,
-	'name' : _Prop_name,
-	'partition_space_used' : _Prop_partition_space_used,
-	'total_partition_size' : _Prop_total_partition_size,
-	'visible' : _Prop_visible,
+    'accepts_high_level_events' : _Prop_accepts_high_level_events,
+    'accepts_remote_events' : _Prop_accepts_remote_events,
+    'creator_type' : _Prop_creator_type,
+    'file' : _Prop_file,
+    'file_type' : _Prop_file_type,
+    'frontmost' : _Prop_frontmost,
+    'has_scripting_terminology' : _Prop_has_scripting_terminology,
+    'name' : _Prop_name,
+    'partition_space_used' : _Prop_partition_space_used,
+    'total_partition_size' : _Prop_total_partition_size,
+    'visible' : _Prop_visible,
 }
 process._privelemdict = {
 }
@@ -192,8 +192,32 @@ process._privelemdict = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'capp' : application,
-	'pcap' : application_process,
-	'pcda' : desk_accessory_process,
-	'prcs' : process,
+    'capp' : application,
+    'pcap' : application_process,
+    'pcda' : desk_accessory_process,
+    'prcs' : process,
+}
+
+_propdeclarations = {
+    'appf' : _Prop_application_file,
+    'appt' : _Prop_total_partition_size,
+    'asty' : _Prop_file_type,
+    'c@#^' : _Prop__3c_Inheritance_3e_,
+    'dafi' : _Prop_desk_accessory_file,
+    'dpic' : _Prop_desktop_picture,
+    'fcrt' : _Prop_creator_type,
+    'file' : _Prop_file,
+    'hscr' : _Prop_has_scripting_terminology,
+    'isab' : _Prop_accepts_high_level_events,
+    'pisf' : _Prop_frontmost,
+    'pnam' : _Prop_name,
+    'pusd' : _Prop_partition_space_used,
+    'pvis' : _Prop_visible,
+    'revt' : _Prop_accepts_remote_events,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/Finder/Standard_Suite.py
index b9a172f..830f58c 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Standard_Suite.py
@@ -13,308 +13,308 @@ _code = 'CoRe'
 from StdSuites.Standard_Suite import *
 class Standard_Suite_Events(Standard_Suite_Events):
 
-	def close(self, _object, _attributes={}, **_arguments):
-		"""close: Close an object
-		Required argument: the object to close
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'core'
-		_subcode = 'clos'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_count = {
-		'each' : 'kocl',
-	}
-
-	def count(self, _object, _attributes={}, **_arguments):
-		"""count: Return the number of elements of a particular class within an object
-		Required argument: the object whose elements are to be counted
-		Keyword argument each: the class of the elements to be counted
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the number of elements
-		"""
-		_code = 'core'
-		_subcode = 'cnte'
-
-		aetools.keysubst(_arguments, self._argmap_count)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_data_size = {
-		'as' : 'rtyp',
-	}
-
-	def data_size(self, _object, _attributes={}, **_arguments):
-		"""data size: Return the size in bytes of an object
-		Required argument: the object whose data size is to be returned
-		Keyword argument as: the data type for which the size is calculated
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the size of the object in bytes
-		"""
-		_code = 'core'
-		_subcode = 'dsiz'
-
-		aetools.keysubst(_arguments, self._argmap_data_size)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def delete(self, _object, _attributes={}, **_arguments):
-		"""delete: Move an item from its container to the trash
-		Required argument: the item to delete
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: to the item that was just deleted
-		"""
-		_code = 'core'
-		_subcode = 'delo'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_duplicate = {
-		'to' : 'insh',
-		'replacing' : 'alrp',
-		'routing_suppressed' : 'rout',
-	}
-
-	def duplicate(self, _object, _attributes={}, **_arguments):
-		"""duplicate: Duplicate one or more object(s)
-		Required argument: the object(s) to duplicate
-		Keyword argument to: the new location for the object(s)
-		Keyword argument replacing: Specifies whether or not to replace items in the destination that have the same name as items being duplicated
-		Keyword argument routing_suppressed: Specifies whether or not to autoroute items (default is false). Only applies when copying to the system folder.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: to the duplicated object(s)
-		"""
-		_code = 'core'
-		_subcode = 'clon'
-
-		aetools.keysubst(_arguments, self._argmap_duplicate)
-		_arguments['----'] = _object
-
-		aetools.enumsubst(_arguments, 'alrp', _Enum_bool)
-		aetools.enumsubst(_arguments, 'rout', _Enum_bool)
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def exists(self, _object, _attributes={}, **_arguments):
-		"""exists: Verify if an object exists
-		Required argument: the object in question
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: true if it exists, false if not
-		"""
-		_code = 'core'
-		_subcode = 'doex'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_make = {
-		'new' : 'kocl',
-		'at' : 'insh',
-		'to' : 'to  ',
-		'with_properties' : 'prdt',
-	}
-
-	def make(self, _no_object=None, _attributes={}, **_arguments):
-		"""make: Make a new element
-		Keyword argument new: the class of the new element
-		Keyword argument at: the location at which to insert the element
-		Keyword argument to: when creating an alias file, the original item to create an alias to or when creating a file viewer window, the target of the window
-		Keyword argument with_properties: the initial values for the properties of the element
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: to the new object(s)
-		"""
-		_code = 'core'
-		_subcode = 'crel'
-
-		aetools.keysubst(_arguments, self._argmap_make)
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_move = {
-		'to' : 'insh',
-		'replacing' : 'alrp',
-		'positioned_at' : 'mvpl',
-		'routing_suppressed' : 'rout',
-	}
-
-	def move(self, _object, _attributes={}, **_arguments):
-		"""move: Move object(s) to a new location
-		Required argument: the object(s) to move
-		Keyword argument to: the new location for the object(s)
-		Keyword argument replacing: Specifies whether or not to replace items in the destination that have the same name as items being moved
-		Keyword argument positioned_at: Gives a list (in local window coordinates) of positions for the destination items
-		Keyword argument routing_suppressed: Specifies whether or not to autoroute items (default is false). Only applies when moving to the system folder.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: to the object(s) after they have been moved
-		"""
-		_code = 'core'
-		_subcode = 'move'
-
-		aetools.keysubst(_arguments, self._argmap_move)
-		_arguments['----'] = _object
-
-		aetools.enumsubst(_arguments, 'alrp', _Enum_bool)
-		aetools.enumsubst(_arguments, 'mvpl', _Enum_list)
-		aetools.enumsubst(_arguments, 'rout', _Enum_bool)
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_open = {
-		'using' : 'usin',
-		'with_properties' : 'prdt',
-	}
-
-	def open(self, _object, _attributes={}, **_arguments):
-		"""open: Open the specified object(s)
-		Required argument: list of objects to open
-		Keyword argument using: the application file to open the object with
-		Keyword argument with_properties: the initial values for the properties, to be included with the open command sent to the application that opens the direct object
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'odoc'
-
-		aetools.keysubst(_arguments, self._argmap_open)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_print_ = {
-		'with_properties' : 'prdt',
-	}
-
-	def print_(self, _object, _attributes={}, **_arguments):
-		"""print: Print the specified object(s)
-		Required argument: list of objects to print
-		Keyword argument with_properties: optional properties to be included with the print command sent to the application that prints the direct object
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'pdoc'
-
-		aetools.keysubst(_arguments, self._argmap_print_)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def quit(self, _no_object=None, _attributes={}, **_arguments):
-		"""quit: Quit the Finder
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'quit'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def select(self, _object, _attributes={}, **_arguments):
-		"""select: Select the specified object(s)
-		Required argument: the object to select
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'misc'
-		_subcode = 'slct'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    def close(self, _object, _attributes={}, **_arguments):
+        """close: Close an object
+        Required argument: the object to close
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'core'
+        _subcode = 'clos'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_count = {
+        'each' : 'kocl',
+    }
+
+    def count(self, _object, _attributes={}, **_arguments):
+        """count: Return the number of elements of a particular class within an object
+        Required argument: the object whose elements are to be counted
+        Keyword argument each: the class of the elements to be counted
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the number of elements
+        """
+        _code = 'core'
+        _subcode = 'cnte'
+
+        aetools.keysubst(_arguments, self._argmap_count)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_data_size = {
+        'as' : 'rtyp',
+    }
+
+    def data_size(self, _object, _attributes={}, **_arguments):
+        """data size: Return the size in bytes of an object
+        Required argument: the object whose data size is to be returned
+        Keyword argument as: the data type for which the size is calculated
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the size of the object in bytes
+        """
+        _code = 'core'
+        _subcode = 'dsiz'
+
+        aetools.keysubst(_arguments, self._argmap_data_size)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def delete(self, _object, _attributes={}, **_arguments):
+        """delete: Move an item from its container to the trash
+        Required argument: the item to delete
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: to the item that was just deleted
+        """
+        _code = 'core'
+        _subcode = 'delo'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_duplicate = {
+        'to' : 'insh',
+        'replacing' : 'alrp',
+        'routing_suppressed' : 'rout',
+    }
+
+    def duplicate(self, _object, _attributes={}, **_arguments):
+        """duplicate: Duplicate one or more object(s)
+        Required argument: the object(s) to duplicate
+        Keyword argument to: the new location for the object(s)
+        Keyword argument replacing: Specifies whether or not to replace items in the destination that have the same name as items being duplicated
+        Keyword argument routing_suppressed: Specifies whether or not to autoroute items (default is false). Only applies when copying to the system folder.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: to the duplicated object(s)
+        """
+        _code = 'core'
+        _subcode = 'clon'
+
+        aetools.keysubst(_arguments, self._argmap_duplicate)
+        _arguments['----'] = _object
+
+        aetools.enumsubst(_arguments, 'alrp', _Enum_bool)
+        aetools.enumsubst(_arguments, 'rout', _Enum_bool)
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def exists(self, _object, _attributes={}, **_arguments):
+        """exists: Verify if an object exists
+        Required argument: the object in question
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: true if it exists, false if not
+        """
+        _code = 'core'
+        _subcode = 'doex'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_make = {
+        'new' : 'kocl',
+        'at' : 'insh',
+        'to' : 'to  ',
+        'with_properties' : 'prdt',
+    }
+
+    def make(self, _no_object=None, _attributes={}, **_arguments):
+        """make: Make a new element
+        Keyword argument new: the class of the new element
+        Keyword argument at: the location at which to insert the element
+        Keyword argument to: when creating an alias file, the original item to create an alias to or when creating a file viewer window, the target of the window
+        Keyword argument with_properties: the initial values for the properties of the element
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: to the new object(s)
+        """
+        _code = 'core'
+        _subcode = 'crel'
+
+        aetools.keysubst(_arguments, self._argmap_make)
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_move = {
+        'to' : 'insh',
+        'replacing' : 'alrp',
+        'positioned_at' : 'mvpl',
+        'routing_suppressed' : 'rout',
+    }
+
+    def move(self, _object, _attributes={}, **_arguments):
+        """move: Move object(s) to a new location
+        Required argument: the object(s) to move
+        Keyword argument to: the new location for the object(s)
+        Keyword argument replacing: Specifies whether or not to replace items in the destination that have the same name as items being moved
+        Keyword argument positioned_at: Gives a list (in local window coordinates) of positions for the destination items
+        Keyword argument routing_suppressed: Specifies whether or not to autoroute items (default is false). Only applies when moving to the system folder.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: to the object(s) after they have been moved
+        """
+        _code = 'core'
+        _subcode = 'move'
+
+        aetools.keysubst(_arguments, self._argmap_move)
+        _arguments['----'] = _object
+
+        aetools.enumsubst(_arguments, 'alrp', _Enum_bool)
+        aetools.enumsubst(_arguments, 'mvpl', _Enum_list)
+        aetools.enumsubst(_arguments, 'rout', _Enum_bool)
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_open = {
+        'using' : 'usin',
+        'with_properties' : 'prdt',
+    }
+
+    def open(self, _object, _attributes={}, **_arguments):
+        """open: Open the specified object(s)
+        Required argument: list of objects to open
+        Keyword argument using: the application file to open the object with
+        Keyword argument with_properties: the initial values for the properties, to be included with the open command sent to the application that opens the direct object
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'odoc'
+
+        aetools.keysubst(_arguments, self._argmap_open)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_print_ = {
+        'with_properties' : 'prdt',
+    }
+
+    def print_(self, _object, _attributes={}, **_arguments):
+        """print: Print the specified object(s)
+        Required argument: list of objects to print
+        Keyword argument with_properties: optional properties to be included with the print command sent to the application that prints the direct object
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'pdoc'
+
+        aetools.keysubst(_arguments, self._argmap_print_)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def quit(self, _no_object=None, _attributes={}, **_arguments):
+        """quit: Quit the Finder
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'quit'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def select(self, _object, _attributes={}, **_arguments):
+        """select: Select the specified object(s)
+        Required argument: the object to select
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'misc'
+        _subcode = 'slct'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 _Enum_list = None # XXXX enum list not found!!
 _Enum_bool = None # XXXX enum bool not found!!
@@ -324,3 +324,12 @@ _Enum_bool = None # XXXX enum bool not found!!
 #
 _classdeclarations = {
 }
+
+_propdeclarations = {
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+}
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Type_Definitions.py b/Lib/plat-mac/lib-scriptpackages/Finder/Type_Definitions.py
index 6671d69..3e7d817 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Type_Definitions.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Type_Definitions.py
@@ -12,195 +12,195 @@ _code = 'tpdf'
 
 class Type_Definitions_Events:
 
-	pass
+    pass
 
 
 class alias_list(aetools.ComponentItem):
-	"""alias list - A list of aliases.  Use \xd4as alias list\xd5 when a list of aliases is needed (instead of a list of file system item references). """
-	want = 'alst'
+    """alias list - A list of aliases.  Use \xd4as alias list\xd5 when a list of aliases is needed (instead of a list of file system item references). """
+    want = 'alst'
 
 class label(aetools.ComponentItem):
-	"""label - (NOT AVAILABLE YET) A Finder label (name and color) """
-	want = 'clbl'
+    """label - (NOT AVAILABLE YET) A Finder label (name and color) """
+    want = 'clbl'
 class _Prop_color(aetools.NProperty):
-	"""color - the color associated with the label """
-	which = 'colr'
-	want = 'cRGB'
+    """color - the color associated with the label """
+    which = 'colr'
+    want = 'cRGB'
 class _Prop_index(aetools.NProperty):
-	"""index - the index in the front-to-back ordering within its container """
-	which = 'pidx'
-	want = 'long'
+    """index - the index in the front-to-back ordering within its container """
+    which = 'pidx'
+    want = 'long'
 class _Prop_name(aetools.NProperty):
-	"""name - the name associated with the label """
-	which = 'pnam'
-	want = 'utxt'
+    """name - the name associated with the label """
+    which = 'pnam'
+    want = 'utxt'
 
 class preferences(aetools.ComponentItem):
-	"""preferences - (NOT AVAILABLE, SUBJECT TO CHANGE) The Finder Preferences """
-	want = 'cprf'
+    """preferences - (NOT AVAILABLE, SUBJECT TO CHANGE) The Finder Preferences """
+    want = 'cprf'
 class _Prop_button_view_arrangement(aetools.NProperty):
-	"""button view arrangement - the method of arrangement of icons in default Finder button view windows """
-	which = 'barr'
-	want = 'earr'
+    """button view arrangement - the method of arrangement of icons in default Finder button view windows """
+    which = 'barr'
+    want = 'earr'
 class _Prop_button_view_icon_size(aetools.NProperty):
-	"""button view icon size - the size of icons displayed in Finder button view windows. """
-	which = 'bisz'
-	want = 'long'
+    """button view icon size - the size of icons displayed in Finder button view windows. """
+    which = 'bisz'
+    want = 'long'
 class _Prop_calculates_folder_sizes(aetools.NProperty):
-	"""calculates folder sizes - Are folder sizes calculated and displayed in Finder list view windows? """
-	which = 'sfsz'
-	want = 'bool'
+    """calculates folder sizes - Are folder sizes calculated and displayed in Finder list view windows? """
+    which = 'sfsz'
+    want = 'bool'
 class _Prop_delay_before_springing(aetools.NProperty):
-	"""delay before springing - the delay before springing open a container in ticks (1/60th of a second) (12 is shortest delay, 60 is longest delay) """
-	which = 'dela'
-	want = 'shor'
+    """delay before springing - the delay before springing open a container in ticks (1/60th of a second) (12 is shortest delay, 60 is longest delay) """
+    which = 'dela'
+    want = 'shor'
 class _Prop_list_view_icon_size(aetools.NProperty):
-	"""list view icon size - the size of icons displayed in Finder list view windows. """
-	which = 'lisz'
-	want = 'long'
+    """list view icon size - the size of icons displayed in Finder list view windows. """
+    which = 'lisz'
+    want = 'long'
 class _Prop_shows_comments(aetools.NProperty):
-	"""shows comments - Are comments displayed in default Finder list view windows? """
-	which = 'scom'
-	want = 'bool'
+    """shows comments - Are comments displayed in default Finder list view windows? """
+    which = 'scom'
+    want = 'bool'
 class _Prop_shows_creation_date(aetools.NProperty):
-	"""shows creation date - Are creation dates displayed in default Finder list view windows? """
-	which = 'scda'
-	want = 'bool'
+    """shows creation date - Are creation dates displayed in default Finder list view windows? """
+    which = 'scda'
+    want = 'bool'
 class _Prop_shows_kind(aetools.NProperty):
-	"""shows kind - Are document kinds displayed in default Finder list view windows? """
-	which = 'sknd'
-	want = 'bool'
+    """shows kind - Are document kinds displayed in default Finder list view windows? """
+    which = 'sknd'
+    want = 'bool'
 class _Prop_shows_label(aetools.NProperty):
-	"""shows label - Are labels displayed in default Finder list view windows? """
-	which = 'slbl'
-	want = 'bool'
+    """shows label - Are labels displayed in default Finder list view windows? """
+    which = 'slbl'
+    want = 'bool'
 class _Prop_shows_modification_date(aetools.NProperty):
-	"""shows modification date - Are modification dates displayed in default Finder list view windows? """
-	which = 'sdat'
-	want = 'bool'
+    """shows modification date - Are modification dates displayed in default Finder list view windows? """
+    which = 'sdat'
+    want = 'bool'
 class _Prop_shows_size(aetools.NProperty):
-	"""shows size - Are file sizes displayed in default Finder list view windows? """
-	which = 'ssiz'
-	want = 'bool'
+    """shows size - Are file sizes displayed in default Finder list view windows? """
+    which = 'ssiz'
+    want = 'bool'
 class _Prop_shows_version(aetools.NProperty):
-	"""shows version - Are file versions displayed in default Finder list view windows? """
-	which = 'svrs'
-	want = 'bool'
+    """shows version - Are file versions displayed in default Finder list view windows? """
+    which = 'svrs'
+    want = 'bool'
 class _Prop_spatial_view_arrangement(aetools.NProperty):
-	"""spatial view arrangement - the method of arrangement of icons in default Finder spatial view windows """
-	which = 'iarr'
-	want = 'earr'
+    """spatial view arrangement - the method of arrangement of icons in default Finder spatial view windows """
+    which = 'iarr'
+    want = 'earr'
 class _Prop_spatial_view_icon_size(aetools.NProperty):
-	"""spatial view icon size - the size of icons displayed in Finder spatial view windows. """
-	which = 'iisz'
-	want = 'long'
+    """spatial view icon size - the size of icons displayed in Finder spatial view windows. """
+    which = 'iisz'
+    want = 'long'
 class _Prop_spring_open_folders(aetools.NProperty):
-	"""spring open folders - Spring open folders after the specified delay? """
-	which = 'sprg'
-	want = 'bool'
+    """spring open folders - Spring open folders after the specified delay? """
+    which = 'sprg'
+    want = 'bool'
 class _Prop_uses_relative_dates(aetools.NProperty):
-	"""uses relative dates - Are relative dates (e.g., today, yesterday) shown  in Finder list view windows? """
-	which = 'urdt'
-	want = 'bool'
+    """uses relative dates - Are relative dates (e.g., today, yesterday) shown  in Finder list view windows? """
+    which = 'urdt'
+    want = 'bool'
 class _Prop_uses_simple_menus(aetools.NProperty):
-	"""uses simple menus - Use simplified Finder menus? """
-	which = 'usme'
-	want = 'bool'
+    """uses simple menus - Use simplified Finder menus? """
+    which = 'usme'
+    want = 'bool'
 class _Prop_uses_wide_grid(aetools.NProperty):
-	"""uses wide grid - Space icons on a wide grid? """
-	which = 'uswg'
-	want = 'bool'
+    """uses wide grid - Space icons on a wide grid? """
+    which = 'uswg'
+    want = 'bool'
 class _Prop_view_font(aetools.NProperty):
-	"""view font - the id of the font used in Finder views. """
-	which = 'vfnt'
-	want = 'long'
+    """view font - the id of the font used in Finder views. """
+    which = 'vfnt'
+    want = 'long'
 class _Prop_view_font_size(aetools.NProperty):
-	"""view font size - the size of the font used in Finder views """
-	which = 'vfsz'
-	want = 'long'
+    """view font size - the size of the font used in Finder views """
+    which = 'vfsz'
+    want = 'long'
 class _Prop_window(aetools.NProperty):
-	"""window - the window that would open if Finder preferences was opened """
-	which = 'cwin'
-	want = 'pwnd'
+    """window - the window that would open if Finder preferences was opened """
+    which = 'cwin'
+    want = 'pwnd'
 #        element 'clbl' as ['indx', 'name']
 
 class icon_view_options(aetools.ComponentItem):
-	"""icon view options - the icon view options """
-	want = 'icop'
+    """icon view options - the icon view options """
+    want = 'icop'
 
 _Prop_arrangement = _Prop_spatial_view_arrangement
 class _Prop_icon_size(aetools.NProperty):
-	"""icon size - the size of icons displayed in the icon view """
-	which = 'lvis'
-	want = 'shor'
+    """icon size - the size of icons displayed in the icon view """
+    which = 'lvis'
+    want = 'shor'
 
 class icon_family(aetools.ComponentItem):
-	"""icon family - (NOT AVAILABLE YET) A family of icons """
-	want = 'ifam'
+    """icon family - (NOT AVAILABLE YET) A family of icons """
+    want = 'ifam'
 class _Prop_large_32_bit_icon(aetools.NProperty):
-	"""large 32 bit icon - the large 32-bit color icon """
-	which = 'il32'
-	want = 'il32'
+    """large 32 bit icon - the large 32-bit color icon """
+    which = 'il32'
+    want = 'il32'
 class _Prop_large_4_bit_icon(aetools.NProperty):
-	"""large 4 bit icon - the large 4-bit color icon """
-	which = 'icl4'
-	want = 'icl4'
+    """large 4 bit icon - the large 4-bit color icon """
+    which = 'icl4'
+    want = 'icl4'
 class _Prop_large_8_bit_icon(aetools.NProperty):
-	"""large 8 bit icon - the large 8-bit color icon """
-	which = 'icl8'
-	want = 'icl8'
+    """large 8 bit icon - the large 8-bit color icon """
+    which = 'icl8'
+    want = 'icl8'
 class _Prop_large_8_bit_mask(aetools.NProperty):
-	"""large 8 bit mask - the large 8-bit mask for large 32-bit icons """
-	which = 'l8mk'
-	want = 'l8mk'
+    """large 8 bit mask - the large 8-bit mask for large 32-bit icons """
+    which = 'l8mk'
+    want = 'l8mk'
 class _Prop_large_monochrome_icon_and_mask(aetools.NProperty):
-	"""large monochrome icon and mask - the large black-and-white icon and the mask for large icons """
-	which = 'ICN#'
-	want = 'ICN#'
+    """large monochrome icon and mask - the large black-and-white icon and the mask for large icons """
+    which = 'ICN#'
+    want = 'ICN#'
 class _Prop_small_32_bit_icon(aetools.NProperty):
-	"""small 32 bit icon - the small 32-bit color icon """
-	which = 'is32'
-	want = 'is32'
+    """small 32 bit icon - the small 32-bit color icon """
+    which = 'is32'
+    want = 'is32'
 class _Prop_small_4_bit_icon(aetools.NProperty):
-	"""small 4 bit icon - the small 4-bit color icon """
-	which = 'ics4'
-	want = 'ics4'
+    """small 4 bit icon - the small 4-bit color icon """
+    which = 'ics4'
+    want = 'ics4'
 class _Prop_small_8_bit_icon(aetools.NProperty):
-	"""small 8 bit icon - the small 8-bit color icon """
-	which = 'ics8'
-	want = 'ics8'
+    """small 8 bit icon - the small 8-bit color icon """
+    which = 'ics8'
+    want = 'ics8'
 
 _Prop_small_8_bit_mask = _Prop_small_8_bit_icon
 class _Prop_small_monochrome_icon_and_mask(aetools.NProperty):
-	"""small monochrome icon and mask - the small black-and-white icon and the mask for small icons """
-	which = 'ics#'
-	want = 'ics#'
+    """small monochrome icon and mask - the small black-and-white icon and the mask for small icons """
+    which = 'ics#'
+    want = 'ics#'
 
 class column(aetools.ComponentItem):
-	"""column - a column of a list view """
-	want = 'lvcl'
+    """column - a column of a list view """
+    want = 'lvcl'
 class _Prop_sort_direction(aetools.NProperty):
-	"""sort direction - The direction in which the window is sorted """
-	which = 'sord'
-	want = 'sodr'
+    """sort direction - The direction in which the window is sorted """
+    which = 'sord'
+    want = 'sodr'
 class _Prop_visible(aetools.NProperty):
-	"""visible - is this column visible """
-	which = 'pvis'
-	want = 'bool'
+    """visible - is this column visible """
+    which = 'pvis'
+    want = 'bool'
 class _Prop_width(aetools.NProperty):
-	"""width - the width of this column """
-	which = 'clwd'
-	want = 'shor'
+    """width - the width of this column """
+    which = 'clwd'
+    want = 'shor'
 
 columns = column
 
 class list_view_options(aetools.ComponentItem):
-	"""list view options - the list view options """
-	want = 'lvop'
+    """list view options - the list view options """
+    want = 'lvop'
 class _Prop_sort_column(aetools.NProperty):
-	"""sort column - the column that the list view is sorted on """
-	which = 'srtc'
-	want = 'lvcl'
+    """sort column - the column that the list view is sorted on """
+    which = 'srtc'
+    want = 'lvcl'
 #        element 'lvcl' as ['indx', 'rele', 'rang', 'test']
 alias_list._superclassnames = []
 alias_list._privpropdict = {
@@ -209,91 +209,138 @@ alias_list._privelemdict = {
 }
 label._superclassnames = []
 label._privpropdict = {
-	'color' : _Prop_color,
-	'index' : _Prop_index,
-	'name' : _Prop_name,
+    'color' : _Prop_color,
+    'index' : _Prop_index,
+    'name' : _Prop_name,
 }
 label._privelemdict = {
 }
 preferences._superclassnames = []
 preferences._privpropdict = {
-	'button_view_arrangement' : _Prop_button_view_arrangement,
-	'button_view_icon_size' : _Prop_button_view_icon_size,
-	'calculates_folder_sizes' : _Prop_calculates_folder_sizes,
-	'delay_before_springing' : _Prop_delay_before_springing,
-	'list_view_icon_size' : _Prop_list_view_icon_size,
-	'shows_comments' : _Prop_shows_comments,
-	'shows_creation_date' : _Prop_shows_creation_date,
-	'shows_kind' : _Prop_shows_kind,
-	'shows_label' : _Prop_shows_label,
-	'shows_modification_date' : _Prop_shows_modification_date,
-	'shows_size' : _Prop_shows_size,
-	'shows_version' : _Prop_shows_version,
-	'spatial_view_arrangement' : _Prop_spatial_view_arrangement,
-	'spatial_view_icon_size' : _Prop_spatial_view_icon_size,
-	'spring_open_folders' : _Prop_spring_open_folders,
-	'uses_relative_dates' : _Prop_uses_relative_dates,
-	'uses_simple_menus' : _Prop_uses_simple_menus,
-	'uses_wide_grid' : _Prop_uses_wide_grid,
-	'view_font' : _Prop_view_font,
-	'view_font_size' : _Prop_view_font_size,
-	'window' : _Prop_window,
+    'button_view_arrangement' : _Prop_button_view_arrangement,
+    'button_view_icon_size' : _Prop_button_view_icon_size,
+    'calculates_folder_sizes' : _Prop_calculates_folder_sizes,
+    'delay_before_springing' : _Prop_delay_before_springing,
+    'list_view_icon_size' : _Prop_list_view_icon_size,
+    'shows_comments' : _Prop_shows_comments,
+    'shows_creation_date' : _Prop_shows_creation_date,
+    'shows_kind' : _Prop_shows_kind,
+    'shows_label' : _Prop_shows_label,
+    'shows_modification_date' : _Prop_shows_modification_date,
+    'shows_size' : _Prop_shows_size,
+    'shows_version' : _Prop_shows_version,
+    'spatial_view_arrangement' : _Prop_spatial_view_arrangement,
+    'spatial_view_icon_size' : _Prop_spatial_view_icon_size,
+    'spring_open_folders' : _Prop_spring_open_folders,
+    'uses_relative_dates' : _Prop_uses_relative_dates,
+    'uses_simple_menus' : _Prop_uses_simple_menus,
+    'uses_wide_grid' : _Prop_uses_wide_grid,
+    'view_font' : _Prop_view_font,
+    'view_font_size' : _Prop_view_font_size,
+    'window' : _Prop_window,
 }
 preferences._privelemdict = {
-	'label' : label,
+    'label' : label,
 }
 icon_view_options._superclassnames = []
 icon_view_options._privpropdict = {
-	'arrangement' : _Prop_arrangement,
-	'icon_size' : _Prop_icon_size,
+    'arrangement' : _Prop_arrangement,
+    'icon_size' : _Prop_icon_size,
 }
 icon_view_options._privelemdict = {
 }
 icon_family._superclassnames = []
 icon_family._privpropdict = {
-	'large_32_bit_icon' : _Prop_large_32_bit_icon,
-	'large_4_bit_icon' : _Prop_large_4_bit_icon,
-	'large_8_bit_icon' : _Prop_large_8_bit_icon,
-	'large_8_bit_mask' : _Prop_large_8_bit_mask,
-	'large_monochrome_icon_and_mask' : _Prop_large_monochrome_icon_and_mask,
-	'small_32_bit_icon' : _Prop_small_32_bit_icon,
-	'small_4_bit_icon' : _Prop_small_4_bit_icon,
-	'small_8_bit_icon' : _Prop_small_8_bit_icon,
-	'small_8_bit_mask' : _Prop_small_8_bit_mask,
-	'small_monochrome_icon_and_mask' : _Prop_small_monochrome_icon_and_mask,
+    'large_32_bit_icon' : _Prop_large_32_bit_icon,
+    'large_4_bit_icon' : _Prop_large_4_bit_icon,
+    'large_8_bit_icon' : _Prop_large_8_bit_icon,
+    'large_8_bit_mask' : _Prop_large_8_bit_mask,
+    'large_monochrome_icon_and_mask' : _Prop_large_monochrome_icon_and_mask,
+    'small_32_bit_icon' : _Prop_small_32_bit_icon,
+    'small_4_bit_icon' : _Prop_small_4_bit_icon,
+    'small_8_bit_icon' : _Prop_small_8_bit_icon,
+    'small_8_bit_mask' : _Prop_small_8_bit_mask,
+    'small_monochrome_icon_and_mask' : _Prop_small_monochrome_icon_and_mask,
 }
 icon_family._privelemdict = {
 }
 column._superclassnames = []
 column._privpropdict = {
-	'index' : _Prop_index,
-	'name' : _Prop_name,
-	'sort_direction' : _Prop_sort_direction,
-	'visible' : _Prop_visible,
-	'width' : _Prop_width,
+    'index' : _Prop_index,
+    'name' : _Prop_name,
+    'sort_direction' : _Prop_sort_direction,
+    'visible' : _Prop_visible,
+    'width' : _Prop_width,
 }
 column._privelemdict = {
 }
 list_view_options._superclassnames = []
 list_view_options._privpropdict = {
-	'calculates_folder_sizes' : _Prop_calculates_folder_sizes,
-	'icon_size' : _Prop_icon_size,
-	'sort_column' : _Prop_sort_column,
-	'uses_relative_dates' : _Prop_uses_relative_dates,
+    'calculates_folder_sizes' : _Prop_calculates_folder_sizes,
+    'icon_size' : _Prop_icon_size,
+    'sort_column' : _Prop_sort_column,
+    'uses_relative_dates' : _Prop_uses_relative_dates,
 }
 list_view_options._privelemdict = {
-	'column' : column,
+    'column' : column,
 }
 
 #
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'alst' : alias_list,
-	'clbl' : label,
-	'cprf' : preferences,
-	'icop' : icon_view_options,
-	'ifam' : icon_family,
-	'lvcl' : column,
-	'lvop' : list_view_options,
+    'alst' : alias_list,
+    'clbl' : label,
+    'cprf' : preferences,
+    'icop' : icon_view_options,
+    'ifam' : icon_family,
+    'lvcl' : column,
+    'lvop' : list_view_options,
+}
+
+_propdeclarations = {
+    'ICN#' : _Prop_large_monochrome_icon_and_mask,
+    'barr' : _Prop_button_view_arrangement,
+    'bisz' : _Prop_button_view_icon_size,
+    'clwd' : _Prop_width,
+    'colr' : _Prop_color,
+    'cwin' : _Prop_window,
+    'dela' : _Prop_delay_before_springing,
+    'iarr' : _Prop_spatial_view_arrangement,
+    'icl4' : _Prop_large_4_bit_icon,
+    'icl8' : _Prop_large_8_bit_icon,
+    'ics#' : _Prop_small_monochrome_icon_and_mask,
+    'ics4' : _Prop_small_4_bit_icon,
+    'ics8' : _Prop_small_8_bit_icon,
+    'iisz' : _Prop_spatial_view_icon_size,
+    'il32' : _Prop_large_32_bit_icon,
+    'is32' : _Prop_small_32_bit_icon,
+    'l8mk' : _Prop_large_8_bit_mask,
+    'lisz' : _Prop_list_view_icon_size,
+    'lvis' : _Prop_icon_size,
+    'pidx' : _Prop_index,
+    'pnam' : _Prop_name,
+    'pvis' : _Prop_visible,
+    'scda' : _Prop_shows_creation_date,
+    'scom' : _Prop_shows_comments,
+    'sdat' : _Prop_shows_modification_date,
+    'sfsz' : _Prop_calculates_folder_sizes,
+    'sknd' : _Prop_shows_kind,
+    'slbl' : _Prop_shows_label,
+    'sord' : _Prop_sort_direction,
+    'sprg' : _Prop_spring_open_folders,
+    'srtc' : _Prop_sort_column,
+    'ssiz' : _Prop_shows_size,
+    'svrs' : _Prop_shows_version,
+    'urdt' : _Prop_uses_relative_dates,
+    'usme' : _Prop_uses_simple_menus,
+    'uswg' : _Prop_uses_wide_grid,
+    'vfnt' : _Prop_view_font,
+    'vfsz' : _Prop_view_font_size,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/Window_classes.py b/Lib/plat-mac/lib-scriptpackages/Finder/Window_classes.py
index 73062f1..496968a 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/Window_classes.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/Window_classes.py
@@ -12,175 +12,175 @@ _code = 'fndr'
 
 class Window_classes_Events:
 
-	pass
+    pass
 
 
 class Finder_window(aetools.ComponentItem):
-	"""Finder window - A file viewer window """
-	want = 'brow'
+    """Finder window - A file viewer window """
+    want = 'brow'
 class _Prop__3c_Inheritance_3e_(aetools.NProperty):
-	"""<Inheritance> - inherits some of its properties from the window class """
-	which = 'c@#^'
-	want = 'cwin'
+    """<Inheritance> - inherits some of its properties from the window class """
+    which = 'c@#^'
+    want = 'cwin'
 class _Prop_current_view(aetools.NProperty):
-	"""current view - the current view for the container window """
-	which = 'pvew'
-	want = 'ecvw'
+    """current view - the current view for the container window """
+    which = 'pvew'
+    want = 'ecvw'
 class _Prop_icon_view_options(aetools.NProperty):
-	"""icon view options - the icon view options for the container window """
-	which = 'icop'
-	want = 'icop'
+    """icon view options - the icon view options for the container window """
+    which = 'icop'
+    want = 'icop'
 class _Prop_list_view_options(aetools.NProperty):
-	"""list view options - the list view options for the container window """
-	which = 'lvop'
-	want = 'lvop'
+    """list view options - the list view options for the container window """
+    which = 'lvop'
+    want = 'lvop'
 class _Prop_target(aetools.NProperty):
-	"""target - the container at which this file viewer is targeted """
-	which = 'fvtg'
-	want = 'obj '
+    """target - the container at which this file viewer is targeted """
+    which = 'fvtg'
+    want = 'obj '
 
 Finder_windows = Finder_window
 
 class window(aetools.ComponentItem):
-	"""window - A window """
-	want = 'cwin'
+    """window - A window """
+    want = 'cwin'
 class _Prop_bounds(aetools.NProperty):
-	"""bounds - the boundary rectangle for the window """
-	which = 'pbnd'
-	want = 'qdrt'
+    """bounds - the boundary rectangle for the window """
+    which = 'pbnd'
+    want = 'qdrt'
 class _Prop_closeable(aetools.NProperty):
-	"""closeable - Does the window have a close box? """
-	which = 'hclb'
-	want = 'bool'
+    """closeable - Does the window have a close box? """
+    which = 'hclb'
+    want = 'bool'
 class _Prop_collapsed(aetools.NProperty):
-	"""collapsed - Is the window collapsed """
-	which = 'wshd'
-	want = 'bool'
+    """collapsed - Is the window collapsed """
+    which = 'wshd'
+    want = 'bool'
 class _Prop_floating(aetools.NProperty):
-	"""floating - Does the window have a title bar? """
-	which = 'isfl'
-	want = 'bool'
+    """floating - Does the window have a title bar? """
+    which = 'isfl'
+    want = 'bool'
 class _Prop_id(aetools.NProperty):
-	"""id - the unique id for this window """
-	which = 'ID  '
-	want = 'magn'
+    """id - the unique id for this window """
+    which = 'ID  '
+    want = 'magn'
 class _Prop_index(aetools.NProperty):
-	"""index - the number of the window in the front-to-back layer ordering """
-	which = 'pidx'
-	want = 'long'
+    """index - the number of the window in the front-to-back layer ordering """
+    which = 'pidx'
+    want = 'long'
 class _Prop_modal(aetools.NProperty):
-	"""modal - Is the window modal? """
-	which = 'pmod'
-	want = 'bool'
+    """modal - Is the window modal? """
+    which = 'pmod'
+    want = 'bool'
 class _Prop_name(aetools.NProperty):
-	"""name - the name of the window """
-	which = 'pnam'
-	want = 'utxt'
+    """name - the name of the window """
+    which = 'pnam'
+    want = 'utxt'
 class _Prop_position(aetools.NProperty):
-	"""position - the upper left position of the window """
-	which = 'posn'
-	want = 'QDpt'
+    """position - the upper left position of the window """
+    which = 'posn'
+    want = 'QDpt'
 class _Prop_properties(aetools.NProperty):
-	"""properties - every property of a window """
-	which = 'pALL'
-	want = 'reco'
+    """properties - every property of a window """
+    which = 'pALL'
+    want = 'reco'
 class _Prop_resizable(aetools.NProperty):
-	"""resizable - Is the window resizable? """
-	which = 'prsz'
-	want = 'bool'
+    """resizable - Is the window resizable? """
+    which = 'prsz'
+    want = 'bool'
 class _Prop_titled(aetools.NProperty):
-	"""titled - Does the window have a title bar? """
-	which = 'ptit'
-	want = 'bool'
+    """titled - Does the window have a title bar? """
+    which = 'ptit'
+    want = 'bool'
 class _Prop_visible(aetools.NProperty):
-	"""visible - Is the window visible (always true for open Finder windows)? """
-	which = 'pvis'
-	want = 'bool'
+    """visible - Is the window visible (always true for open Finder windows)? """
+    which = 'pvis'
+    want = 'bool'
 class _Prop_zoomable(aetools.NProperty):
-	"""zoomable - Is the window zoomable? """
-	which = 'iszm'
-	want = 'bool'
+    """zoomable - Is the window zoomable? """
+    which = 'iszm'
+    want = 'bool'
 class _Prop_zoomed(aetools.NProperty):
-	"""zoomed - Is the window zoomed? """
-	which = 'pzum'
-	want = 'bool'
+    """zoomed - Is the window zoomed? """
+    which = 'pzum'
+    want = 'bool'
 class _Prop_zoomed_full_size(aetools.NProperty):
-	"""zoomed full size - Is the window zoomed to the full size of the screen? (can only be set, not read) """
-	which = 'zumf'
-	want = 'bool'
+    """zoomed full size - Is the window zoomed to the full size of the screen? (can only be set, not read) """
+    which = 'zumf'
+    want = 'bool'
 
 windows = window
 
 class information_window(aetools.ComponentItem):
-	"""information window - An inspector window (opened by \xd2Show Info\xd3) """
-	want = 'iwnd'
+    """information window - An inspector window (opened by \xd2Show Info\xd3) """
+    want = 'iwnd'
 class _Prop_current_panel(aetools.NProperty):
-	"""current panel - the current panel in the information window """
-	which = 'panl'
-	want = 'ipnl'
+    """current panel - the current panel in the information window """
+    which = 'panl'
+    want = 'ipnl'
 class _Prop_item(aetools.NProperty):
-	"""item - the item from which this window was opened """
-	which = 'cobj'
-	want = 'obj '
+    """item - the item from which this window was opened """
+    which = 'cobj'
+    want = 'obj '
 
 class clipping_window(aetools.ComponentItem):
-	"""clipping window - The window containing a clipping """
-	want = 'lwnd'
+    """clipping window - The window containing a clipping """
+    want = 'lwnd'
 
 clipping_windows = clipping_window
 
 class preferences_window(aetools.ComponentItem):
-	"""preferences window - (NOT AVAILABLE YET) The Finder Preferences window """
-	want = 'pwnd'
+    """preferences window - (NOT AVAILABLE YET) The Finder Preferences window """
+    want = 'pwnd'
 Finder_window._superclassnames = ['window']
 Finder_window._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'current_view' : _Prop_current_view,
-	'icon_view_options' : _Prop_icon_view_options,
-	'list_view_options' : _Prop_list_view_options,
-	'target' : _Prop_target,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'current_view' : _Prop_current_view,
+    'icon_view_options' : _Prop_icon_view_options,
+    'list_view_options' : _Prop_list_view_options,
+    'target' : _Prop_target,
 }
 Finder_window._privelemdict = {
 }
 window._superclassnames = []
 window._privpropdict = {
-	'bounds' : _Prop_bounds,
-	'closeable' : _Prop_closeable,
-	'collapsed' : _Prop_collapsed,
-	'floating' : _Prop_floating,
-	'id' : _Prop_id,
-	'index' : _Prop_index,
-	'modal' : _Prop_modal,
-	'name' : _Prop_name,
-	'position' : _Prop_position,
-	'properties' : _Prop_properties,
-	'resizable' : _Prop_resizable,
-	'titled' : _Prop_titled,
-	'visible' : _Prop_visible,
-	'zoomable' : _Prop_zoomable,
-	'zoomed' : _Prop_zoomed,
-	'zoomed_full_size' : _Prop_zoomed_full_size,
+    'bounds' : _Prop_bounds,
+    'closeable' : _Prop_closeable,
+    'collapsed' : _Prop_collapsed,
+    'floating' : _Prop_floating,
+    'id' : _Prop_id,
+    'index' : _Prop_index,
+    'modal' : _Prop_modal,
+    'name' : _Prop_name,
+    'position' : _Prop_position,
+    'properties' : _Prop_properties,
+    'resizable' : _Prop_resizable,
+    'titled' : _Prop_titled,
+    'visible' : _Prop_visible,
+    'zoomable' : _Prop_zoomable,
+    'zoomed' : _Prop_zoomed,
+    'zoomed_full_size' : _Prop_zoomed_full_size,
 }
 window._privelemdict = {
 }
 information_window._superclassnames = ['window']
 information_window._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'current_panel' : _Prop_current_panel,
-	'item' : _Prop_item,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'current_panel' : _Prop_current_panel,
+    'item' : _Prop_item,
 }
 information_window._privelemdict = {
 }
 clipping_window._superclassnames = ['window']
 clipping_window._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 clipping_window._privelemdict = {
 }
 preferences_window._superclassnames = ['window']
 preferences_window._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'current_panel' : _Prop_current_panel,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'current_panel' : _Prop_current_panel,
 }
 preferences_window._privelemdict = {
 }
@@ -189,9 +189,41 @@ preferences_window._privelemdict = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'brow' : Finder_window,
-	'cwin' : window,
-	'iwnd' : information_window,
-	'lwnd' : clipping_window,
-	'pwnd' : preferences_window,
+    'brow' : Finder_window,
+    'cwin' : window,
+    'iwnd' : information_window,
+    'lwnd' : clipping_window,
+    'pwnd' : preferences_window,
+}
+
+_propdeclarations = {
+    'ID  ' : _Prop_id,
+    'c@#^' : _Prop__3c_Inheritance_3e_,
+    'cobj' : _Prop_item,
+    'fvtg' : _Prop_target,
+    'hclb' : _Prop_closeable,
+    'icop' : _Prop_icon_view_options,
+    'isfl' : _Prop_floating,
+    'iszm' : _Prop_zoomable,
+    'lvop' : _Prop_list_view_options,
+    'pALL' : _Prop_properties,
+    'panl' : _Prop_current_panel,
+    'pbnd' : _Prop_bounds,
+    'pidx' : _Prop_index,
+    'pmod' : _Prop_modal,
+    'pnam' : _Prop_name,
+    'posn' : _Prop_position,
+    'prsz' : _Prop_resizable,
+    'ptit' : _Prop_titled,
+    'pvew' : _Prop_current_view,
+    'pvis' : _Prop_visible,
+    'pzum' : _Prop_zoomed,
+    'wshd' : _Prop_collapsed,
+    'zumf' : _Prop_zoomed_full_size,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py b/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
index 80d1cbb..30cf57a 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
@@ -15,29 +15,29 @@ import Enumerations
 
 
 _code_to_module = {
-	'CoRe' : Standard_Suite,
-	'fleg' : Legacy_suite,
-	'fndr' : Containers_and_folders,
-	'fndr' : Files,
-	'fndr' : Finder_Basics,
-	'fndr' : Finder_items,
-	'fndr' : Window_classes,
-	'tpdf' : Type_Definitions,
-	'tpnm' : Enumerations,
+    'CoRe' : Standard_Suite,
+    'fleg' : Legacy_suite,
+    'fndr' : Containers_and_folders,
+    'fndr' : Files,
+    'fndr' : Finder_Basics,
+    'fndr' : Finder_items,
+    'fndr' : Window_classes,
+    'tpdf' : Type_Definitions,
+    'tpnm' : Enumerations,
 }
 
 
 
 _code_to_fullname = {
-	'CoRe' : ('Finder.Standard_Suite', 'Standard_Suite'),
-	'fleg' : ('Finder.Legacy_suite', 'Legacy_suite'),
-	'fndr' : ('Finder.Containers_and_folders', 'Containers_and_folders'),
-	'fndr' : ('Finder.Files', 'Files'),
-	'fndr' : ('Finder.Finder_Basics', 'Finder_Basics'),
-	'fndr' : ('Finder.Finder_items', 'Finder_items'),
-	'fndr' : ('Finder.Window_classes', 'Window_classes'),
-	'tpdf' : ('Finder.Type_Definitions', 'Type_Definitions'),
-	'tpnm' : ('Finder.Enumerations', 'Enumerations'),
+    'CoRe' : ('Finder.Standard_Suite', 'Standard_Suite'),
+    'fleg' : ('Finder.Legacy_suite', 'Legacy_suite'),
+    'fndr' : ('Finder.Containers_and_folders', 'Containers_and_folders'),
+    'fndr' : ('Finder.Files', 'Files'),
+    'fndr' : ('Finder.Finder_Basics', 'Finder_Basics'),
+    'fndr' : ('Finder.Finder_items', 'Finder_items'),
+    'fndr' : ('Finder.Window_classes', 'Window_classes'),
+    'tpdf' : ('Finder.Type_Definitions', 'Type_Definitions'),
+    'tpnm' : ('Finder.Enumerations', 'Enumerations'),
 }
 
 from Standard_Suite import *
@@ -51,29 +51,26 @@ from Type_Definitions import *
 from Enumerations 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', {}))
+    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(process)
+getbaseclasses(application_process)
+getbaseclasses(desk_accessory_process)
 getbaseclasses(application)
-getbaseclasses(trash_2d_object)
-getbaseclasses(desktop_2d_object)
-getbaseclasses(container)
-getbaseclasses(folder)
-getbaseclasses(disk)
-getbaseclasses(item)
 getbaseclasses(package)
 getbaseclasses(file)
 getbaseclasses(application_file)
@@ -81,15 +78,6 @@ getbaseclasses(alias_file)
 getbaseclasses(internet_location_file)
 getbaseclasses(document_file)
 getbaseclasses(clipping)
-getbaseclasses(preferences_window)
-getbaseclasses(Finder_window)
-getbaseclasses(window)
-getbaseclasses(clipping_window)
-getbaseclasses(information_window)
-getbaseclasses(process)
-getbaseclasses(application_process)
-getbaseclasses(desk_accessory_process)
-getbaseclasses(application)
 getbaseclasses(icon_view_options)
 getbaseclasses(label)
 getbaseclasses(column)
@@ -97,6 +85,18 @@ getbaseclasses(preferences)
 getbaseclasses(alias_list)
 getbaseclasses(icon_family)
 getbaseclasses(list_view_options)
+getbaseclasses(application)
+getbaseclasses(item)
+getbaseclasses(trash_2d_object)
+getbaseclasses(desktop_2d_object)
+getbaseclasses(container)
+getbaseclasses(folder)
+getbaseclasses(disk)
+getbaseclasses(preferences_window)
+getbaseclasses(Finder_window)
+getbaseclasses(window)
+getbaseclasses(clipping_window)
+getbaseclasses(information_window)
 getbaseclasses(StdSuites.Type_Names_Suite.double_integer)
 getbaseclasses(StdSuites.Type_Names_Suite.version)
 getbaseclasses(StdSuites.Type_Names_Suite.RGB16_color)
@@ -142,90 +142,90 @@ getbaseclasses(StdSuites.Type_Names_Suite.bounding_rectangle)
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'capp' : application,
-	'ctrs' : trash_2d_object,
-	'cdsk' : desktop_2d_object,
-	'ctnr' : container,
-	'cfol' : folder,
-	'cdis' : disk,
-	'cobj' : item,
-	'pack' : package,
-	'file' : file,
-	'appf' : application_file,
-	'alia' : alias_file,
-	'inlf' : internet_location_file,
-	'docf' : document_file,
-	'clpf' : clipping,
-	'pwnd' : preferences_window,
-	'brow' : Finder_window,
-	'cwin' : window,
-	'lwnd' : clipping_window,
-	'iwnd' : information_window,
-	'prcs' : process,
-	'pcap' : application_process,
-	'pcda' : desk_accessory_process,
-	'capp' : application,
-	'icop' : icon_view_options,
-	'clbl' : label,
-	'lvcl' : column,
-	'cprf' : preferences,
-	'alst' : alias_list,
-	'ifam' : icon_family,
-	'lvop' : list_view_options,
-	'comp' : StdSuites.Type_Names_Suite.double_integer,
-	'vers' : StdSuites.Type_Names_Suite.version,
-	'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,
-	'TIFF' : StdSuites.Type_Names_Suite.TIFF_picture,
-	'elin' : StdSuites.Type_Names_Suite.type_element_info,
-	'evin' : StdSuites.Type_Names_Suite.type_event_info,
-	'mLoc' : StdSuites.Type_Names_Suite.machine_location,
-	'EPS ' : StdSuites.Type_Names_Suite.PostScript_picture,
-	'QDpt' : StdSuites.Type_Names_Suite.point,
-	'lfpt' : StdSuites.Type_Names_Suite.long_fixed_point,
-	'cmen' : StdSuites.Type_Names_Suite.menu_item,
-	'styl' : StdSuites.Type_Names_Suite.scrap_styles,
-	'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,
-	'pinf' : StdSuites.Type_Names_Suite.type_property_info,
-	'lfrc' : StdSuites.Type_Names_Suite.long_fixed_rectangle,
-	'lfxd' : StdSuites.Type_Names_Suite.long_fixed,
-	'suin' : StdSuites.Type_Names_Suite.type_suite_info,
-	'trot' : StdSuites.Type_Names_Suite.rotation,
-	'shor' : StdSuites.Type_Names_Suite.small_integer,
-	'fixd' : StdSuites.Type_Names_Suite.fixed,
-	'lpnt' : StdSuites.Type_Names_Suite.long_point,
-	'gcli' : StdSuites.Type_Names_Suite.type_class_info,
-	'tr96' : StdSuites.Type_Names_Suite.RGB96_color,
-	'targ' : StdSuites.Type_Names_Suite.target_id,
-	'tpmm' : StdSuites.Type_Names_Suite.pixel_map_record,
-	'pmin' : StdSuites.Type_Names_Suite.type_parameter_info,
-	'exte' : StdSuites.Type_Names_Suite.extended_real,
-	'lrct' : StdSuites.Type_Names_Suite.long_rectangle,
-	'tdas' : StdSuites.Type_Names_Suite.dash_style,
-	'TEXT' : StdSuites.Type_Names_Suite.string,
-	'sing' : StdSuites.Type_Names_Suite.small_real,
-	'null' : StdSuites.Type_Names_Suite.null,
-	'insl' : StdSuites.Type_Names_Suite.location_reference,
-	'qdrt' : StdSuites.Type_Names_Suite.bounding_rectangle,
+    'prcs' : process,
+    'pcap' : application_process,
+    'pcda' : desk_accessory_process,
+    'capp' : application,
+    'pack' : package,
+    'file' : file,
+    'appf' : application_file,
+    'alia' : alias_file,
+    'inlf' : internet_location_file,
+    'docf' : document_file,
+    'clpf' : clipping,
+    'icop' : icon_view_options,
+    'clbl' : label,
+    'lvcl' : column,
+    'cprf' : preferences,
+    'alst' : alias_list,
+    'ifam' : icon_family,
+    'lvop' : list_view_options,
+    'capp' : application,
+    'cobj' : item,
+    'ctrs' : trash_2d_object,
+    'cdsk' : desktop_2d_object,
+    'ctnr' : container,
+    'cfol' : folder,
+    'cdis' : disk,
+    'pwnd' : preferences_window,
+    'brow' : Finder_window,
+    'cwin' : window,
+    'lwnd' : clipping_window,
+    'iwnd' : information_window,
+    'comp' : StdSuites.Type_Names_Suite.double_integer,
+    'vers' : StdSuites.Type_Names_Suite.version,
+    '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,
+    'TIFF' : StdSuites.Type_Names_Suite.TIFF_picture,
+    'elin' : StdSuites.Type_Names_Suite.type_element_info,
+    'evin' : StdSuites.Type_Names_Suite.type_event_info,
+    'mLoc' : StdSuites.Type_Names_Suite.machine_location,
+    'EPS ' : StdSuites.Type_Names_Suite.PostScript_picture,
+    'QDpt' : StdSuites.Type_Names_Suite.point,
+    'lfpt' : StdSuites.Type_Names_Suite.long_fixed_point,
+    'cmen' : StdSuites.Type_Names_Suite.menu_item,
+    'styl' : StdSuites.Type_Names_Suite.scrap_styles,
+    '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,
+    'pinf' : StdSuites.Type_Names_Suite.type_property_info,
+    'lfrc' : StdSuites.Type_Names_Suite.long_fixed_rectangle,
+    'lfxd' : StdSuites.Type_Names_Suite.long_fixed,
+    'suin' : StdSuites.Type_Names_Suite.type_suite_info,
+    'trot' : StdSuites.Type_Names_Suite.rotation,
+    'shor' : StdSuites.Type_Names_Suite.small_integer,
+    'fixd' : StdSuites.Type_Names_Suite.fixed,
+    'lpnt' : StdSuites.Type_Names_Suite.long_point,
+    'gcli' : StdSuites.Type_Names_Suite.type_class_info,
+    'tr96' : StdSuites.Type_Names_Suite.RGB96_color,
+    'targ' : StdSuites.Type_Names_Suite.target_id,
+    'tpmm' : StdSuites.Type_Names_Suite.pixel_map_record,
+    'pmin' : StdSuites.Type_Names_Suite.type_parameter_info,
+    'exte' : StdSuites.Type_Names_Suite.extended_real,
+    'lrct' : StdSuites.Type_Names_Suite.long_rectangle,
+    'tdas' : StdSuites.Type_Names_Suite.dash_style,
+    'TEXT' : StdSuites.Type_Names_Suite.string,
+    'sing' : StdSuites.Type_Names_Suite.small_real,
+    'null' : StdSuites.Type_Names_Suite.null,
+    'insl' : StdSuites.Type_Names_Suite.location_reference,
+    'qdrt' : StdSuites.Type_Names_Suite.bounding_rectangle,
 }
 
 
 class Finder(Standard_Suite_Events,
-		Legacy_suite_Events,
-		Containers_and_folders_Events,
-		Files_Events,
-		Finder_Basics_Events,
-		Finder_items_Events,
-		Window_classes_Events,
-		Type_Definitions_Events,
-		Enumerations_Events,
-		aetools.TalkTo):
-	_signature = 'MACS'
+        Legacy_suite_Events,
+        Containers_and_folders_Events,
+        Files_Events,
+        Finder_Basics_Events,
+        Finder_items_Events,
+        Window_classes_Events,
+        Type_Definitions_Events,
+        Enumerations_Events,
+        aetools.TalkTo):
+    _signature = 'MACS'
 
-	_moduleName = 'Finder'
+    _moduleName = 'Finder'
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/Mozilla_suite.py b/Lib/plat-mac/lib-scriptpackages/Netscape/Mozilla_suite.py
index 8d3de6c..e7f630a 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/Mozilla_suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/Mozilla_suite.py
@@ -12,241 +12,241 @@ _code = 'MOSS'
 
 class Mozilla_suite_Events:
 
-	def Get_Import_Data(self, _no_object=None, _attributes={}, **_arguments):
-		"""Get Import Data: Returns a structure containing information that is of use to an external module in importing data from an external mail application into Communicator.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: vRefNum and dirID of profile folder (2+4 bytes), vRefNum and DirID of the local mail folder (2+4 bytes), window type of front window (0 if none, \xd4Brwz\xd5 browser, \xd4Addr\xd5 addressbook, \xd4Mesg\xd5 messenger, etc., 4 bytes)
-		"""
-		_code = 'MOSS'
-		_subcode = 'Impt'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Get_Profile_Name(self, _no_object=None, _attributes={}, **_arguments):
-		"""Get Profile Name: Get the current User Profile
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Name of the current profile, like \xd2Joe Bloggs\xd3. This is the name of the profile folder in the Netscape Users folder.
-		"""
-		_code = 'MOSS'
-		_subcode = 'upro'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Get_workingURL(self, _no_object=None, _attributes={}, **_arguments):
-		"""Get workingURL: Get the path to the running application in URL format.  This will allow a script to construct a relative URL
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Will return text of the from \xd2FILE://foo/applicationname\xd3
-		"""
-		_code = 'MOSS'
-		_subcode = 'wurl'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_Go = {
-		'direction' : 'dire',
-	}
-
-	def Go(self, _object, _attributes={}, **_arguments):
-		"""Go: navigate a window: back, forward, again(reload), home)
-		Required argument: window
-		Keyword argument direction: undocumented, typecode 'dire'
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MOSS'
-		_subcode = 'gogo'
-
-		aetools.keysubst(_arguments, self._argmap_Go)
-		_arguments['----'] = _object
-
-		aetools.enumsubst(_arguments, 'dire', _Enum_dire)
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Handle_command(self, _object, _attributes={}, **_arguments):
-		"""Handle command: Handle a command
-		Required argument: The command to handle
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MOSS'
-		_subcode = 'hcmd'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Open_Address_Book(self, _no_object=None, _attributes={}, **_arguments):
-		"""Open Address Book: Opens the address book
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MOSS'
-		_subcode = 'addr'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Open_Component(self, _object, _attributes={}, **_arguments):
-		"""Open Component: Open a Communicator component
-		Required argument: The component to open
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MOSS'
-		_subcode = 'cpnt'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Open_Profile_Manager(self, _no_object=None, _attributes={}, **_arguments):
-		"""Open Profile Manager: Open the user profile manager (obsolete)
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MOSS'
-		_subcode = 'prfl'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def Open_bookmark(self, _object=None, _attributes={}, **_arguments):
-		"""Open bookmark: Reads in a bookmark file
-		Required argument: If not available, reloads the current bookmark file
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MOSS'
-		_subcode = 'book'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_Read_help_file = {
-		'with_index' : 'idid',
-		'search_text' : 'sear',
-	}
-
-	def Read_help_file(self, _object, _attributes={}, **_arguments):
-		"""Read help file: Reads in the help file (file should be in the help file format)
-		Required argument: undocumented, typecode 'alis'
-		Keyword argument with_index: Index to the help file. Defaults to  \xd4DEFAULT\xd5)
-		Keyword argument search_text: Optional text to search for
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'MOSS'
-		_subcode = 'help'
-
-		aetools.keysubst(_arguments, self._argmap_Read_help_file)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    def Get_Import_Data(self, _no_object=None, _attributes={}, **_arguments):
+        """Get Import Data: Returns a structure containing information that is of use to an external module in importing data from an external mail application into Communicator.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: vRefNum and dirID of profile folder (2+4 bytes), vRefNum and DirID of the local mail folder (2+4 bytes), window type of front window (0 if none, \xd4Brwz\xd5 browser, \xd4Addr\xd5 addressbook, \xd4Mesg\xd5 messenger, etc., 4 bytes)
+        """
+        _code = 'MOSS'
+        _subcode = 'Impt'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Get_Profile_Name(self, _no_object=None, _attributes={}, **_arguments):
+        """Get Profile Name: Get the current User Profile
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: Name of the current profile, like \xd2Joe Bloggs\xd3. This is the name of the profile folder in the Netscape Users folder.
+        """
+        _code = 'MOSS'
+        _subcode = 'upro'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Get_workingURL(self, _no_object=None, _attributes={}, **_arguments):
+        """Get workingURL: Get the path to the running application in URL format.  This will allow a script to construct a relative URL
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: Will return text of the from \xd2FILE://foo/applicationname\xd3
+        """
+        _code = 'MOSS'
+        _subcode = 'wurl'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_Go = {
+        'direction' : 'dire',
+    }
+
+    def Go(self, _object, _attributes={}, **_arguments):
+        """Go: navigate a window: back, forward, again(reload), home)
+        Required argument: window
+        Keyword argument direction: undocumented, typecode 'dire'
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'MOSS'
+        _subcode = 'gogo'
+
+        aetools.keysubst(_arguments, self._argmap_Go)
+        _arguments['----'] = _object
+
+        aetools.enumsubst(_arguments, 'dire', _Enum_dire)
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Handle_command(self, _object, _attributes={}, **_arguments):
+        """Handle command: Handle a command
+        Required argument: The command to handle
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'MOSS'
+        _subcode = 'hcmd'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Open_Address_Book(self, _no_object=None, _attributes={}, **_arguments):
+        """Open Address Book: Opens the address book
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'MOSS'
+        _subcode = 'addr'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Open_Component(self, _object, _attributes={}, **_arguments):
+        """Open Component: Open a Communicator component
+        Required argument: The component to open
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'MOSS'
+        _subcode = 'cpnt'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Open_Profile_Manager(self, _no_object=None, _attributes={}, **_arguments):
+        """Open Profile Manager: Open the user profile manager (obsolete)
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'MOSS'
+        _subcode = 'prfl'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def Open_bookmark(self, _object=None, _attributes={}, **_arguments):
+        """Open bookmark: Reads in a bookmark file
+        Required argument: If not available, reloads the current bookmark file
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'MOSS'
+        _subcode = 'book'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_Read_help_file = {
+        'with_index' : 'idid',
+        'search_text' : 'sear',
+    }
+
+    def Read_help_file(self, _object, _attributes={}, **_arguments):
+        """Read help file: Reads in the help file (file should be in the help file format)
+        Required argument: undocumented, typecode 'alis'
+        Keyword argument with_index: Index to the help file. Defaults to  \xd4DEFAULT\xd5)
+        Keyword argument search_text: Optional text to search for
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'MOSS'
+        _subcode = 'help'
+
+        aetools.keysubst(_arguments, self._argmap_Read_help_file)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 _Enum_comp = {
-	'Navigator' : 'navg',	# The Navigator component
-	'InBox' : 'inbx',	# The InBox component
-	'Newsgroups' : 'colb',	# The Newsgroups component
-	'Composer' : 'cpsr',	# The Page Composer component
-	'Conference' : 'conf',	# The Conference Component
-	'Calendar' : 'cald',	# The Calendar Component
+    'Navigator' : 'navg',	# The Navigator component
+    'InBox' : 'inbx',	# The InBox component
+    'Newsgroups' : 'colb',	# The Newsgroups component
+    'Composer' : 'cpsr',	# The Page Composer component
+    'Conference' : 'conf',	# The Conference Component
+    'Calendar' : 'cald',	# The Calendar Component
 }
 
 _Enum_dire = {
-	'again' : 'agai',	# Again (reload)
-	'home' : 'home',	# Home
-	'backward' : 'prev',	# Previous page
-	'forward' : 'next',	# Next page
+    'again' : 'agai',	# Again (reload)
+    'home' : 'home',	# Home
+    'backward' : 'prev',	# Previous page
+    'forward' : 'next',	# Next page
 }
 
 _Enum_ncmd = {
-	'Get_new_mail' : '\x00\x00\x04W',	# 
-	'Send_queued_messages' : '\x00\x00\x04X',	# 
-	'Read_newsgroups' : '\x00\x00\x04\x04',	# 
-	'Show_Inbox' : '\x00\x00\x04\x05',	# 
-	'Show_Bookmarks_window' : '\x00\x00\x04\x06',	# 
-	'Show_History_window' : '\x00\x00\x04\x07',	# 
-	'Show_Address_Book_window' : '\x00\x00\x04\t',	# 
+    'Get_new_mail' : '\x00\x00\x04W',	# 
+    'Send_queued_messages' : '\x00\x00\x04X',	# 
+    'Read_newsgroups' : '\x00\x00\x04\x04',	# 
+    'Show_Inbox' : '\x00\x00\x04\x05',	# 
+    'Show_Bookmarks_window' : '\x00\x00\x04\x06',	# 
+    'Show_History_window' : '\x00\x00\x04\x07',	# 
+    'Show_Address_Book_window' : '\x00\x00\x04\t',	# 
 }
 
 
@@ -255,3 +255,15 @@ _Enum_ncmd = {
 #
 _classdeclarations = {
 }
+
+_propdeclarations = {
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+    'comp' : _Enum_comp,
+    'dire' : _Enum_dire,
+    'ncmd' : _Enum_ncmd,
+}
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/PowerPlant.py b/Lib/plat-mac/lib-scriptpackages/Netscape/PowerPlant.py
index 515715a..bdb0e0e 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/PowerPlant.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/PowerPlant.py
@@ -12,60 +12,60 @@ _code = 'ppnt'
 
 class PowerPlant_Events:
 
-	_argmap_SwitchTellTarget = {
-		'to' : 'data',
-	}
-
-	def SwitchTellTarget(self, _no_object=None, _attributes={}, **_arguments):
-		"""SwitchTellTarget: Makes an object the \xd2focus\xd3 of AppleEvents
-		Keyword argument to: reference to new focus of AppleEvents
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'ppnt'
-		_subcode = 'sttg'
-
-		aetools.keysubst(_arguments, self._argmap_SwitchTellTarget)
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_select = {
-		'data' : 'data',
-	}
-
-	def select(self, _object, _attributes={}, **_arguments):
-		"""select: Sets the present selection
-		Required argument: object to select or container of sub-objects to select
-		Keyword argument data: sub-object(s) to select
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'misc'
-		_subcode = 'slct'
-
-		aetools.keysubst(_arguments, self._argmap_select)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    _argmap_SwitchTellTarget = {
+        'to' : 'data',
+    }
+
+    def SwitchTellTarget(self, _no_object=None, _attributes={}, **_arguments):
+        """SwitchTellTarget: Makes an object the \xd2focus\xd3 of AppleEvents
+        Keyword argument to: reference to new focus of AppleEvents
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'ppnt'
+        _subcode = 'sttg'
+
+        aetools.keysubst(_arguments, self._argmap_SwitchTellTarget)
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_select = {
+        'data' : 'data',
+    }
+
+    def select(self, _object, _attributes={}, **_arguments):
+        """select: Sets the present selection
+        Required argument: object to select or container of sub-objects to select
+        Keyword argument data: sub-object(s) to select
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'misc'
+        _subcode = 'slct'
+
+        aetools.keysubst(_arguments, self._argmap_select)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 _Enum_dbac = {
-	'DoNothing' : '\x00\x00\x00\x00',	# No debugging action is taken.
-	'PostAlert' : '\x00\x00\x00\x01',	# Post an alert.
-	'LowLevelDebugger' : '\x00\x00\x00\x02',	# Break into the low level debugger (MacsBug).
-	'SourceDebugger' : '\x00\x00\x00\x03',	# Break into the source level debugger (if source debugger is executing).
+    'DoNothing' : '\x00\x00\x00\x00',	# No debugging action is taken.
+    'PostAlert' : '\x00\x00\x00\x01',	# Post an alert.
+    'LowLevelDebugger' : '\x00\x00\x00\x02',	# Break into the low level debugger (MacsBug).
+    'SourceDebugger' : '\x00\x00\x00\x03',	# Break into the source level debugger (if source debugger is executing).
 }
 
 
@@ -74,3 +74,13 @@ _Enum_dbac = {
 #
 _classdeclarations = {
 }
+
+_propdeclarations = {
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+    'dbac' : _Enum_dbac,
+}
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/Required_suite.py b/Lib/plat-mac/lib-scriptpackages/Netscape/Required_suite.py
index 8ae504e..a006f76 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/Required_suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/Required_suite.py
@@ -13,83 +13,83 @@ _code = 'reqd'
 from StdSuites.Required_Suite import *
 class Required_suite_Events(Required_Suite_Events):
 
-	def open(self, _object, _attributes={}, **_arguments):
-		"""open: Open the specified object(s)
-		Required argument: list of objects to open
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'odoc'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def print_(self, _object, _attributes={}, **_arguments):
-		"""print: Print the specified object(s)
-		Required argument: list of objects to print
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'pdoc'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def quit(self, _no_object=None, _attributes={}, **_arguments):
-		"""quit: Quit Navigator
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'quit'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def run(self, _no_object=None, _attributes={}, **_arguments):
-		"""run: Sent to an application when it is double-clicked
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'oapp'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    def open(self, _object, _attributes={}, **_arguments):
+        """open: Open the specified object(s)
+        Required argument: list of objects to open
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'odoc'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def print_(self, _object, _attributes={}, **_arguments):
+        """print: Print the specified object(s)
+        Required argument: list of objects to print
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'pdoc'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def quit(self, _no_object=None, _attributes={}, **_arguments):
+        """quit: Quit Navigator
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'quit'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def run(self, _no_object=None, _attributes={}, **_arguments):
+        """run: Sent to an application when it is double-clicked
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'oapp'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 #
@@ -97,3 +97,12 @@ class Required_suite_Events(Required_Suite_Events):
 #
 _classdeclarations = {
 }
+
+_propdeclarations = {
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+}
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_Suite.py
index 96305a3..776925a 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_Suite.py
@@ -13,195 +13,195 @@ _code = 'CoRe'
 from StdSuites.Standard_Suite import *
 class Standard_Suite_Events(Standard_Suite_Events):
 
-	def close(self, _object, _attributes={}, **_arguments):
-		"""close: Close an object
-		Required argument: the objects to close
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'core'
-		_subcode = 'clos'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def data_size(self, _object, _attributes={}, **_arguments):
-		"""data size: Return the size in bytes of an object
-		Required argument: the object whose data size is to be returned
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the size of the object in bytes
-		"""
-		_code = 'core'
-		_subcode = 'dsiz'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def get(self, _object, _attributes={}, **_arguments):
-		"""get: Get the data for an object
-		Required argument: the object whose data is to be returned
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: The data from the object
-		"""
-		_code = 'core'
-		_subcode = 'getd'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_set = {
-		'to' : 'data',
-	}
-
-	def set(self, _object, _attributes={}, **_arguments):
-		"""set: Set an object\xd5s data
-		Required argument: the object to change
-		Keyword argument to: the new value
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'core'
-		_subcode = 'setd'
-
-		aetools.keysubst(_arguments, self._argmap_set)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    def close(self, _object, _attributes={}, **_arguments):
+        """close: Close an object
+        Required argument: the objects to close
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'core'
+        _subcode = 'clos'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def data_size(self, _object, _attributes={}, **_arguments):
+        """data size: Return the size in bytes of an object
+        Required argument: the object whose data size is to be returned
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the size of the object in bytes
+        """
+        _code = 'core'
+        _subcode = 'dsiz'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def get(self, _object, _attributes={}, **_arguments):
+        """get: Get the data for an object
+        Required argument: the object whose data is to be returned
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: The data from the object
+        """
+        _code = 'core'
+        _subcode = 'getd'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_set = {
+        'to' : 'data',
+    }
+
+    def set(self, _object, _attributes={}, **_arguments):
+        """set: Set an object\xd5s data
+        Required argument: the object to change
+        Keyword argument to: the new value
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'core'
+        _subcode = 'setd'
+
+        aetools.keysubst(_arguments, self._argmap_set)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 class application(aetools.ComponentItem):
-	"""application - An application program """
-	want = 'capp'
+    """application - An application program """
+    want = 'capp'
 class _Prop_alert_application(aetools.NProperty):
-	"""alert application - Most of the alerts will be sent to this application using yet unspecified AE interface. We need a few alert boxes: alert, confirm and notify. Any ideas on how to design this event? mailto:atotic@netscape.com. I\xd5d like to conform to the standard. """
-	which = 'ALAP'
-	want = 'type'
+    """alert application - Most of the alerts will be sent to this application using yet unspecified AE interface. We need a few alert boxes: alert, confirm and notify. Any ideas on how to design this event? mailto:atotic@netscape.com. I\xd5d like to conform to the standard. """
+    which = 'ALAP'
+    want = 'type'
 class _Prop_kiosk_mode(aetools.NProperty):
-	"""kiosk mode - Kiosk mode leaves very few menus enabled """
-	which = 'KOSK'
-	want = 'long'
+    """kiosk mode - Kiosk mode leaves very few menus enabled """
+    which = 'KOSK'
+    want = 'long'
 #        element 'cwin' as ['indx', 'name', 'ID  ']
 
 class window(aetools.ComponentItem):
-	"""window - A Window """
-	want = 'cwin'
+    """window - A Window """
+    want = 'cwin'
 class _Prop_URL(aetools.NProperty):
-	"""URL - Current URL """
-	which = 'curl'
-	want = 'TEXT'
+    """URL - Current URL """
+    which = 'curl'
+    want = 'TEXT'
 class _Prop_bounds(aetools.NProperty):
-	"""bounds - the boundary rectangle for the window """
-	which = 'pbnd'
-	want = 'qdrt'
+    """bounds - the boundary rectangle for the window """
+    which = 'pbnd'
+    want = 'qdrt'
 class _Prop_busy(aetools.NProperty):
-	"""busy - Is window loading something right now. 2, window is busy and will reject load requests. 1, window is busy, but will interrupt outstanding loads """
-	which = 'busy'
-	want = 'long'
+    """busy - Is window loading something right now. 2, window is busy and will reject load requests. 1, window is busy, but will interrupt outstanding loads """
+    which = 'busy'
+    want = 'long'
 class _Prop_closeable(aetools.NProperty):
-	"""closeable - Does the window have a close box? """
-	which = 'hclb'
-	want = 'bool'
+    """closeable - Does the window have a close box? """
+    which = 'hclb'
+    want = 'bool'
 class _Prop_floating(aetools.NProperty):
-	"""floating - Does the window float? """
-	which = 'isfl'
-	want = 'bool'
+    """floating - Does the window float? """
+    which = 'isfl'
+    want = 'bool'
 class _Prop_index(aetools.NProperty):
-	"""index - the number of the window """
-	which = 'pidx'
-	want = 'long'
+    """index - the number of the window """
+    which = 'pidx'
+    want = 'long'
 class _Prop_modal(aetools.NProperty):
-	"""modal - Is the window modal? """
-	which = 'pmod'
-	want = 'bool'
+    """modal - Is the window modal? """
+    which = 'pmod'
+    want = 'bool'
 class _Prop_name(aetools.NProperty):
-	"""name - the title of the window """
-	which = 'pnam'
-	want = 'itxt'
+    """name - the title of the window """
+    which = 'pnam'
+    want = 'itxt'
 class _Prop_position(aetools.NProperty):
-	"""position - upper left coordinates of window """
-	which = 'ppos'
-	want = 'QDpt'
+    """position - upper left coordinates of window """
+    which = 'ppos'
+    want = 'QDpt'
 class _Prop_resizable(aetools.NProperty):
-	"""resizable - Is the window resizable? """
-	which = 'prsz'
-	want = 'bool'
+    """resizable - Is the window resizable? """
+    which = 'prsz'
+    want = 'bool'
 class _Prop_titled(aetools.NProperty):
-	"""titled - Does the window have a title bar? """
-	which = 'ptit'
-	want = 'bool'
+    """titled - Does the window have a title bar? """
+    which = 'ptit'
+    want = 'bool'
 class _Prop_unique_ID(aetools.NProperty):
-	"""unique ID - Window\xd5s unique ID (a bridge between WWW! suite window id\xd5s and standard AE windows) """
-	which = 'wiid'
-	want = 'long'
+    """unique ID - Window\xd5s unique ID (a bridge between WWW! suite window id\xd5s and standard AE windows) """
+    which = 'wiid'
+    want = 'long'
 class _Prop_visible(aetools.NProperty):
-	"""visible - is the window visible? """
-	which = 'pvis'
-	want = 'bool'
+    """visible - is the window visible? """
+    which = 'pvis'
+    want = 'bool'
 class _Prop_zoomable(aetools.NProperty):
-	"""zoomable - Is the window zoomable? """
-	which = 'iszm'
-	want = 'bool'
+    """zoomable - Is the window zoomable? """
+    which = 'iszm'
+    want = 'bool'
 class _Prop_zoomed(aetools.NProperty):
-	"""zoomed - Is the window zoomed? """
-	which = 'pzum'
-	want = 'bool'
+    """zoomed - Is the window zoomed? """
+    which = 'pzum'
+    want = 'bool'
 application._superclassnames = []
 application._privpropdict = {
-	'alert_application' : _Prop_alert_application,
-	'kiosk_mode' : _Prop_kiosk_mode,
+    'alert_application' : _Prop_alert_application,
+    'kiosk_mode' : _Prop_kiosk_mode,
 }
 application._privelemdict = {
-	'window' : window,
+    'window' : window,
 }
 window._superclassnames = []
 window._privpropdict = {
-	'URL' : _Prop_URL,
-	'bounds' : _Prop_bounds,
-	'busy' : _Prop_busy,
-	'closeable' : _Prop_closeable,
-	'floating' : _Prop_floating,
-	'index' : _Prop_index,
-	'modal' : _Prop_modal,
-	'name' : _Prop_name,
-	'position' : _Prop_position,
-	'resizable' : _Prop_resizable,
-	'titled' : _Prop_titled,
-	'unique_ID' : _Prop_unique_ID,
-	'visible' : _Prop_visible,
-	'zoomable' : _Prop_zoomable,
-	'zoomed' : _Prop_zoomed,
+    'URL' : _Prop_URL,
+    'bounds' : _Prop_bounds,
+    'busy' : _Prop_busy,
+    'closeable' : _Prop_closeable,
+    'floating' : _Prop_floating,
+    'index' : _Prop_index,
+    'modal' : _Prop_modal,
+    'name' : _Prop_name,
+    'position' : _Prop_position,
+    'resizable' : _Prop_resizable,
+    'titled' : _Prop_titled,
+    'unique_ID' : _Prop_unique_ID,
+    'visible' : _Prop_visible,
+    'zoomable' : _Prop_zoomable,
+    'zoomed' : _Prop_zoomed,
 }
 window._privelemdict = {
 }
@@ -210,6 +210,32 @@ window._privelemdict = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'capp' : application,
-	'cwin' : window,
+    'capp' : application,
+    'cwin' : window,
+}
+
+_propdeclarations = {
+    'ALAP' : _Prop_alert_application,
+    'KOSK' : _Prop_kiosk_mode,
+    'busy' : _Prop_busy,
+    'curl' : _Prop_URL,
+    'hclb' : _Prop_closeable,
+    'isfl' : _Prop_floating,
+    'iszm' : _Prop_zoomable,
+    'pbnd' : _Prop_bounds,
+    'pidx' : _Prop_index,
+    'pmod' : _Prop_modal,
+    'pnam' : _Prop_name,
+    'ppos' : _Prop_position,
+    'prsz' : _Prop_resizable,
+    'ptit' : _Prop_titled,
+    'pvis' : _Prop_visible,
+    'pzum' : _Prop_zoomed,
+    'wiid' : _Prop_unique_ID,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
 }
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 aca22b4..29ab6da 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_URL_suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/Standard_URL_suite.py
@@ -14,34 +14,34 @@ _code = 'GURL'
 
 class Standard_URL_suite_Events:
 
-	_argmap_GetURL = {
-		'to' : 'dest',
-		'inside' : 'HWIN',
-		'from_' : 'refe',
-	}
-
-	def GetURL(self, _object, _attributes={}, **_arguments):
-		"""GetURL: Loads the URL (optionally to disk)
-		Required argument: The url 
-		Keyword argument to: file the URL should be loaded into  
-		Keyword argument inside: Window the URL should be loaded to
-		Keyword argument from_: Referrer, to be sent with the HTTP request
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'GURL'
-		_subcode = 'GURL'
-
-		aetools.keysubst(_arguments, self._argmap_GetURL)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    _argmap_GetURL = {
+        'to' : 'dest',
+        'inside' : 'HWIN',
+        'from_' : 'refe',
+    }
+
+    def GetURL(self, _object, _attributes={}, **_arguments):
+        """GetURL: Loads the URL (optionally to disk)
+        Required argument: The url 
+        Keyword argument to: file the URL should be loaded into  
+        Keyword argument inside: Window the URL should be loaded to
+        Keyword argument from_: Referrer, to be sent with the HTTP request
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'GURL'
+        _subcode = 'GURL'
+
+        aetools.keysubst(_arguments, self._argmap_GetURL)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 #
@@ -49,3 +49,12 @@ class Standard_URL_suite_Events:
 #
 _classdeclarations = {
 }
+
+_propdeclarations = {
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+}
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/Text.py b/Lib/plat-mac/lib-scriptpackages/Netscape/Text.py
index 487c8db..70716f0 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/Text.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/Text.py
@@ -13,82 +13,82 @@ _code = 'TEXT'
 from StdSuites.Text_Suite import *
 class Text_Events(Text_Suite_Events):
 
-	pass
+    pass
 
 
 class text(aetools.ComponentItem):
-	"""text - independent text view objects """
-	want = 'ctxt'
+    """text - independent text view objects """
+    want = 'ctxt'
 class _Prop_beginning(aetools.NProperty):
-	"""beginning - Beginning of element """
-	which = 'bgng'
-	want = 'obj '
+    """beginning - Beginning of element """
+    which = 'bgng'
+    want = 'obj '
 class _Prop_end(aetools.NProperty):
-	"""end - Ending of element """
-	which = 'end '
-	want = 'obj '
+    """end - Ending of element """
+    which = 'end '
+    want = 'obj '
 class _Prop_infront(aetools.NProperty):
-	"""infront - Immediately before element """
-	which = 'pBef'
-	want = 'obj '
+    """infront - Immediately before element """
+    which = 'pBef'
+    want = 'obj '
 class _Prop_justbehind(aetools.NProperty):
-	"""justbehind - Immediately after element """
-	which = 'pAft'
-	want = 'obj '
+    """justbehind - Immediately after element """
+    which = 'pAft'
+    want = 'obj '
 class _Prop_updateLevel(aetools.NProperty):
-	"""updateLevel - updating level.  Can only be incremented or decremented.  Do so only in a try block -- if the level is greater than zero, visual text updating will cease. """
-	which = 'pUpL'
-	want = 'long'
+    """updateLevel - updating level.  Can only be incremented or decremented.  Do so only in a try block -- if the level is greater than zero, visual text updating will cease. """
+    which = 'pUpL'
+    want = 'long'
 #        element 'stys' as ['indx', 'name']
 
 class styleset(aetools.ComponentItem):
-	"""styleset - A style \xd2set\xd3 that may be used repeatedly in text objects. """
-	want = 'stys'
+    """styleset - A style \xd2set\xd3 that may be used repeatedly in text objects. """
+    want = 'stys'
 class _Prop_color(aetools.NProperty):
-	"""color - the color """
-	which = 'colr'
-	want = 'RGB '
+    """color - the color """
+    which = 'colr'
+    want = 'RGB '
 class _Prop_font(aetools.NProperty):
-	"""font - font name """
-	which = 'font'
-	want = 'TEXT'
+    """font - font name """
+    which = 'font'
+    want = 'TEXT'
 class _Prop_name(aetools.NProperty):
-	"""name - style name """
-	which = 'pnam'
-	want = 'TEXT'
+    """name - style name """
+    which = 'pnam'
+    want = 'TEXT'
 class _Prop_size(aetools.NProperty):
-	"""size - the size in points """
-	which = 'ptsz'
-	want = 'long'
+    """size - the size in points """
+    which = 'ptsz'
+    want = 'long'
 class _Prop_style(aetools.NProperty):
-	"""style - the text styles or face attributes """
-	which = 'txst'
-	want = 'tsty'
+    """style - the text styles or face attributes """
+    which = 'txst'
+    want = 'tsty'
 class _Prop_writing_code(aetools.NProperty):
-	"""writing code - the script system and language """
-	which = 'psct'
-	want = 'tsty'
+    """writing code - the script system and language """
+    which = 'psct'
+    want = 'tsty'
 
 stylesets = styleset
 text._superclassnames = []
 text._privpropdict = {
-	'beginning' : _Prop_beginning,
-	'end' : _Prop_end,
-	'infront' : _Prop_infront,
-	'justbehind' : _Prop_justbehind,
-	'updateLevel' : _Prop_updateLevel,
+    'beginning' : _Prop_beginning,
+    'end' : _Prop_end,
+    'infront' : _Prop_infront,
+    'justbehind' : _Prop_justbehind,
+    'updateLevel' : _Prop_updateLevel,
 }
 text._privelemdict = {
-	'styleset' : styleset,
+    'styleset' : styleset,
 }
 styleset._superclassnames = []
 styleset._privpropdict = {
-	'color' : _Prop_color,
-	'font' : _Prop_font,
-	'name' : _Prop_name,
-	'size' : _Prop_size,
-	'style' : _Prop_style,
-	'writing_code' : _Prop_writing_code,
+    'color' : _Prop_color,
+    'font' : _Prop_font,
+    'name' : _Prop_name,
+    'size' : _Prop_size,
+    'style' : _Prop_style,
+    'writing_code' : _Prop_writing_code,
 }
 styleset._privelemdict = {
 }
@@ -97,6 +97,26 @@ styleset._privelemdict = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'ctxt' : text,
-	'stys' : styleset,
+    'ctxt' : text,
+    'stys' : styleset,
+}
+
+_propdeclarations = {
+    'bgng' : _Prop_beginning,
+    'colr' : _Prop_color,
+    'end ' : _Prop_end,
+    'font' : _Prop_font,
+    'pAft' : _Prop_justbehind,
+    'pBef' : _Prop_infront,
+    'pUpL' : _Prop_updateLevel,
+    'pnam' : _Prop_name,
+    'psct' : _Prop_writing_code,
+    'ptsz' : _Prop_size,
+    'txst' : _Prop_style,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/WorldWideWeb_suite.py b/Lib/plat-mac/lib-scriptpackages/Netscape/WorldWideWeb_suite.py
index 9f032c3..062e39b 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/WorldWideWeb_suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/WorldWideWeb_suite.py
@@ -12,402 +12,402 @@ _code = 'WWW!'
 
 class WorldWideWeb_suite_Events:
 
-	_argmap_OpenURL = {
-		'to' : 'INTO',
-		'toWindow' : 'WIND',
-		'flags' : 'FLGS',
-		'post_data' : 'POST',
-		'post_type' : 'MIME',
-		'progressApp' : 'PROG',
-	}
-
-	def OpenURL(self, _object, _attributes={}, **_arguments):
-		"""OpenURL: Opens a URL. Allows for more options than GetURL event
-		Required argument: URL
-		Keyword argument to: file destination
-		Keyword argument toWindow: window iD
-		Keyword argument flags: Binary: any combination of 1, 2 and 4 is allowed: 1 and 2 mean force reload the document. 4 is ignored
-		Keyword argument post_data: Form posting data
-		Keyword argument post_type: MIME type of the posting data. Defaults to application/x-www-form-urlencoded
-		Keyword argument progressApp: Application that will display progress
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: ID of the loading window
-		"""
-		_code = 'WWW!'
-		_subcode = 'OURL'
-
-		aetools.keysubst(_arguments, self._argmap_OpenURL)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_ShowFile = {
-		'MIME_type' : 'MIME',
-		'Window_ID' : 'WIND',
-		'URL' : 'URL ',
-	}
-
-	def ShowFile(self, _object, _attributes={}, **_arguments):
-		"""ShowFile: Similar to OpenDocuments, except that it specifies the parent URL, and MIME type of the file
-		Required argument: File to open
-		Keyword argument MIME_type: MIME type
-		Keyword argument Window_ID: Window to open the file in
-		Keyword argument URL: Use this as a base URL
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Window ID of the loaded window. 0 means ShowFile failed, FFFFFFF means that data was not appropriate type to display in the browser.
-		"""
-		_code = 'WWW!'
-		_subcode = 'SHWF'
-
-		aetools.keysubst(_arguments, self._argmap_ShowFile)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_cancel_progress = {
-		'in_window' : 'WIND',
-	}
-
-	def cancel_progress(self, _object=None, _attributes={}, **_arguments):
-		"""cancel progress: Interrupts the download of the document in the given window
-		Required argument: progress ID, obtained from the progress app
-		Keyword argument in_window: window ID of the progress to cancel
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'WWW!'
-		_subcode = 'CNCL'
-
-		aetools.keysubst(_arguments, self._argmap_cancel_progress)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def find_URL(self, _object, _attributes={}, **_arguments):
-		"""find URL: If the file was downloaded by Netscape, you can call FindURL to find out the URL used to download the file.
-		Required argument: File spec
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: The URL
-		"""
-		_code = 'WWW!'
-		_subcode = 'FURL'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def get_window_info(self, _object=None, _attributes={}, **_arguments):
-		"""get window info: Returns the information about the window as a list. Currently the list contains the window title and the URL. You can get the same information using standard Apple Event GetProperty.
-		Required argument: window ID
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: undocumented, typecode 'list'
-		"""
-		_code = 'WWW!'
-		_subcode = 'WNFO'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def list_windows(self, _no_object=None, _attributes={}, **_arguments):
-		"""list windows: Lists the IDs of all the hypertext windows
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: List of unique IDs of all the hypertext windows
-		"""
-		_code = 'WWW!'
-		_subcode = 'LSTW'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_parse_anchor = {
-		'relative_to' : 'RELA',
-	}
-
-	def parse_anchor(self, _object, _attributes={}, **_arguments):
-		"""parse anchor: Resolves the relative URL
-		Required argument: Main URL
-		Keyword argument relative_to: Relative URL
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Parsed  URL
-		"""
-		_code = 'WWW!'
-		_subcode = 'PRSA'
-
-		aetools.keysubst(_arguments, self._argmap_parse_anchor)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def register_URL_echo(self, _object=None, _attributes={}, **_arguments):
-		"""register URL echo: Registers the \xd2echo\xd3 application. Each download from now on will be echoed to this application.
-		Required argument: Application signature
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'WWW!'
-		_subcode = 'RGUE'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_register_protocol = {
-		'for_protocol' : 'PROT',
-	}
-
-	def register_protocol(self, _object=None, _attributes={}, **_arguments):
-		"""register protocol: Registers application as a \xd2handler\xd3 for this protocol with a given prefix. The handler will receive \xd2OpenURL\xd3, or if that fails, \xd2GetURL\xd3 event.
-		Required argument: Application sig
-		Keyword argument for_protocol: protocol prefix: \xd2finger:\xd3, \xd2file\xd3,
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: TRUE if registration has been successful
-		"""
-		_code = 'WWW!'
-		_subcode = 'RGPR'
-
-		aetools.keysubst(_arguments, self._argmap_register_protocol)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_register_viewer = {
-		'MIME_type' : 'MIME',
-		'with_file_type' : 'FTYP',
-	}
-
-	def register_viewer(self, _object, _attributes={}, **_arguments):
-		"""register viewer: Registers an application as a \xd4special\xd5 viewer for this MIME type. The application will be launched with ViewDoc events
-		Required argument: Application sig
-		Keyword argument MIME_type: MIME type viewer is registering for
-		Keyword argument with_file_type: Mac file type for the downloaded files
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: TRUE if registration has been successful
-		"""
-		_code = 'WWW!'
-		_subcode = 'RGVW'
-
-		aetools.keysubst(_arguments, self._argmap_register_viewer)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_register_window_close = {
-		'for_window' : 'WIND',
-	}
-
-	def register_window_close(self, _object=None, _attributes={}, **_arguments):
-		"""register window close: Netscape will notify registered application when this window closes
-		Required argument: Application signature
-		Keyword argument for_window: window ID
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: true if successful
-		"""
-		_code = 'WWW!'
-		_subcode = 'RGWC'
-
-		aetools.keysubst(_arguments, self._argmap_register_window_close)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def unregister_URL_echo(self, _object, _attributes={}, **_arguments):
-		"""unregister URL echo: cancels URL echo
-		Required argument: application signature
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'WWW!'
-		_subcode = 'UNRU'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_unregister_protocol = {
-		'for_protocol' : 'PROT',
-	}
-
-	def unregister_protocol(self, _object=None, _attributes={}, **_arguments):
-		"""unregister protocol: reverses the effects of \xd2register protocol\xd3
-		Required argument: Application sig. 
-		Keyword argument for_protocol: protocol prefix. If none, unregister for all protocols
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: TRUE if successful
-		"""
-		_code = 'WWW!'
-		_subcode = 'UNRP'
-
-		aetools.keysubst(_arguments, self._argmap_unregister_protocol)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_unregister_viewer = {
-		'MIME_type' : 'MIME',
-	}
-
-	def unregister_viewer(self, _object, _attributes={}, **_arguments):
-		"""unregister viewer: Revert to the old way of handling this MIME type
-		Required argument: Application sig
-		Keyword argument MIME_type: MIME type to be unregistered
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: TRUE if the event was successful
-		"""
-		_code = 'WWW!'
-		_subcode = 'UNRV'
-
-		aetools.keysubst(_arguments, self._argmap_unregister_viewer)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_unregister_window_close = {
-		'for_window' : 'WIND',
-	}
-
-	def unregister_window_close(self, _object=None, _attributes={}, **_arguments):
-		"""unregister window close: Undo for register window close
-		Required argument: Application signature
-		Keyword argument for_window: window ID
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: true if successful
-		"""
-		_code = 'WWW!'
-		_subcode = 'UNRC'
-
-		aetools.keysubst(_arguments, self._argmap_unregister_window_close)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def webActivate(self, _object=None, _attributes={}, **_arguments):
-		"""webActivate: Makes Netscape the frontmost application, and selects a given window. This event is here for suite completeness/ cross-platform compatibility only, you should use standard AppleEvents instead.
-		Required argument: window to bring to front
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'WWW!'
-		_subcode = 'ACTV'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    _argmap_OpenURL = {
+        'to' : 'INTO',
+        'toWindow' : 'WIND',
+        'flags' : 'FLGS',
+        'post_data' : 'POST',
+        'post_type' : 'MIME',
+        'progressApp' : 'PROG',
+    }
+
+    def OpenURL(self, _object, _attributes={}, **_arguments):
+        """OpenURL: Opens a URL. Allows for more options than GetURL event
+        Required argument: URL
+        Keyword argument to: file destination
+        Keyword argument toWindow: window iD
+        Keyword argument flags: Binary: any combination of 1, 2 and 4 is allowed: 1 and 2 mean force reload the document. 4 is ignored
+        Keyword argument post_data: Form posting data
+        Keyword argument post_type: MIME type of the posting data. Defaults to application/x-www-form-urlencoded
+        Keyword argument progressApp: Application that will display progress
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: ID of the loading window
+        """
+        _code = 'WWW!'
+        _subcode = 'OURL'
+
+        aetools.keysubst(_arguments, self._argmap_OpenURL)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_ShowFile = {
+        'MIME_type' : 'MIME',
+        'Window_ID' : 'WIND',
+        'URL' : 'URL ',
+    }
+
+    def ShowFile(self, _object, _attributes={}, **_arguments):
+        """ShowFile: Similar to OpenDocuments, except that it specifies the parent URL, and MIME type of the file
+        Required argument: File to open
+        Keyword argument MIME_type: MIME type
+        Keyword argument Window_ID: Window to open the file in
+        Keyword argument URL: Use this as a base URL
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: Window ID of the loaded window. 0 means ShowFile failed, FFFFFFF means that data was not appropriate type to display in the browser.
+        """
+        _code = 'WWW!'
+        _subcode = 'SHWF'
+
+        aetools.keysubst(_arguments, self._argmap_ShowFile)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_cancel_progress = {
+        'in_window' : 'WIND',
+    }
+
+    def cancel_progress(self, _object=None, _attributes={}, **_arguments):
+        """cancel progress: Interrupts the download of the document in the given window
+        Required argument: progress ID, obtained from the progress app
+        Keyword argument in_window: window ID of the progress to cancel
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'WWW!'
+        _subcode = 'CNCL'
+
+        aetools.keysubst(_arguments, self._argmap_cancel_progress)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def find_URL(self, _object, _attributes={}, **_arguments):
+        """find URL: If the file was downloaded by Netscape, you can call FindURL to find out the URL used to download the file.
+        Required argument: File spec
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: The URL
+        """
+        _code = 'WWW!'
+        _subcode = 'FURL'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def get_window_info(self, _object=None, _attributes={}, **_arguments):
+        """get window info: Returns the information about the window as a list. Currently the list contains the window title and the URL. You can get the same information using standard Apple Event GetProperty.
+        Required argument: window ID
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: undocumented, typecode 'list'
+        """
+        _code = 'WWW!'
+        _subcode = 'WNFO'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def list_windows(self, _no_object=None, _attributes={}, **_arguments):
+        """list windows: Lists the IDs of all the hypertext windows
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: List of unique IDs of all the hypertext windows
+        """
+        _code = 'WWW!'
+        _subcode = 'LSTW'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_parse_anchor = {
+        'relative_to' : 'RELA',
+    }
+
+    def parse_anchor(self, _object, _attributes={}, **_arguments):
+        """parse anchor: Resolves the relative URL
+        Required argument: Main URL
+        Keyword argument relative_to: Relative URL
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: Parsed  URL
+        """
+        _code = 'WWW!'
+        _subcode = 'PRSA'
+
+        aetools.keysubst(_arguments, self._argmap_parse_anchor)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def register_URL_echo(self, _object=None, _attributes={}, **_arguments):
+        """register URL echo: Registers the \xd2echo\xd3 application. Each download from now on will be echoed to this application.
+        Required argument: Application signature
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'WWW!'
+        _subcode = 'RGUE'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_register_protocol = {
+        'for_protocol' : 'PROT',
+    }
+
+    def register_protocol(self, _object=None, _attributes={}, **_arguments):
+        """register protocol: Registers application as a \xd2handler\xd3 for this protocol with a given prefix. The handler will receive \xd2OpenURL\xd3, or if that fails, \xd2GetURL\xd3 event.
+        Required argument: Application sig
+        Keyword argument for_protocol: protocol prefix: \xd2finger:\xd3, \xd2file\xd3,
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: TRUE if registration has been successful
+        """
+        _code = 'WWW!'
+        _subcode = 'RGPR'
+
+        aetools.keysubst(_arguments, self._argmap_register_protocol)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_register_viewer = {
+        'MIME_type' : 'MIME',
+        'with_file_type' : 'FTYP',
+    }
+
+    def register_viewer(self, _object, _attributes={}, **_arguments):
+        """register viewer: Registers an application as a \xd4special\xd5 viewer for this MIME type. The application will be launched with ViewDoc events
+        Required argument: Application sig
+        Keyword argument MIME_type: MIME type viewer is registering for
+        Keyword argument with_file_type: Mac file type for the downloaded files
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: TRUE if registration has been successful
+        """
+        _code = 'WWW!'
+        _subcode = 'RGVW'
+
+        aetools.keysubst(_arguments, self._argmap_register_viewer)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_register_window_close = {
+        'for_window' : 'WIND',
+    }
+
+    def register_window_close(self, _object=None, _attributes={}, **_arguments):
+        """register window close: Netscape will notify registered application when this window closes
+        Required argument: Application signature
+        Keyword argument for_window: window ID
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: true if successful
+        """
+        _code = 'WWW!'
+        _subcode = 'RGWC'
+
+        aetools.keysubst(_arguments, self._argmap_register_window_close)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def unregister_URL_echo(self, _object, _attributes={}, **_arguments):
+        """unregister URL echo: cancels URL echo
+        Required argument: application signature
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'WWW!'
+        _subcode = 'UNRU'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_unregister_protocol = {
+        'for_protocol' : 'PROT',
+    }
+
+    def unregister_protocol(self, _object=None, _attributes={}, **_arguments):
+        """unregister protocol: reverses the effects of \xd2register protocol\xd3
+        Required argument: Application sig. 
+        Keyword argument for_protocol: protocol prefix. If none, unregister for all protocols
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: TRUE if successful
+        """
+        _code = 'WWW!'
+        _subcode = 'UNRP'
+
+        aetools.keysubst(_arguments, self._argmap_unregister_protocol)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_unregister_viewer = {
+        'MIME_type' : 'MIME',
+    }
+
+    def unregister_viewer(self, _object, _attributes={}, **_arguments):
+        """unregister viewer: Revert to the old way of handling this MIME type
+        Required argument: Application sig
+        Keyword argument MIME_type: MIME type to be unregistered
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: TRUE if the event was successful
+        """
+        _code = 'WWW!'
+        _subcode = 'UNRV'
+
+        aetools.keysubst(_arguments, self._argmap_unregister_viewer)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_unregister_window_close = {
+        'for_window' : 'WIND',
+    }
+
+    def unregister_window_close(self, _object=None, _attributes={}, **_arguments):
+        """unregister window close: Undo for register window close
+        Required argument: Application signature
+        Keyword argument for_window: window ID
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: true if successful
+        """
+        _code = 'WWW!'
+        _subcode = 'UNRC'
+
+        aetools.keysubst(_arguments, self._argmap_unregister_window_close)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def webActivate(self, _object=None, _attributes={}, **_arguments):
+        """webActivate: Makes Netscape the frontmost application, and selects a given window. This event is here for suite completeness/ cross-platform compatibility only, you should use standard AppleEvents instead.
+        Required argument: window to bring to front
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'WWW!'
+        _subcode = 'ACTV'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 #
@@ -415,3 +415,12 @@ class WorldWideWeb_suite_Events:
 #
 _classdeclarations = {
 }
+
+_propdeclarations = {
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+}
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py b/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
index 8a82216..4ab5de6 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
@@ -13,25 +13,25 @@ import Required_suite
 
 
 _code_to_module = {
-	'CoRe' : Standard_Suite,
-	'GURL' : Standard_URL_suite,
-	'MOSS' : Mozilla_suite,
-	'TEXT' : Text,
-	'WWW!' : WorldWideWeb_suite,
-	'ppnt' : PowerPlant,
-	'reqd' : Required_suite,
+    'CoRe' : Standard_Suite,
+    'GURL' : Standard_URL_suite,
+    'MOSS' : Mozilla_suite,
+    'TEXT' : Text,
+    'WWW!' : WorldWideWeb_suite,
+    'ppnt' : PowerPlant,
+    'reqd' : Required_suite,
 }
 
 
 
 _code_to_fullname = {
-	'CoRe' : ('Netscape.Standard_Suite', 'Standard_Suite'),
-	'GURL' : ('Netscape.Standard_URL_suite', 'Standard_URL_suite'),
-	'MOSS' : ('Netscape.Mozilla_suite', 'Mozilla_suite'),
-	'TEXT' : ('Netscape.Text', 'Text'),
-	'WWW!' : ('Netscape.WorldWideWeb_suite', 'WorldWideWeb_suite'),
-	'ppnt' : ('Netscape.PowerPlant', 'PowerPlant'),
-	'reqd' : ('Netscape.Required_suite', 'Required_suite'),
+    'CoRe' : ('Netscape.Standard_Suite', 'Standard_Suite'),
+    'GURL' : ('Netscape.Standard_URL_suite', 'Standard_URL_suite'),
+    'MOSS' : ('Netscape.Mozilla_suite', 'Mozilla_suite'),
+    'TEXT' : ('Netscape.Text', 'Text'),
+    'WWW!' : ('Netscape.WorldWideWeb_suite', 'WorldWideWeb_suite'),
+    'ppnt' : ('Netscape.PowerPlant', 'PowerPlant'),
+    'reqd' : ('Netscape.Required_suite', 'Required_suite'),
 }
 
 from Standard_Suite import *
@@ -43,16 +43,16 @@ from PowerPlant import *
 from Required_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', {}))
+    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
 
@@ -61,6 +61,8 @@ import StdSuites
 #
 getbaseclasses(window)
 getbaseclasses(application)
+getbaseclasses(text)
+getbaseclasses(styleset)
 getbaseclasses(StdSuites.Text_Suite.text_flow)
 getbaseclasses(StdSuites.Text_Suite.character)
 getbaseclasses(StdSuites.Text_Suite.text_style_info)
@@ -68,36 +70,34 @@ getbaseclasses(StdSuites.Text_Suite.line)
 getbaseclasses(StdSuites.Text_Suite.word)
 getbaseclasses(StdSuites.Text_Suite.paragraph)
 getbaseclasses(StdSuites.Text_Suite.text)
-getbaseclasses(text)
-getbaseclasses(styleset)
 
 #
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'cwin' : window,
-	'capp' : application,
-	'cflo' : StdSuites.Text_Suite.text_flow,
-	'cha ' : StdSuites.Text_Suite.character,
-	'tsty' : StdSuites.Text_Suite.text_style_info,
-	'clin' : StdSuites.Text_Suite.line,
-	'cwor' : StdSuites.Text_Suite.word,
-	'cpar' : StdSuites.Text_Suite.paragraph,
-	'ctxt' : StdSuites.Text_Suite.text,
-	'ctxt' : text,
-	'stys' : styleset,
+    'cwin' : window,
+    'capp' : application,
+    'ctxt' : text,
+    'stys' : styleset,
+    'cflo' : StdSuites.Text_Suite.text_flow,
+    'cha ' : StdSuites.Text_Suite.character,
+    'tsty' : StdSuites.Text_Suite.text_style_info,
+    'clin' : StdSuites.Text_Suite.line,
+    'cwor' : StdSuites.Text_Suite.word,
+    'cpar' : StdSuites.Text_Suite.paragraph,
+    'ctxt' : StdSuites.Text_Suite.text,
 }
 
 
 class Netscape(Standard_Suite_Events,
-		Standard_URL_suite_Events,
-		Mozilla_suite_Events,
-		Text_Events,
-		WorldWideWeb_suite_Events,
-		PowerPlant_Events,
-		Required_suite_Events,
-		aetools.TalkTo):
-	_signature = 'MOSS'
+        Standard_URL_suite_Events,
+        Mozilla_suite_Events,
+        Text_Events,
+        WorldWideWeb_suite_Events,
+        PowerPlant_Events,
+        Required_suite_Events,
+        aetools.TalkTo):
+    _signature = 'MOSS'
 
-	_moduleName = 'Netscape'
+    _moduleName = 'Netscape'
 
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py
index fffa39f..32b2238 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/AppleScript_Suite.py
@@ -12,1383 +12,1383 @@ _code = 'ascr'
 
 class AppleScript_Suite_Events:
 
-	def _26_(self, _object, _attributes={}, **_arguments):
-		"""&: Concatenation
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = 'ccat'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def _2a_(self, _object, _attributes={}, **_arguments):
-		"""*: Multiplication
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = '*   '
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def _2b_(self, _object, _attributes={}, **_arguments):
-		"""+: Addition
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = '+   '
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def _2d_(self, _object, _attributes={}, **_arguments):
-		"""-: Subtraction
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = '-   '
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def _3c_(self, _object, _attributes={}, **_arguments):
-		"""<: Less than
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = '<   '
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def _3d_(self, _object, _attributes={}, **_arguments):
-		"""=: Equality
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = '=   '
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def _3e_(self, _object, _attributes={}, **_arguments):
-		""">: Greater than
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = '>   '
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_Call_a5_subroutine = {
-		'at' : 'at  ',
-		'from_' : 'from',
-		'for_' : 'for ',
-		'to' : 'to  ',
-		'thru' : 'thru',
-		'through' : 'thgh',
-		'by' : 'by  ',
-		'on' : 'on  ',
-		'into' : 'into',
-		'onto' : 'onto',
-		'between' : 'btwn',
-		'against' : 'agst',
-		'out_of' : 'outo',
-		'instead_of' : 'isto',
-		'aside_from' : 'asdf',
-		'around' : 'arnd',
-		'beside' : 'bsid',
-		'beneath' : 'bnth',
-		'under' : 'undr',
-		'over' : 'over',
-		'above' : 'abve',
-		'below' : 'belw',
-		'apart_from' : 'aprt',
-		'about' : 'abou',
-		'since' : 'snce',
-		'given' : 'givn',
-		'with' : 'with',
-		'without' : 'wout',
-	}
-
-	def Call_a5_subroutine(self, _object=None, _attributes={}, **_arguments):
-		"""Call\xa5subroutine: A subroutine call
-		Required argument: anything
-		Keyword argument at: a preposition
-		Keyword argument from_: a preposition
-		Keyword argument for_: a preposition
-		Keyword argument to: a preposition
-		Keyword argument thru: a preposition
-		Keyword argument through: a preposition
-		Keyword argument by: a preposition
-		Keyword argument on: a preposition
-		Keyword argument into: a preposition
-		Keyword argument onto: a preposition
-		Keyword argument between: a preposition
-		Keyword argument against: a preposition
-		Keyword argument out_of: a preposition
-		Keyword argument instead_of: a preposition
-		Keyword argument aside_from: a preposition
-		Keyword argument around: a preposition
-		Keyword argument beside: a preposition
-		Keyword argument beneath: a preposition
-		Keyword argument under: a preposition
-		Keyword argument over: a preposition
-		Keyword argument above: a preposition
-		Keyword argument below: a preposition
-		Keyword argument apart_from: a preposition
-		Keyword argument about: a preposition
-		Keyword argument since: a preposition
-		Keyword argument given: parameter:value pairs, comma-separated
-		Keyword argument with: formal parameter set to true if matching actual parameter is provided
-		Keyword argument without: formal parameter set to false if matching actual parmeter is provided
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = 'psbr'
-
-		aetools.keysubst(_arguments, self._argmap_Call_a5_subroutine)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def _5e_(self, _object, _attributes={}, **_arguments):
-		"""^: Exponentiation
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = '^   '
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def activate(self, _no_object=None, _attributes={}, **_arguments):
-		"""activate: Bring the targeted application program to the front
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'misc'
-		_subcode = 'actv'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def and_(self, _object, _attributes={}, **_arguments):
-		"""and: Logical conjunction
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = 'AND '
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def as(self, _object, _attributes={}, **_arguments):
-		"""as: Coercion
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = 'coer'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def contains(self, _object, _attributes={}, **_arguments):
-		"""contains: Containment
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = 'cont'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def div(self, _object, _attributes={}, **_arguments):
-		"""div: Quotient
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = 'div '
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def end_tell(self, _no_object=None, _attributes={}, **_arguments):
-		"""end tell: Record or log an \xd4end tell\xd5 statement
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'ascr'
-		_subcode = 'tend'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def ends_with(self, _object, _attributes={}, **_arguments):
-		"""ends with: Ends with
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = 'ends'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_error = {
-		'number' : 'errn',
-		'partial_result' : 'ptlr',
-		'from_' : 'erob',
-		'to' : 'errt',
-	}
-
-	def error(self, _object=None, _attributes={}, **_arguments):
-		"""error: Raise an error
-		Required argument: anything
-		Keyword argument number: an error number
-		Keyword argument partial_result: any partial result occurring before the error
-		Keyword argument from_: the object that caused the error
-		Keyword argument to: the desired class for a failed coercion
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'ascr'
-		_subcode = 'err '
-
-		aetools.keysubst(_arguments, self._argmap_error)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def idle(self, _no_object=None, _attributes={}, **_arguments):
-		"""idle: Sent to a script application when it is idle
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the number of seconds to wait for next idle event
-		"""
-		_code = 'misc'
-		_subcode = 'idle'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def launch(self, _no_object=None, _attributes={}, **_arguments):
-		"""launch: Start an application for scripting
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'ascr'
-		_subcode = 'noop'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def log(self, _object, _attributes={}, **_arguments):
-		"""log: Cause a comment to be logged
-		Required argument: undocumented, typecode 'TEXT'
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'ascr'
-		_subcode = 'cmnt'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def mod(self, _object, _attributes={}, **_arguments):
-		"""mod: Remainder
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = 'mod '
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def negate(self, _object, _attributes={}, **_arguments):
-		"""negate: Numeric negation
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = 'neg '
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def not_(self, _object, _attributes={}, **_arguments):
-		"""not: Logical negation
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = 'NOT '
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def or_(self, _object, _attributes={}, **_arguments):
-		"""or: Logical disjunction
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = 'OR  '
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def start_log(self, _no_object=None, _attributes={}, **_arguments):
-		"""start log: Start event logging in the script editor
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'ToyS'
-		_subcode = 'log1'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def starts_with(self, _object, _attributes={}, **_arguments):
-		"""starts with: Starts with
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = 'bgwt'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def stop_log(self, _no_object=None, _attributes={}, **_arguments):
-		"""stop log: Stop event logging in the script editor
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'ToyS'
-		_subcode = 'log0'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def tell(self, _no_object=None, _attributes={}, **_arguments):
-		"""tell: Record or log a \xd4tell\xd5 statement
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'ascr'
-		_subcode = 'tell'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def _ad_(self, _object, _attributes={}, **_arguments):
-		"""\xad: Inequality
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = '\xad   '
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def _b2_(self, _object, _attributes={}, **_arguments):
-		"""\xb2: Less than or equal to
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = '<=  '
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def _b3_(self, _object, _attributes={}, **_arguments):
-		"""\xb3: Greater than or equal to
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = '>=  '
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def _d6_(self, _object, _attributes={}, **_arguments):
-		"""\xd6: Division
-		Required argument: an AE object reference
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: anything
-		"""
-		_code = 'ascr'
-		_subcode = '/   '
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    def _26_(self, _object, _attributes={}, **_arguments):
+        """&: Concatenation
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = 'ccat'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def _2a_(self, _object, _attributes={}, **_arguments):
+        """*: Multiplication
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = '*   '
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def _2b_(self, _object, _attributes={}, **_arguments):
+        """+: Addition
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = '+   '
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def _2d_(self, _object, _attributes={}, **_arguments):
+        """-: Subtraction
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = '-   '
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def _3c_(self, _object, _attributes={}, **_arguments):
+        """<: Less than
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = '<   '
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def _3d_(self, _object, _attributes={}, **_arguments):
+        """=: Equality
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = '=   '
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def _3e_(self, _object, _attributes={}, **_arguments):
+        """>: Greater than
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = '>   '
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_Call_a5_subroutine = {
+        'at' : 'at  ',
+        'from_' : 'from',
+        'for_' : 'for ',
+        'to' : 'to  ',
+        'thru' : 'thru',
+        'through' : 'thgh',
+        'by' : 'by  ',
+        'on' : 'on  ',
+        'into' : 'into',
+        'onto' : 'onto',
+        'between' : 'btwn',
+        'against' : 'agst',
+        'out_of' : 'outo',
+        'instead_of' : 'isto',
+        'aside_from' : 'asdf',
+        'around' : 'arnd',
+        'beside' : 'bsid',
+        'beneath' : 'bnth',
+        'under' : 'undr',
+        'over' : 'over',
+        'above' : 'abve',
+        'below' : 'belw',
+        'apart_from' : 'aprt',
+        'about' : 'abou',
+        'since' : 'snce',
+        'given' : 'givn',
+        'with' : 'with',
+        'without' : 'wout',
+    }
+
+    def Call_a5_subroutine(self, _object=None, _attributes={}, **_arguments):
+        """Call\xa5subroutine: A subroutine call
+        Required argument: anything
+        Keyword argument at: a preposition
+        Keyword argument from_: a preposition
+        Keyword argument for_: a preposition
+        Keyword argument to: a preposition
+        Keyword argument thru: a preposition
+        Keyword argument through: a preposition
+        Keyword argument by: a preposition
+        Keyword argument on: a preposition
+        Keyword argument into: a preposition
+        Keyword argument onto: a preposition
+        Keyword argument between: a preposition
+        Keyword argument against: a preposition
+        Keyword argument out_of: a preposition
+        Keyword argument instead_of: a preposition
+        Keyword argument aside_from: a preposition
+        Keyword argument around: a preposition
+        Keyword argument beside: a preposition
+        Keyword argument beneath: a preposition
+        Keyword argument under: a preposition
+        Keyword argument over: a preposition
+        Keyword argument above: a preposition
+        Keyword argument below: a preposition
+        Keyword argument apart_from: a preposition
+        Keyword argument about: a preposition
+        Keyword argument since: a preposition
+        Keyword argument given: parameter:value pairs, comma-separated
+        Keyword argument with: formal parameter set to true if matching actual parameter is provided
+        Keyword argument without: formal parameter set to false if matching actual parmeter is provided
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = 'psbr'
+
+        aetools.keysubst(_arguments, self._argmap_Call_a5_subroutine)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def _5e_(self, _object, _attributes={}, **_arguments):
+        """^: Exponentiation
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = '^   '
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def activate(self, _no_object=None, _attributes={}, **_arguments):
+        """activate: Bring the targeted application program to the front
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'misc'
+        _subcode = 'actv'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def and_(self, _object, _attributes={}, **_arguments):
+        """and: Logical conjunction
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = 'AND '
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def as(self, _object, _attributes={}, **_arguments):
+        """as: Coercion
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = 'coer'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def contains(self, _object, _attributes={}, **_arguments):
+        """contains: Containment
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = 'cont'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def div(self, _object, _attributes={}, **_arguments):
+        """div: Quotient
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = 'div '
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def end_tell(self, _no_object=None, _attributes={}, **_arguments):
+        """end tell: Record or log an \xd4end tell\xd5 statement
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'ascr'
+        _subcode = 'tend'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def ends_with(self, _object, _attributes={}, **_arguments):
+        """ends with: Ends with
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = 'ends'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_error = {
+        'number' : 'errn',
+        'partial_result' : 'ptlr',
+        'from_' : 'erob',
+        'to' : 'errt',
+    }
+
+    def error(self, _object=None, _attributes={}, **_arguments):
+        """error: Raise an error
+        Required argument: anything
+        Keyword argument number: an error number
+        Keyword argument partial_result: any partial result occurring before the error
+        Keyword argument from_: the object that caused the error
+        Keyword argument to: the desired class for a failed coercion
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'ascr'
+        _subcode = 'err '
+
+        aetools.keysubst(_arguments, self._argmap_error)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def idle(self, _no_object=None, _attributes={}, **_arguments):
+        """idle: Sent to a script application when it is idle
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the number of seconds to wait for next idle event
+        """
+        _code = 'misc'
+        _subcode = 'idle'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def launch(self, _no_object=None, _attributes={}, **_arguments):
+        """launch: Start an application for scripting
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'ascr'
+        _subcode = 'noop'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def log(self, _object, _attributes={}, **_arguments):
+        """log: Cause a comment to be logged
+        Required argument: undocumented, typecode 'TEXT'
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'ascr'
+        _subcode = 'cmnt'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def mod(self, _object, _attributes={}, **_arguments):
+        """mod: Remainder
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = 'mod '
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def negate(self, _object, _attributes={}, **_arguments):
+        """negate: Numeric negation
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = 'neg '
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def not_(self, _object, _attributes={}, **_arguments):
+        """not: Logical negation
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = 'NOT '
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def or_(self, _object, _attributes={}, **_arguments):
+        """or: Logical disjunction
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = 'OR  '
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def start_log(self, _no_object=None, _attributes={}, **_arguments):
+        """start log: Start event logging in the script editor
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'ToyS'
+        _subcode = 'log1'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def starts_with(self, _object, _attributes={}, **_arguments):
+        """starts with: Starts with
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = 'bgwt'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def stop_log(self, _no_object=None, _attributes={}, **_arguments):
+        """stop log: Stop event logging in the script editor
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'ToyS'
+        _subcode = 'log0'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def tell(self, _no_object=None, _attributes={}, **_arguments):
+        """tell: Record or log a \xd4tell\xd5 statement
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'ascr'
+        _subcode = 'tell'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def _ad_(self, _object, _attributes={}, **_arguments):
+        """\xad: Inequality
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = '\xad   '
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def _b2_(self, _object, _attributes={}, **_arguments):
+        """\xb2: Less than or equal to
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = '<=  '
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def _b3_(self, _object, _attributes={}, **_arguments):
+        """\xb3: Greater than or equal to
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = '>=  '
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def _d6_(self, _object, _attributes={}, **_arguments):
+        """\xd6: Division
+        Required argument: an AE object reference
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: anything
+        """
+        _code = 'ascr'
+        _subcode = '/   '
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 class anything(aetools.ComponentItem):
-	"""anything - any class or reference """
-	want = '****'
+    """anything - any class or reference """
+    want = '****'
 
 class pictures(aetools.ComponentItem):
-	"""pictures -  """
-	want = 'PICT'
+    """pictures -  """
+    want = 'PICT'
 
 picture = pictures
 
 class styled_text(aetools.ComponentItem):
-	"""styled text - text with font, size, and style information """
-	want = 'STXT'
+    """styled text - text with font, size, and style information """
+    want = 'STXT'
 
 styled_text = styled_text
 
 class strings(aetools.ComponentItem):
-	"""strings -  """
-	want = 'TEXT'
+    """strings -  """
+    want = 'TEXT'
 
 string = strings
 
 class aliases(aetools.ComponentItem):
-	"""aliases -  """
-	want = 'alis'
+    """aliases -  """
+    want = 'alis'
 
 alias = aliases
 
 class April(aetools.ComponentItem):
-	"""April - the month of April """
-	want = 'apr '
+    """April - the month of April """
+    want = 'apr '
 
 class August(aetools.ComponentItem):
-	"""August - the month of August """
-	want = 'aug '
+    """August - the month of August """
+    want = 'aug '
 
 class booleans(aetools.ComponentItem):
-	"""booleans -  """
-	want = 'bool'
+    """booleans -  """
+    want = 'bool'
 
 boolean = booleans
 
 class RGB_colors(aetools.ComponentItem):
-	"""RGB colors -  """
-	want = 'cRGB'
+    """RGB colors -  """
+    want = 'cRGB'
 
 RGB_color = RGB_colors
 
 class application(aetools.ComponentItem):
-	"""application - specifies global properties of AppleScript """
-	want = 'capp'
+    """application - specifies global properties of AppleScript """
+    want = 'capp'
 class _Prop_AppleScript(aetools.NProperty):
-	"""AppleScript - the top-level script object """
-	which = 'ascr'
-	want = 'scpt'
+    """AppleScript - the top-level script object """
+    which = 'ascr'
+    want = 'scpt'
 class _Prop_days(aetools.NProperty):
-	"""days - the number of seconds in a day """
-	which = 'days'
-	want = 'long'
+    """days - the number of seconds in a day """
+    which = 'days'
+    want = 'long'
 class _Prop_hours(aetools.NProperty):
-	"""hours - the number of seconds in an hour """
-	which = 'hour'
-	want = 'long'
+    """hours - the number of seconds in an hour """
+    which = 'hour'
+    want = 'long'
 class _Prop_minutes(aetools.NProperty):
-	"""minutes - the number of seconds in a minute """
-	which = 'min '
-	want = 'long'
+    """minutes - the number of seconds in a minute """
+    which = 'min '
+    want = 'long'
 class _Prop_pi(aetools.NProperty):
-	"""pi - the constant pi """
-	which = 'pi  '
-	want = 'doub'
+    """pi - the constant pi """
+    which = 'pi  '
+    want = 'doub'
 class _Prop_print_depth(aetools.NProperty):
-	"""print depth - the maximum depth to print """
-	which = 'prdp'
-	want = 'long'
+    """print depth - the maximum depth to print """
+    which = 'prdp'
+    want = 'long'
 class _Prop_print_length(aetools.NProperty):
-	"""print length - the maximum length to print """
-	which = 'prln'
-	want = 'long'
+    """print length - the maximum length to print """
+    which = 'prln'
+    want = 'long'
 class _Prop_result(aetools.NProperty):
-	"""result - the last result of evaluation """
-	which = 'rslt'
-	want = '****'
+    """result - the last result of evaluation """
+    which = 'rslt'
+    want = '****'
 class _Prop_return_(aetools.NProperty):
-	"""return - a return character """
-	which = 'ret '
-	want = 'cha '
+    """return - a return character """
+    which = 'ret '
+    want = 'cha '
 class _Prop_space(aetools.NProperty):
-	"""space - a space character """
-	which = 'spac'
-	want = 'cha '
+    """space - a space character """
+    which = 'spac'
+    want = 'cha '
 class _Prop_tab(aetools.NProperty):
-	"""tab - a tab character """
-	which = 'tab '
-	want = 'cha '
+    """tab - a tab character """
+    which = 'tab '
+    want = 'cha '
 class _Prop_text_item_delimiters(aetools.NProperty):
-	"""text item delimiters - the text item delimiters of a string """
-	which = 'txdl'
-	want = 'list'
+    """text item delimiters - the text item delimiters of a string """
+    which = 'txdl'
+    want = 'list'
 class _Prop_weeks(aetools.NProperty):
-	"""weeks - the number of seconds in a week """
-	which = 'week'
-	want = 'long'
+    """weeks - the number of seconds in a week """
+    which = 'week'
+    want = 'long'
 
 applications = application
 
 app = application
 
 class upper_case(aetools.ComponentItem):
-	"""upper case - Text with lower case converted to upper case """
-	want = 'case'
+    """upper case - Text with lower case converted to upper case """
+    want = 'case'
 
 class cubic_centimeters(aetools.ComponentItem):
-	"""cubic centimeters - a volume measurement in SI cubic centimeters """
-	want = 'ccmt'
+    """cubic centimeters - a volume measurement in SI cubic centimeters """
+    want = 'ccmt'
 
 cubic_centimetres = cubic_centimeters
 
 class cubic_feet(aetools.ComponentItem):
-	"""cubic feet - a volume measurement in Imperial cubic feet """
-	want = 'cfet'
+    """cubic feet - a volume measurement in Imperial cubic feet """
+    want = 'cfet'
 
 class characters(aetools.ComponentItem):
-	"""characters -  """
-	want = 'cha '
+    """characters -  """
+    want = 'cha '
 
 character = characters
 
 class writing_code_info(aetools.ComponentItem):
-	"""writing code info - script code and language code of text run """
-	want = 'citl'
+    """writing code info - script code and language code of text run """
+    want = 'citl'
 class _Prop_language_code(aetools.NProperty):
-	"""language code - the language code for the text """
-	which = 'plcd'
-	want = 'shor'
+    """language code - the language code for the text """
+    which = 'plcd'
+    want = 'shor'
 class _Prop_script_code(aetools.NProperty):
-	"""script code - the script code for the text """
-	which = 'pscd'
-	want = 'shor'
+    """script code - the script code for the text """
+    which = 'pscd'
+    want = 'shor'
 
 writing_code_infos = writing_code_info
 
 class text_items(aetools.ComponentItem):
-	"""text items -  """
-	want = 'citm'
+    """text items -  """
+    want = 'citm'
 
 text_item = text_items
 
 class cubic_meters(aetools.ComponentItem):
-	"""cubic meters - a volume measurement in SI cubic meters """
-	want = 'cmet'
+    """cubic meters - a volume measurement in SI cubic meters """
+    want = 'cmet'
 
 cubic_metres = cubic_meters
 
 class centimeters(aetools.ComponentItem):
-	"""centimeters - a distance measurement in SI centimeters """
-	want = 'cmtr'
+    """centimeters - a distance measurement in SI centimeters """
+    want = 'cmtr'
 
 centimetres = centimeters
 
 class item(aetools.ComponentItem):
-	"""item - An item of any type """
-	want = 'cobj'
+    """item - An item of any type """
+    want = 'cobj'
 class _Prop_id(aetools.NProperty):
-	"""id - the unique ID number of this object """
-	which = 'ID  '
-	want = 'long'
+    """id - the unique ID number of this object """
+    which = 'ID  '
+    want = 'long'
 
 items = item
 
 class C_strings(aetools.ComponentItem):
-	"""C strings -  """
-	want = 'cstr'
+    """C strings -  """
+    want = 'cstr'
 
 C_string = C_strings
 
 class text(aetools.ComponentItem):
-	"""text - text with language and style information """
-	want = 'ctxt'
+    """text - text with language and style information """
+    want = 'ctxt'
 
 class cubic_inches(aetools.ComponentItem):
-	"""cubic inches - a volume measurement in Imperial cubic inches """
-	want = 'cuin'
+    """cubic inches - a volume measurement in Imperial cubic inches """
+    want = 'cuin'
 
 class cubic_yards(aetools.ComponentItem):
-	"""cubic yards - a distance measurement in Imperial cubic yards """
-	want = 'cyrd'
+    """cubic yards - a distance measurement in Imperial cubic yards """
+    want = 'cyrd'
 
 class December(aetools.ComponentItem):
-	"""December - the month of December """
-	want = 'dec '
+    """December - the month of December """
+    want = 'dec '
 
 class degrees_Celsius(aetools.ComponentItem):
-	"""degrees Celsius - a temperature measurement in SI degrees Celsius """
-	want = 'degc'
+    """degrees Celsius - a temperature measurement in SI degrees Celsius """
+    want = 'degc'
 
 class degrees_Fahrenheit(aetools.ComponentItem):
-	"""degrees Fahrenheit - a temperature measurement in degrees Fahrenheit """
-	want = 'degf'
+    """degrees Fahrenheit - a temperature measurement in degrees Fahrenheit """
+    want = 'degf'
 
 class degrees_Kelvin(aetools.ComponentItem):
-	"""degrees Kelvin - a temperature measurement in degrees Kelvin """
-	want = 'degk'
+    """degrees Kelvin - a temperature measurement in degrees Kelvin """
+    want = 'degk'
 
 class reals(aetools.ComponentItem):
-	"""reals -  """
-	want = 'doub'
+    """reals -  """
+    want = 'doub'
 
 real = reals
 
 class encoded_strings(aetools.ComponentItem):
-	"""encoded strings -  """
-	want = 'encs'
+    """encoded strings -  """
+    want = 'encs'
 
 encoded_string = encoded_strings
 
 class constants(aetools.ComponentItem):
-	"""constants -  """
-	want = 'enum'
+    """constants -  """
+    want = 'enum'
 
 constant = constants
 
 class events(aetools.ComponentItem):
-	"""events -  """
-	want = 'evnt'
+    """events -  """
+    want = 'evnt'
 
 event = events
 
 class February(aetools.ComponentItem):
-	"""February - the month of February """
-	want = 'feb '
+    """February - the month of February """
+    want = 'feb '
 
 class feet(aetools.ComponentItem):
-	"""feet - a distance measurement in Imperial feet """
-	want = 'feet'
+    """feet - a distance measurement in Imperial feet """
+    want = 'feet'
 
 class Friday(aetools.ComponentItem):
-	"""Friday - Friday """
-	want = 'fri '
+    """Friday - Friday """
+    want = 'fri '
 
 class file_specifications(aetools.ComponentItem):
-	"""file specifications -  """
-	want = 'fss '
+    """file specifications -  """
+    want = 'fss '
 
 file_specification = file_specifications
 
 class gallons(aetools.ComponentItem):
-	"""gallons - a volume measurement in Imperial gallons """
-	want = 'galn'
+    """gallons - a volume measurement in Imperial gallons """
+    want = 'galn'
 
 class grams(aetools.ComponentItem):
-	"""grams - a mass measurement in SI meters """
-	want = 'gram'
+    """grams - a mass measurement in SI meters """
+    want = 'gram'
 
 class handlers(aetools.ComponentItem):
-	"""handlers -  """
-	want = 'hand'
+    """handlers -  """
+    want = 'hand'
 
 handler = handlers
 
 class inches(aetools.ComponentItem):
-	"""inches - a distance measurement in Imperial inches """
-	want = 'inch'
+    """inches - a distance measurement in Imperial inches """
+    want = 'inch'
 
 class international_text(aetools.ComponentItem):
-	"""international text - text that begins with a writing code """
-	want = 'itxt'
+    """international text - text that begins with a writing code """
+    want = 'itxt'
 
 international_text = international_text
 
 class January(aetools.ComponentItem):
-	"""January - the month of January """
-	want = 'jan '
+    """January - the month of January """
+    want = 'jan '
 
 class July(aetools.ComponentItem):
-	"""July - the month of July """
-	want = 'jul '
+    """July - the month of July """
+    want = 'jul '
 
 class June(aetools.ComponentItem):
-	"""June - the month of June """
-	want = 'jun '
+    """June - the month of June """
+    want = 'jun '
 
 class reference_forms(aetools.ComponentItem):
-	"""reference forms -  """
-	want = 'kfrm'
+    """reference forms -  """
+    want = 'kfrm'
 
 reference_form = reference_forms
 
 class kilograms(aetools.ComponentItem):
-	"""kilograms - a mass measurement in SI kilograms """
-	want = 'kgrm'
+    """kilograms - a mass measurement in SI kilograms """
+    want = 'kgrm'
 
 class kilometers(aetools.ComponentItem):
-	"""kilometers - a distance measurement in SI kilometers """
-	want = 'kmtr'
+    """kilometers - a distance measurement in SI kilometers """
+    want = 'kmtr'
 
 kilometres = kilometers
 
 class keystroke(aetools.ComponentItem):
-	"""keystroke - a press of a key combination on a Macintosh keyboard """
-	want = 'kprs'
+    """keystroke - a press of a key combination on a Macintosh keyboard """
+    want = 'kprs'
 class _Prop_key(aetools.NProperty):
-	"""key - the character for the key was pressed (ignoring modifiers) """
-	which = 'kMsg'
-	want = 'cha '
+    """key - the character for the key was pressed (ignoring modifiers) """
+    which = 'kMsg'
+    want = 'cha '
 class _Prop_key_kind(aetools.NProperty):
-	"""key kind - the kind of key that was pressed """
-	which = 'kknd'
-	want = 'ekst'
+    """key kind - the kind of key that was pressed """
+    which = 'kknd'
+    want = 'ekst'
 class _Prop_modifiers(aetools.NProperty):
-	"""modifiers - the modifier keys pressed in combination """
-	which = 'kMod'
-	want = 'eMds'
+    """modifiers - the modifier keys pressed in combination """
+    which = 'kMod'
+    want = 'eMds'
 
 keystrokes = keystroke
 
 class pounds(aetools.ComponentItem):
-	"""pounds - a weight measurement in SI meters """
-	want = 'lbs '
+    """pounds - a weight measurement in SI meters """
+    want = 'lbs '
 
 class date(aetools.ComponentItem):
-	"""date - Absolute date and time values """
-	want = 'ldt '
+    """date - Absolute date and time values """
+    want = 'ldt '
 class _Prop_date_string(aetools.NProperty):
-	"""date string - the date portion of a date-time value as text """
-	which = 'dstr'
-	want = 'TEXT'
+    """date string - the date portion of a date-time value as text """
+    which = 'dstr'
+    want = 'TEXT'
 class _Prop_day(aetools.NProperty):
-	"""day - the day of the month of a date """
-	which = 'day '
-	want = 'long'
+    """day - the day of the month of a date """
+    which = 'day '
+    want = 'long'
 class _Prop_month(aetools.NProperty):
-	"""month - the month of a date """
-	which = 'mnth'
-	want = 'mnth'
+    """month - the month of a date """
+    which = 'mnth'
+    want = 'mnth'
 class _Prop_time(aetools.NProperty):
-	"""time - the time since midnight of a date """
-	which = 'time'
-	want = 'long'
+    """time - the time since midnight of a date """
+    which = 'time'
+    want = 'long'
 class _Prop_time_string(aetools.NProperty):
-	"""time string - the time portion of a date-time value as text """
-	which = 'tstr'
-	want = 'TEXT'
+    """time string - the time portion of a date-time value as text """
+    which = 'tstr'
+    want = 'TEXT'
 class _Prop_weekday(aetools.NProperty):
-	"""weekday - the day of a week of a date """
-	which = 'wkdy'
-	want = 'wkdy'
+    """weekday - the day of a week of a date """
+    which = 'wkdy'
+    want = 'wkdy'
 class _Prop_year(aetools.NProperty):
-	"""year - the year of a date """
-	which = 'year'
-	want = 'long'
+    """year - the year of a date """
+    which = 'year'
+    want = 'long'
 
 dates = date
 
 class list(aetools.ComponentItem):
-	"""list - An ordered collection of items """
-	want = 'list'
+    """list - An ordered collection of items """
+    want = 'list'
 class _Prop_length(aetools.NProperty):
-	"""length - the length of a list """
-	which = 'leng'
-	want = 'long'
+    """length - the length of a list """
+    which = 'leng'
+    want = 'long'
 class _Prop_rest(aetools.NProperty):
-	"""rest - all items of the list excluding first """
-	which = 'rest'
-	want = 'list'
+    """rest - all items of the list excluding first """
+    which = 'rest'
+    want = 'list'
 class _Prop_reverse(aetools.NProperty):
-	"""reverse - the items of the list in reverse order """
-	which = 'rvse'
-	want = 'list'
+    """reverse - the items of the list in reverse order """
+    which = 'rvse'
+    want = 'list'
 
 lists = list
 
 class liters(aetools.ComponentItem):
-	"""liters - a volume measurement in SI liters """
-	want = 'litr'
+    """liters - a volume measurement in SI liters """
+    want = 'litr'
 
 litres = liters
 
 class linked_list(aetools.ComponentItem):
-	"""linked list - An ordered collection of items """
-	want = 'llst'
+    """linked list - An ordered collection of items """
+    want = 'llst'
 
 linked_lists = linked_list
 
 class integers(aetools.ComponentItem):
-	"""integers -  """
-	want = 'long'
+    """integers -  """
+    want = 'long'
 
 integer = integers
 
 class list_or_record(aetools.ComponentItem):
-	"""list or record - a list or record """
-	want = 'lr  '
+    """list or record - a list or record """
+    want = 'lr  '
 
 class list_2c__record_or_text(aetools.ComponentItem):
-	"""list, record or text - a list, record or text """
-	want = 'lrs '
+    """list, record or text - a list, record or text """
+    want = 'lrs '
 
 class list_or_string(aetools.ComponentItem):
-	"""list or string - a list or string """
-	want = 'ls  '
+    """list or string - a list or string """
+    want = 'ls  '
 
 class machines(aetools.ComponentItem):
-	"""machines -  """
-	want = 'mach'
+    """machines -  """
+    want = 'mach'
 
 machine = machines
 
 class March(aetools.ComponentItem):
-	"""March - the month of March """
-	want = 'mar '
+    """March - the month of March """
+    want = 'mar '
 
 class May(aetools.ComponentItem):
-	"""May - the month of May """
-	want = 'may '
+    """May - the month of May """
+    want = 'may '
 
 class meters(aetools.ComponentItem):
-	"""meters - a distance measurement in SI meters """
-	want = 'metr'
+    """meters - a distance measurement in SI meters """
+    want = 'metr'
 
 metres = meters
 
 class miles(aetools.ComponentItem):
-	"""miles - a distance measurement in Imperial miles """
-	want = 'mile'
+    """miles - a distance measurement in Imperial miles """
+    want = 'mile'
 
 class months(aetools.ComponentItem):
-	"""months -  """
-	want = 'mnth'
+    """months -  """
+    want = 'mnth'
 
 month = months
 
 class Monday(aetools.ComponentItem):
-	"""Monday - Monday """
-	want = 'mon '
+    """Monday - Monday """
+    want = 'mon '
 
 class missing_values(aetools.ComponentItem):
-	"""missing values -  """
-	want = 'msng'
+    """missing values -  """
+    want = 'msng'
 
 missing_value = missing_values
 
 class number_or_date(aetools.ComponentItem):
-	"""number or date - a number or date """
-	want = 'nd  '
+    """number or date - a number or date """
+    want = 'nd  '
 
 class number_2c__date_or_text(aetools.ComponentItem):
-	"""number, date or text - a number, date or text """
-	want = 'nds '
+    """number, date or text - a number, date or text """
+    want = 'nds '
 
 class numbers(aetools.ComponentItem):
-	"""numbers -  """
-	want = 'nmbr'
+    """numbers -  """
+    want = 'nmbr'
 
 number = numbers
 
 class November(aetools.ComponentItem):
-	"""November - the month of November """
-	want = 'nov '
+    """November - the month of November """
+    want = 'nov '
 
 class number_or_string(aetools.ComponentItem):
-	"""number or string - a number or string """
-	want = 'ns  '
+    """number or string - a number or string """
+    want = 'ns  '
 
 class references(aetools.ComponentItem):
-	"""references -  """
-	want = 'obj '
+    """references -  """
+    want = 'obj '
 
 reference = references
 
 class October(aetools.ComponentItem):
-	"""October - the month of October """
-	want = 'oct '
+    """October - the month of October """
+    want = 'oct '
 
 class ounces(aetools.ComponentItem):
-	"""ounces - a weight measurement in SI meters """
-	want = 'ozs '
+    """ounces - a weight measurement in SI meters """
+    want = 'ozs '
 
 class class_(aetools.ComponentItem):
-	"""class - the type of a value """
-	want = 'pcls'
+    """class - the type of a value """
+    want = 'pcls'
 class _Prop__3c_Inheritance_3e_(aetools.NProperty):
-	"""<Inheritance> - inherits some of its properties from this class """
-	which = 'c@#^'
-	want = 'type'
+    """<Inheritance> - inherits some of its properties from this class """
+    which = 'c@#^'
+    want = 'type'
 
 classes = class_
 
 class prepositions(aetools.ComponentItem):
-	"""prepositions -  """
-	want = 'prep'
+    """prepositions -  """
+    want = 'prep'
 
 preposition = prepositions
 
 class properties(aetools.ComponentItem):
-	"""properties -  """
-	want = 'prop'
+    """properties -  """
+    want = 'prop'
 
 property = properties
 
 class writing_code(aetools.ComponentItem):
-	"""writing code - codes that identify the language and script system """
-	want = 'psct'
+    """writing code - codes that identify the language and script system """
+    want = 'psct'
 
 class Pascal_strings(aetools.ComponentItem):
-	"""Pascal strings -  """
-	want = 'pstr'
+    """Pascal strings -  """
+    want = 'pstr'
 
 Pascal_string = Pascal_strings
 
 class quarts(aetools.ComponentItem):
-	"""quarts - a volume measurement in Imperial quarts """
-	want = 'qrts'
+    """quarts - a volume measurement in Imperial quarts """
+    want = 'qrts'
 
 class data(aetools.ComponentItem):
-	"""data - an AppleScript raw data object """
-	want = 'rdat'
+    """data - an AppleScript raw data object """
+    want = 'rdat'
 
 class records(aetools.ComponentItem):
-	"""records -  """
-	want = 'reco'
+    """records -  """
+    want = 'reco'
 
 record = records
 
 class Saturday(aetools.ComponentItem):
-	"""Saturday - Saturday """
-	want = 'sat '
+    """Saturday - Saturday """
+    want = 'sat '
 
 class seconds(aetools.ComponentItem):
-	"""seconds - more than one second """
-	want = 'scnd'
+    """seconds - more than one second """
+    want = 'scnd'
 
 class script(aetools.ComponentItem):
-	"""script - An AppleScript script """
-	want = 'scpt'
+    """script - An AppleScript script """
+    want = 'scpt'
 class _Prop_name(aetools.NProperty):
-	"""name - the name of the script """
-	which = 'pnam'
-	want = 'TEXT'
+    """name - the name of the script """
+    which = 'pnam'
+    want = 'TEXT'
 class _Prop_parent(aetools.NProperty):
-	"""parent - its parent, i.e. the script that will handle events that this script doesn\xd5t """
-	which = 'pare'
-	want = 'scpt'
+    """parent - its parent, i.e. the script that will handle events that this script doesn\xd5t """
+    which = 'pare'
+    want = 'scpt'
 
 scripts = script
 
 class September(aetools.ComponentItem):
-	"""September - the month of September """
-	want = 'sep '
+    """September - the month of September """
+    want = 'sep '
 
 class alias_or_string(aetools.ComponentItem):
-	"""alias or string - an alias or string """
-	want = 'sf  '
+    """alias or string - an alias or string """
+    want = 'sf  '
 
 class sounds(aetools.ComponentItem):
-	"""sounds -  """
-	want = 'snd '
+    """sounds -  """
+    want = 'snd '
 
 sound = sounds
 
 class square_feet(aetools.ComponentItem):
-	"""square feet - an area measurement in Imperial square feet """
-	want = 'sqft'
+    """square feet - an area measurement in Imperial square feet """
+    want = 'sqft'
 
 class square_kilometers(aetools.ComponentItem):
-	"""square kilometers - an area measurement in SI square kilometers """
-	want = 'sqkm'
+    """square kilometers - an area measurement in SI square kilometers """
+    want = 'sqkm'
 
 square_kilometres = square_kilometers
 
 class square_miles(aetools.ComponentItem):
-	"""square miles - an area measurement in Imperial square miles """
-	want = 'sqmi'
+    """square miles - an area measurement in Imperial square miles """
+    want = 'sqmi'
 
 class square_meters(aetools.ComponentItem):
-	"""square meters - an area measurement in SI square meters """
-	want = 'sqrm'
+    """square meters - an area measurement in SI square meters """
+    want = 'sqrm'
 
 square_metres = square_meters
 
 class square_yards(aetools.ComponentItem):
-	"""square yards - an area measurement in Imperial square yards """
-	want = 'sqyd'
+    """square yards - an area measurement in Imperial square yards """
+    want = 'sqyd'
 
 class styled_Clipboard_text(aetools.ComponentItem):
-	"""styled Clipboard text - clipboard text with font, size, and style information """
-	want = 'styl'
+    """styled Clipboard text - clipboard text with font, size, and style information """
+    want = 'styl'
 
 styled_Clipboard_text = styled_Clipboard_text
 
 class Sunday(aetools.ComponentItem):
-	"""Sunday - Sunday """
-	want = 'sun '
+    """Sunday - Sunday """
+    want = 'sun '
 
 class styled_Unicode_text(aetools.ComponentItem):
-	"""styled Unicode text - styled text in the Unicode format """
-	want = 'sutx'
+    """styled Unicode text - styled text in the Unicode format """
+    want = 'sutx'
 
 styled_Unicode_text = styled_Unicode_text
 
 class Thursday(aetools.ComponentItem):
-	"""Thursday - Thursday """
-	want = 'thu '
+    """Thursday - Thursday """
+    want = 'thu '
 
 class Tuesday(aetools.ComponentItem):
-	"""Tuesday - Tuesday """
-	want = 'tue '
+    """Tuesday - Tuesday """
+    want = 'tue '
 
 class type_class(aetools.ComponentItem):
-	"""type class - the name of a particular class (or any four-character code) """
-	want = 'type'
+    """type class - the name of a particular class (or any four-character code) """
+    want = 'type'
 
 class empty_ae_name_(aetools.ComponentItem):
-	""" - the undefined value """
-	want = 'undf'
+    """ - the undefined value """
+    want = 'undf'
 
 class Unicode_text(aetools.ComponentItem):
-	"""Unicode text - text in the Unicode format (cannot be viewed without conversion) """
-	want = 'utxt'
+    """Unicode text - text in the Unicode format (cannot be viewed without conversion) """
+    want = 'utxt'
 
 Unicode_text = Unicode_text
 
 class vector(aetools.ComponentItem):
-	"""vector - An ordered collection of items """
-	want = 'vect'
+    """vector - An ordered collection of items """
+    want = 'vect'
 
 vectors = vector
 
 class version(aetools.ComponentItem):
-	"""version - a version value """
-	want = 'vers'
+    """version - a version value """
+    want = 'vers'
 
 class Wednesday(aetools.ComponentItem):
-	"""Wednesday - Wednesday """
-	want = 'wed '
+    """Wednesday - Wednesday """
+    want = 'wed '
 
 class weekdays(aetools.ComponentItem):
-	"""weekdays -  """
-	want = 'wkdy'
+    """weekdays -  """
+    want = 'wkdy'
 
 weekday = weekdays
 
 class yards(aetools.ComponentItem):
-	"""yards - a distance measurement in Imperial yards """
-	want = 'yard'
+    """yards - a distance measurement in Imperial yards """
+    want = 'yard'
 
 class zones(aetools.ComponentItem):
-	"""zones -  """
-	want = 'zone'
+    """zones -  """
+    want = 'zone'
 
 zone = zones
 anything._superclassnames = []
@@ -1443,19 +1443,19 @@ RGB_colors._privelemdict = {
 }
 application._superclassnames = []
 application._privpropdict = {
-	'AppleScript' : _Prop_AppleScript,
-	'days' : _Prop_days,
-	'hours' : _Prop_hours,
-	'minutes' : _Prop_minutes,
-	'pi' : _Prop_pi,
-	'print_depth' : _Prop_print_depth,
-	'print_length' : _Prop_print_length,
-	'result' : _Prop_result,
-	'return_' : _Prop_return_,
-	'space' : _Prop_space,
-	'tab' : _Prop_tab,
-	'text_item_delimiters' : _Prop_text_item_delimiters,
-	'weeks' : _Prop_weeks,
+    'AppleScript' : _Prop_AppleScript,
+    'days' : _Prop_days,
+    'hours' : _Prop_hours,
+    'minutes' : _Prop_minutes,
+    'pi' : _Prop_pi,
+    'print_depth' : _Prop_print_depth,
+    'print_length' : _Prop_print_length,
+    'result' : _Prop_result,
+    'return_' : _Prop_return_,
+    'space' : _Prop_space,
+    'tab' : _Prop_tab,
+    'text_item_delimiters' : _Prop_text_item_delimiters,
+    'weeks' : _Prop_weeks,
 }
 application._privelemdict = {
 }
@@ -1481,8 +1481,8 @@ characters._privelemdict = {
 }
 writing_code_info._superclassnames = []
 writing_code_info._privpropdict = {
-	'language_code' : _Prop_language_code,
-	'script_code' : _Prop_script_code,
+    'language_code' : _Prop_language_code,
+    'script_code' : _Prop_script_code,
 }
 writing_code_info._privelemdict = {
 }
@@ -1503,7 +1503,7 @@ centimeters._privelemdict = {
 }
 item._superclassnames = []
 item._privpropdict = {
-	'id' : _Prop_id,
+    'id' : _Prop_id,
 }
 item._privelemdict = {
 }
@@ -1649,9 +1649,9 @@ kilometers._privelemdict = {
 }
 keystroke._superclassnames = []
 keystroke._privpropdict = {
-	'key' : _Prop_key,
-	'key_kind' : _Prop_key_kind,
-	'modifiers' : _Prop_modifiers,
+    'key' : _Prop_key,
+    'key_kind' : _Prop_key_kind,
+    'modifiers' : _Prop_modifiers,
 }
 keystroke._privelemdict = {
 }
@@ -1662,21 +1662,21 @@ pounds._privelemdict = {
 }
 date._superclassnames = []
 date._privpropdict = {
-	'date_string' : _Prop_date_string,
-	'day' : _Prop_day,
-	'month' : _Prop_month,
-	'time' : _Prop_time,
-	'time_string' : _Prop_time_string,
-	'weekday' : _Prop_weekday,
-	'year' : _Prop_year,
+    'date_string' : _Prop_date_string,
+    'day' : _Prop_day,
+    'month' : _Prop_month,
+    'time' : _Prop_time,
+    'time_string' : _Prop_time_string,
+    'weekday' : _Prop_weekday,
+    'year' : _Prop_year,
 }
 date._privelemdict = {
 }
 list._superclassnames = []
 list._privpropdict = {
-	'length' : _Prop_length,
-	'rest' : _Prop_rest,
-	'reverse' : _Prop_reverse,
+    'length' : _Prop_length,
+    'rest' : _Prop_rest,
+    'reverse' : _Prop_reverse,
 }
 list._privelemdict = {
 }
@@ -1687,7 +1687,7 @@ liters._privelemdict = {
 }
 linked_list._superclassnames = []
 linked_list._privpropdict = {
-	'length' : _Prop_length,
+    'length' : _Prop_length,
 }
 linked_list._privelemdict = {
 }
@@ -1793,7 +1793,7 @@ ounces._privelemdict = {
 }
 class_._superclassnames = ['type_class']
 class_._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 class_._privelemdict = {
 }
@@ -1844,8 +1844,8 @@ seconds._privelemdict = {
 }
 script._superclassnames = []
 script._privpropdict = {
-	'name' : _Prop_name,
-	'parent' : _Prop_parent,
+    'name' : _Prop_name,
+    'parent' : _Prop_parent,
 }
 script._privelemdict = {
 }
@@ -1946,7 +1946,7 @@ Unicode_text._privelemdict = {
 }
 vector._superclassnames = []
 vector._privpropdict = {
-	'length' : _Prop_length,
+    'length' : _Prop_length,
 }
 vector._privelemdict = {
 }
@@ -1976,64 +1976,64 @@ zones._privpropdict = {
 zones._privelemdict = {
 }
 _Enum_boov = {
-	'true' : 'true',	# the true boolean value
-	'false' : 'fals',	# the false boolean value
+    'true' : 'true',	# the true boolean value
+    'false' : 'fals',	# the false boolean value
 }
 
 _Enum_cons = {
-	'case' : 'case',	# case
-	'diacriticals' : 'diac',	# diacriticals
-	'white_space' : 'whit',	# white space
-	'hyphens' : 'hyph',	# hyphens
-	'expansion' : 'expa',	# expansion
-	'punctuation' : 'punc',	# punctuation
-	'application_responses' : 'rmte',	# remote event replies
+    'case' : 'case',	# case
+    'diacriticals' : 'diac',	# diacriticals
+    'white_space' : 'whit',	# white space
+    'hyphens' : 'hyph',	# hyphens
+    'expansion' : 'expa',	# expansion
+    'punctuation' : 'punc',	# punctuation
+    'application_responses' : 'rmte',	# remote event replies
 }
 
 _Enum_eMds = {
-	'option_down' : 'Kopt',	# 
-	'command_down' : 'Kcmd',	# 
-	'control_down' : 'Kctl',	# 
-	'shift_down' : 'Ksft',	# 
-	'caps_lock_down' : 'Kclk',	# 
+    'option_down' : 'Kopt',	# 
+    'command_down' : 'Kcmd',	# 
+    'control_down' : 'Kctl',	# 
+    'shift_down' : 'Ksft',	# 
+    'caps_lock_down' : 'Kclk',	# 
 }
 
 _Enum_ekst = {
-	'escape_key' : 'ks5\x00',	# 
-	'delete_key' : 'ks3\x00',	# 
-	'tab_key' : 'ks0\x00',	# 
-	'return_key' : 'ks$\x00',	# 
-	'clear_key' : 'ksG\x00',	# 
-	'enter_key' : 'ksL\x00',	# 
-	'up_arrow_key' : 'ks~\x00',	# 
-	'down_arrow_key' : 'ks}\x00',	# 
-	'left_arrow_key' : 'ks{\x00',	# 
-	'right_arrow_key' : 'ks|\x00',	# 
-	'help_key' : 'ksr\x00',	# 
-	'home_key' : 'kss\x00',	# 
-	'page_up_key' : 'kst\x00',	# 
-	'page_down_key' : 'ksy\x00',	# 
-	'forward_del_key' : 'ksu\x00',	# 
-	'end_key' : 'ksw\x00',	# 
-	'F1_key' : 'ksz\x00',	# 
-	'F2_key' : 'ksx\x00',	# 
-	'F3_key' : 'ksc\x00',	# 
-	'F4_key' : 'ksv\x00',	# 
-	'F5_key' : 'ks`\x00',	# 
-	'F6_key' : 'ksa\x00',	# 
-	'F7_key' : 'ksb\x00',	# 
-	'F8_key' : 'ksd\x00',	# 
-	'F9_key' : 'kse\x00',	# 
-	'F10_key' : 'ksm\x00',	# 
-	'F11_key' : 'ksg\x00',	# 
-	'F12_key' : 'kso\x00',	# 
-	'F13_key' : 'ksi\x00',	# 
-	'F14_key' : 'ksk\x00',	# 
-	'F15_key' : 'ksq\x00',	# 
+    'escape_key' : 'ks5\x00',	# 
+    'delete_key' : 'ks3\x00',	# 
+    'tab_key' : 'ks0\x00',	# 
+    'return_key' : 'ks$\x00',	# 
+    'clear_key' : 'ksG\x00',	# 
+    'enter_key' : 'ksL\x00',	# 
+    'up_arrow_key' : 'ks~\x00',	# 
+    'down_arrow_key' : 'ks}\x00',	# 
+    'left_arrow_key' : 'ks{\x00',	# 
+    'right_arrow_key' : 'ks|\x00',	# 
+    'help_key' : 'ksr\x00',	# 
+    'home_key' : 'kss\x00',	# 
+    'page_up_key' : 'kst\x00',	# 
+    'page_down_key' : 'ksy\x00',	# 
+    'forward_del_key' : 'ksu\x00',	# 
+    'end_key' : 'ksw\x00',	# 
+    'F1_key' : 'ksz\x00',	# 
+    'F2_key' : 'ksx\x00',	# 
+    'F3_key' : 'ksc\x00',	# 
+    'F4_key' : 'ksv\x00',	# 
+    'F5_key' : 'ks`\x00',	# 
+    'F6_key' : 'ksa\x00',	# 
+    'F7_key' : 'ksb\x00',	# 
+    'F8_key' : 'ksd\x00',	# 
+    'F9_key' : 'kse\x00',	# 
+    'F10_key' : 'ksm\x00',	# 
+    'F11_key' : 'ksg\x00',	# 
+    'F12_key' : 'kso\x00',	# 
+    'F13_key' : 'ksi\x00',	# 
+    'F14_key' : 'ksk\x00',	# 
+    'F15_key' : 'ksq\x00',	# 
 }
 
 _Enum_misc = {
-	'current_application' : 'cura',	# the current application
+    'current_application' : 'cura',	# the current application
 }
 
 
@@ -2041,109 +2041,155 @@ _Enum_misc = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'****' : anything,
-	'PICT' : pictures,
-	'STXT' : styled_text,
-	'TEXT' : strings,
-	'alis' : aliases,
-	'apr ' : April,
-	'aug ' : August,
-	'bool' : booleans,
-	'cRGB' : RGB_colors,
-	'capp' : application,
-	'case' : upper_case,
-	'ccmt' : cubic_centimeters,
-	'cfet' : cubic_feet,
-	'cha ' : characters,
-	'citl' : writing_code_info,
-	'citm' : text_items,
-	'cmet' : cubic_meters,
-	'cmtr' : centimeters,
-	'cobj' : item,
-	'cstr' : C_strings,
-	'ctxt' : text,
-	'cuin' : cubic_inches,
-	'cyrd' : cubic_yards,
-	'dec ' : December,
-	'degc' : degrees_Celsius,
-	'degf' : degrees_Fahrenheit,
-	'degk' : degrees_Kelvin,
-	'doub' : reals,
-	'encs' : encoded_strings,
-	'enum' : constants,
-	'evnt' : events,
-	'feb ' : February,
-	'feet' : feet,
-	'fri ' : Friday,
-	'fss ' : file_specifications,
-	'galn' : gallons,
-	'gram' : grams,
-	'hand' : handlers,
-	'inch' : inches,
-	'itxt' : international_text,
-	'jan ' : January,
-	'jul ' : July,
-	'jun ' : June,
-	'kfrm' : reference_forms,
-	'kgrm' : kilograms,
-	'kmtr' : kilometers,
-	'kprs' : keystroke,
-	'lbs ' : pounds,
-	'ldt ' : date,
-	'list' : list,
-	'litr' : liters,
-	'llst' : linked_list,
-	'long' : integers,
-	'lr  ' : list_or_record,
-	'lrs ' : list_2c__record_or_text,
-	'ls  ' : list_or_string,
-	'mach' : machines,
-	'mar ' : March,
-	'may ' : May,
-	'metr' : meters,
-	'mile' : miles,
-	'mnth' : months,
-	'mon ' : Monday,
-	'msng' : missing_values,
-	'nd  ' : number_or_date,
-	'nds ' : number_2c__date_or_text,
-	'nmbr' : numbers,
-	'nov ' : November,
-	'ns  ' : number_or_string,
-	'obj ' : references,
-	'oct ' : October,
-	'ozs ' : ounces,
-	'pcls' : class_,
-	'prep' : prepositions,
-	'prop' : properties,
-	'psct' : writing_code,
-	'pstr' : Pascal_strings,
-	'qrts' : quarts,
-	'rdat' : data,
-	'reco' : records,
-	'sat ' : Saturday,
-	'scnd' : seconds,
-	'scpt' : script,
-	'sep ' : September,
-	'sf  ' : alias_or_string,
-	'snd ' : sounds,
-	'sqft' : square_feet,
-	'sqkm' : square_kilometers,
-	'sqmi' : square_miles,
-	'sqrm' : square_meters,
-	'sqyd' : square_yards,
-	'styl' : styled_Clipboard_text,
-	'sun ' : Sunday,
-	'sutx' : styled_Unicode_text,
-	'thu ' : Thursday,
-	'tue ' : Tuesday,
-	'type' : type_class,
-	'undf' : empty_ae_name_,
-	'utxt' : Unicode_text,
-	'vect' : vector,
-	'vers' : version,
-	'wed ' : Wednesday,
-	'wkdy' : weekdays,
-	'yard' : yards,
-	'zone' : zones,
+    '****' : anything,
+    'PICT' : pictures,
+    'STXT' : styled_text,
+    'TEXT' : strings,
+    'alis' : aliases,
+    'apr ' : April,
+    'aug ' : August,
+    'bool' : booleans,
+    'cRGB' : RGB_colors,
+    'capp' : application,
+    'case' : upper_case,
+    'ccmt' : cubic_centimeters,
+    'cfet' : cubic_feet,
+    'cha ' : characters,
+    'citl' : writing_code_info,
+    'citm' : text_items,
+    'cmet' : cubic_meters,
+    'cmtr' : centimeters,
+    'cobj' : item,
+    'cstr' : C_strings,
+    'ctxt' : text,
+    'cuin' : cubic_inches,
+    'cyrd' : cubic_yards,
+    'dec ' : December,
+    'degc' : degrees_Celsius,
+    'degf' : degrees_Fahrenheit,
+    'degk' : degrees_Kelvin,
+    'doub' : reals,
+    'encs' : encoded_strings,
+    'enum' : constants,
+    'evnt' : events,
+    'feb ' : February,
+    'feet' : feet,
+    'fri ' : Friday,
+    'fss ' : file_specifications,
+    'galn' : gallons,
+    'gram' : grams,
+    'hand' : handlers,
+    'inch' : inches,
+    'itxt' : international_text,
+    'jan ' : January,
+    'jul ' : July,
+    'jun ' : June,
+    'kfrm' : reference_forms,
+    'kgrm' : kilograms,
+    'kmtr' : kilometers,
+    'kprs' : keystroke,
+    'lbs ' : pounds,
+    'ldt ' : date,
+    'list' : list,
+    'litr' : liters,
+    'llst' : linked_list,
+    'long' : integers,
+    'lr  ' : list_or_record,
+    'lrs ' : list_2c__record_or_text,
+    'ls  ' : list_or_string,
+    'mach' : machines,
+    'mar ' : March,
+    'may ' : May,
+    'metr' : meters,
+    'mile' : miles,
+    'mnth' : months,
+    'mon ' : Monday,
+    'msng' : missing_values,
+    'nd  ' : number_or_date,
+    'nds ' : number_2c__date_or_text,
+    'nmbr' : numbers,
+    'nov ' : November,
+    'ns  ' : number_or_string,
+    'obj ' : references,
+    'oct ' : October,
+    'ozs ' : ounces,
+    'pcls' : class_,
+    'prep' : prepositions,
+    'prop' : properties,
+    'psct' : writing_code,
+    'pstr' : Pascal_strings,
+    'qrts' : quarts,
+    'rdat' : data,
+    'reco' : records,
+    'sat ' : Saturday,
+    'scnd' : seconds,
+    'scpt' : script,
+    'sep ' : September,
+    'sf  ' : alias_or_string,
+    'snd ' : sounds,
+    'sqft' : square_feet,
+    'sqkm' : square_kilometers,
+    'sqmi' : square_miles,
+    'sqrm' : square_meters,
+    'sqyd' : square_yards,
+    'styl' : styled_Clipboard_text,
+    'sun ' : Sunday,
+    'sutx' : styled_Unicode_text,
+    'thu ' : Thursday,
+    'tue ' : Tuesday,
+    'type' : type_class,
+    'undf' : empty_ae_name_,
+    'utxt' : Unicode_text,
+    'vect' : vector,
+    'vers' : version,
+    'wed ' : Wednesday,
+    'wkdy' : weekdays,
+    'yard' : yards,
+    'zone' : zones,
+}
+
+_propdeclarations = {
+    'ID  ' : _Prop_id,
+    'ascr' : _Prop_AppleScript,
+    'c@#^' : _Prop__3c_Inheritance_3e_,
+    'day ' : _Prop_day,
+    'days' : _Prop_days,
+    'dstr' : _Prop_date_string,
+    'hour' : _Prop_hours,
+    'kMod' : _Prop_modifiers,
+    'kMsg' : _Prop_key,
+    'kknd' : _Prop_key_kind,
+    'leng' : _Prop_length,
+    'min ' : _Prop_minutes,
+    'mnth' : _Prop_month,
+    'pare' : _Prop_parent,
+    'pi  ' : _Prop_pi,
+    'plcd' : _Prop_language_code,
+    'pnam' : _Prop_name,
+    'prdp' : _Prop_print_depth,
+    'prln' : _Prop_print_length,
+    'pscd' : _Prop_script_code,
+    'rest' : _Prop_rest,
+    'ret ' : _Prop_return_,
+    'rslt' : _Prop_result,
+    'rvse' : _Prop_reverse,
+    'spac' : _Prop_space,
+    'tab ' : _Prop_tab,
+    'time' : _Prop_time,
+    'tstr' : _Prop_time_string,
+    'txdl' : _Prop_text_item_delimiters,
+    'week' : _Prop_weeks,
+    'wkdy' : _Prop_weekday,
+    'year' : _Prop_year,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+    'boov' : _Enum_boov,
+    'cons' : _Enum_cons,
+    'eMds' : _Enum_eMds,
+    'ekst' : _Enum_ekst,
+    'misc' : _Enum_misc,
 }
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 c78079c..c61a56b 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Macintosh_Connectivity_Clas.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Macintosh_Connectivity_Clas.py
@@ -12,315 +12,315 @@ _code = 'macc'
 
 class Macintosh_Connectivity_Clas_Events:
 
-	pass
+    pass
 
 
 class ADB_address(aetools.ComponentItem):
-	"""ADB address - Addresses a device connected via Apple Desktop Bus """
-	want = 'cadb'
+    """ADB address - Addresses a device connected via Apple Desktop Bus """
+    want = 'cadb'
 class _Prop__3c_inheritance_3e_(aetools.NProperty):
-	"""<inheritance> - inherits some of its properties from this class """
-	which = 'c@#^'
-	want = 'cadr'
+    """<inheritance> - inherits some of its properties from this class """
+    which = 'c@#^'
+    want = 'cadr'
 class _Prop_ID(aetools.NProperty):
-	"""ID - the Apple Desktop Bus device ID """
-	which = 'ID  '
-	want = 'shor'
+    """ID - the Apple Desktop Bus device ID """
+    which = 'ID  '
+    want = 'shor'
 
 ADB_addresses = ADB_address
 
 class address_specification(aetools.ComponentItem):
-	"""address specification - Unique designation of a device or service connected to this computer """
-	want = 'cadr'
+    """address specification - Unique designation of a device or service connected to this computer """
+    want = 'cadr'
 class _Prop_conduit(aetools.NProperty):
-	"""conduit - How the addressee is physically connected """
-	which = 'pcon'
-	want = 'econ'
+    """conduit - How the addressee is physically connected """
+    which = 'pcon'
+    want = 'econ'
 class _Prop_properties(aetools.NProperty):
-	"""properties - property that allows getting and setting of multiple properties """
-	which = 'pALL'
-	want = 'reco'
+    """properties - property that allows getting and setting of multiple properties """
+    which = 'pALL'
+    want = 'reco'
 class _Prop_protocol(aetools.NProperty):
-	"""protocol - How to talk to this addressee """
-	which = 'pprt'
-	want = 'epro'
+    """protocol - How to talk to this addressee """
+    which = 'pprt'
+    want = 'epro'
 
 address_specifications = address_specification
 
 class AppleTalk_address(aetools.ComponentItem):
-	"""AppleTalk address - Addresses a device or service connected via the AppleTalk protocol """
-	want = 'cat '
+    """AppleTalk address - Addresses a device or service connected via the AppleTalk protocol """
+    want = 'cat '
 class _Prop_AppleTalk_machine(aetools.NProperty):
-	"""AppleTalk machine - the machine name part of the address """
-	which = 'patm'
-	want = 'TEXT'
+    """AppleTalk machine - the machine name part of the address """
+    which = 'patm'
+    want = 'TEXT'
 class _Prop_AppleTalk_type(aetools.NProperty):
-	"""AppleTalk type - the type part of the AppleTalk address """
-	which = 'patt'
-	want = 'TEXT'
+    """AppleTalk type - the type part of the AppleTalk address """
+    which = 'patt'
+    want = 'TEXT'
 class _Prop_AppleTalk_zone(aetools.NProperty):
-	"""AppleTalk zone - the zone part of the address """
-	which = 'patz'
-	want = 'TEXT'
+    """AppleTalk zone - the zone part of the address """
+    which = 'patz'
+    want = 'TEXT'
 
 AppleTalk_addresses = AppleTalk_address
 
 class bus_slot(aetools.ComponentItem):
-	"""bus slot - Addresses a PC, PCI, or NuBus card """
-	want = 'cbus'
+    """bus slot - Addresses a PC, PCI, or NuBus card """
+    want = 'cbus'
 
 bus_slots = bus_slot
 
 class device_specification(aetools.ComponentItem):
-	"""device specification - A device connected to a computer """
-	want = 'cdev'
+    """device specification - A device connected to a computer """
+    want = 'cdev'
 class _Prop_device_address(aetools.NProperty):
-	"""device address - the address of the device """
-	which = 'pdva'
-	want = 'cadr'
+    """device address - the address of the device """
+    which = 'pdva'
+    want = 'cadr'
 class _Prop_device_type(aetools.NProperty):
-	"""device type - the kind of device """
-	which = 'pdvt'
-	want = 'edvt'
+    """device type - the kind of device """
+    which = 'pdvt'
+    want = 'edvt'
 
 device_specifications = device_specification
 
 class Ethernet_address(aetools.ComponentItem):
-	"""Ethernet address - Addresses a device by its Ethernet address """
-	want = 'cen '
+    """Ethernet address - Addresses a device by its Ethernet address """
+    want = 'cen '
 
 Ethernet_addresses = Ethernet_address
 
 class FireWire_address(aetools.ComponentItem):
-	"""FireWire address - Addresses a device on the FireWire bus """
-	want = 'cfw '
+    """FireWire address - Addresses a device on the FireWire bus """
+    want = 'cfw '
 
 FireWire_addresses = FireWire_address
 
 class IP_address(aetools.ComponentItem):
-	"""IP address - Addresses a device or service via the Internet Protocol (IP) """
-	want = 'cip '
+    """IP address - Addresses a device or service via the Internet Protocol (IP) """
+    want = 'cip '
 class _Prop_DNS_form(aetools.NProperty):
-	"""DNS form - the address in the form "apple.com" """
-	which = 'pdns'
-	want = 'TEXT'
+    """DNS form - the address in the form "apple.com" """
+    which = 'pdns'
+    want = 'TEXT'
 class _Prop_port(aetools.NProperty):
-	"""port - the port number of the service or client being addressed """
-	which = 'ppor'
-	want = 'TEXT'
+    """port - the port number of the service or client being addressed """
+    which = 'ppor'
+    want = 'TEXT'
 
 IP_addresses = IP_address
 
 class LocalTalk_address(aetools.ComponentItem):
-	"""LocalTalk address - Addresses a device by its LocalTalk address """
-	want = 'clt '
+    """LocalTalk address - Addresses a device by its LocalTalk address """
+    want = 'clt '
 class _Prop_network(aetools.NProperty):
-	"""network - the LocalTalk network number """
-	which = 'pnet'
-	want = 'shor'
+    """network - the LocalTalk network number """
+    which = 'pnet'
+    want = 'shor'
 class _Prop_node(aetools.NProperty):
-	"""node - the LocalTalk node number """
-	which = 'pnod'
-	want = 'shor'
+    """node - the LocalTalk node number """
+    which = 'pnod'
+    want = 'shor'
 class _Prop_socket(aetools.NProperty):
-	"""socket - the LocalTalk socket number """
-	which = 'psoc'
-	want = 'shor'
+    """socket - the LocalTalk socket number """
+    which = 'psoc'
+    want = 'shor'
 
 LocalTalk_addresses = LocalTalk_address
 
 class SCSI_address(aetools.ComponentItem):
-	"""SCSI address - Addresses a SCSI device """
-	want = 'cscs'
+    """SCSI address - Addresses a SCSI device """
+    want = 'cscs'
 class _Prop_LUN(aetools.NProperty):
-	"""LUN - the SCSI logical unit number """
-	which = 'pslu'
-	want = 'shor'
+    """LUN - the SCSI logical unit number """
+    which = 'pslu'
+    want = 'shor'
 class _Prop_SCSI_bus(aetools.NProperty):
-	"""SCSI bus - the SCSI bus number """
-	which = 'pscb'
-	want = 'shor'
+    """SCSI bus - the SCSI bus number """
+    which = 'pscb'
+    want = 'shor'
 
 SCSI_addresses = SCSI_address
 
 class Token_Ring_address(aetools.ComponentItem):
-	"""Token Ring address - Addresses a device or service via the Token Ring protocol """
-	want = 'ctok'
+    """Token Ring address - Addresses a device or service via the Token Ring protocol """
+    want = 'ctok'
 
 Token_Ring_addresses = Token_Ring_address
 
 class USB_address(aetools.ComponentItem):
-	"""USB address - Addresses a device on the Universal Serial Bus """
-	want = 'cusb'
+    """USB address - Addresses a device on the Universal Serial Bus """
+    want = 'cusb'
 class _Prop_name(aetools.NProperty):
-	"""name - the USB device name """
-	which = 'pnam'
-	want = 'TEXT'
+    """name - the USB device name """
+    which = 'pnam'
+    want = 'TEXT'
 
 USB_Addresses = USB_address
 ADB_address._superclassnames = ['address_specification']
 ADB_address._privpropdict = {
-	'ID' : _Prop_ID,
-	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
+    'ID' : _Prop_ID,
+    '_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
 }
 ADB_address._privelemdict = {
 }
 address_specification._superclassnames = []
 address_specification._privpropdict = {
-	'conduit' : _Prop_conduit,
-	'properties' : _Prop_properties,
-	'protocol' : _Prop_protocol,
+    'conduit' : _Prop_conduit,
+    'properties' : _Prop_properties,
+    'protocol' : _Prop_protocol,
 }
 address_specification._privelemdict = {
 }
 AppleTalk_address._superclassnames = ['address_specification']
 AppleTalk_address._privpropdict = {
-	'AppleTalk_machine' : _Prop_AppleTalk_machine,
-	'AppleTalk_type' : _Prop_AppleTalk_type,
-	'AppleTalk_zone' : _Prop_AppleTalk_zone,
-	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
+    'AppleTalk_machine' : _Prop_AppleTalk_machine,
+    'AppleTalk_type' : _Prop_AppleTalk_type,
+    'AppleTalk_zone' : _Prop_AppleTalk_zone,
+    '_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
 }
 AppleTalk_address._privelemdict = {
 }
 bus_slot._superclassnames = ['address_specification']
 bus_slot._privpropdict = {
-	'ID' : _Prop_ID,
-	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
+    'ID' : _Prop_ID,
+    '_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
 }
 bus_slot._privelemdict = {
 }
 device_specification._superclassnames = []
 device_specification._privpropdict = {
-	'device_address' : _Prop_device_address,
-	'device_type' : _Prop_device_type,
-	'properties' : _Prop_properties,
+    'device_address' : _Prop_device_address,
+    'device_type' : _Prop_device_type,
+    'properties' : _Prop_properties,
 }
 device_specification._privelemdict = {
 }
 Ethernet_address._superclassnames = ['address_specification']
 Ethernet_address._privpropdict = {
-	'ID' : _Prop_ID,
-	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
+    'ID' : _Prop_ID,
+    '_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
 }
 Ethernet_address._privelemdict = {
 }
 FireWire_address._superclassnames = ['address_specification']
 FireWire_address._privpropdict = {
-	'ID' : _Prop_ID,
-	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
+    'ID' : _Prop_ID,
+    '_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
 }
 FireWire_address._privelemdict = {
 }
 IP_address._superclassnames = ['address_specification']
 IP_address._privpropdict = {
-	'DNS_form' : _Prop_DNS_form,
-	'ID' : _Prop_ID,
-	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
-	'port' : _Prop_port,
+    'DNS_form' : _Prop_DNS_form,
+    'ID' : _Prop_ID,
+    '_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
+    'port' : _Prop_port,
 }
 IP_address._privelemdict = {
 }
 LocalTalk_address._superclassnames = ['address_specification']
 LocalTalk_address._privpropdict = {
-	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
-	'network' : _Prop_network,
-	'node' : _Prop_node,
-	'socket' : _Prop_socket,
+    '_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
+    'network' : _Prop_network,
+    'node' : _Prop_node,
+    'socket' : _Prop_socket,
 }
 LocalTalk_address._privelemdict = {
 }
 SCSI_address._superclassnames = ['address_specification']
 SCSI_address._privpropdict = {
-	'ID' : _Prop_ID,
-	'LUN' : _Prop_LUN,
-	'SCSI_bus' : _Prop_SCSI_bus,
-	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
+    'ID' : _Prop_ID,
+    'LUN' : _Prop_LUN,
+    'SCSI_bus' : _Prop_SCSI_bus,
+    '_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
 }
 SCSI_address._privelemdict = {
 }
 Token_Ring_address._superclassnames = ['address_specification']
 Token_Ring_address._privpropdict = {
-	'ID' : _Prop_ID,
-	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
+    'ID' : _Prop_ID,
+    '_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
 }
 Token_Ring_address._privelemdict = {
 }
 USB_address._superclassnames = ['address_specification']
 USB_address._privpropdict = {
-	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
-	'name' : _Prop_name,
+    '_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
+    'name' : _Prop_name,
 }
 USB_address._privelemdict = {
 }
 _Enum_econ = {
-	'ADB' : 'eadb',	# 
-	'printer_port' : 'ecpp',	# 
-	'modem_port' : 'ecmp',	# 
-	'modem_printer_port' : 'empp',	# 
-	'LocalTalk' : 'eclt',	# 
-	'Ethernet' : 'ecen',	# 
-	'Token_Ring' : 'etok',	# 
-	'SCSI' : 'ecsc',	# 
-	'USB' : 'ecus',	# 
-	'FireWire' : 'ecfw',	# 
-	'infrared' : 'ecir',	# 
-	'PC_card' : 'ecpc',	# 
-	'PCI_bus' : 'ecpi',	# 
-	'NuBus' : 'enub',	# 
-	'PDS_slot' : 'ecpd',	# 
-	'Comm_slot' : 'eccm',	# 
-	'monitor_out' : 'ecmn',	# 
-	'video_out' : 'ecvo',	# 
-	'video_in' : 'ecvi',	# 
-	'audio_out' : 'ecao',	# 
-	'audio_line_in' : 'ecai',	# 
-	'audio_line_out' : 'ecal',	# 
-	'microphone' : 'ecmi',	# 
+    'ADB' : 'eadb',	# 
+    'printer_port' : 'ecpp',	# 
+    'modem_port' : 'ecmp',	# 
+    'modem_printer_port' : 'empp',	# 
+    'LocalTalk' : 'eclt',	# 
+    'Ethernet' : 'ecen',	# 
+    'Token_Ring' : 'etok',	# 
+    'SCSI' : 'ecsc',	# 
+    'USB' : 'ecus',	# 
+    'FireWire' : 'ecfw',	# 
+    'infrared' : 'ecir',	# 
+    'PC_card' : 'ecpc',	# 
+    'PCI_bus' : 'ecpi',	# 
+    'NuBus' : 'enub',	# 
+    'PDS_slot' : 'ecpd',	# 
+    'Comm_slot' : 'eccm',	# 
+    'monitor_out' : 'ecmn',	# 
+    'video_out' : 'ecvo',	# 
+    'video_in' : 'ecvi',	# 
+    'audio_out' : 'ecao',	# 
+    'audio_line_in' : 'ecai',	# 
+    'audio_line_out' : 'ecal',	# 
+    'microphone' : 'ecmi',	# 
 }
 
 _Enum_edvt = {
-	'hard_disk_drive' : 'ehd ',	# 
-	'floppy_disk_drive' : 'efd ',	# 
-	'CD_ROM_drive' : 'ecd ',	# 
-	'DVD_drive' : 'edvd',	# 
-	'storage_device' : 'edst',	# 
-	'keyboard' : 'ekbd',	# 
-	'mouse' : 'emou',	# 
-	'trackball' : 'etrk',	# 
-	'trackpad' : 'edtp',	# 
-	'pointing_device' : 'edpd',	# 
-	'video_monitor' : 'edvm',	# 
-	'LCD_display' : 'edlc',	# 
-	'display' : 'edds',	# 
-	'modem' : 'edmm',	# 
-	'PC_card' : 'ecpc',	# 
-	'PCI_card' : 'edpi',	# 
-	'NuBus_card' : 'ednb',	# 
-	'printer' : 'edpr',	# 
-	'speakers' : 'edsp',	# 
-	'microphone' : 'ecmi',	# 
+    'hard_disk_drive' : 'ehd ',	# 
+    'floppy_disk_drive' : 'efd ',	# 
+    'CD_ROM_drive' : 'ecd ',	# 
+    'DVD_drive' : 'edvd',	# 
+    'storage_device' : 'edst',	# 
+    'keyboard' : 'ekbd',	# 
+    'mouse' : 'emou',	# 
+    'trackball' : 'etrk',	# 
+    'trackpad' : 'edtp',	# 
+    'pointing_device' : 'edpd',	# 
+    'video_monitor' : 'edvm',	# 
+    'LCD_display' : 'edlc',	# 
+    'display' : 'edds',	# 
+    'modem' : 'edmm',	# 
+    'PC_card' : 'ecpc',	# 
+    'PCI_card' : 'edpi',	# 
+    'NuBus_card' : 'ednb',	# 
+    'printer' : 'edpr',	# 
+    'speakers' : 'edsp',	# 
+    'microphone' : 'ecmi',	# 
 }
 
 _Enum_epro = {
-	'serial' : 'epsr',	# 
-	'AppleTalk' : 'epat',	# 
-	'IP' : 'epip',	# 
-	'SCSI' : 'ecsc',	# 
-	'ADB' : 'eadb',	# 
-	'FireWire' : 'ecfw',	# 
-	'IrDA' : 'epir',	# 
-	'IRTalk' : 'epit',	# 
-	'USB' : 'ecus',	# 
-	'PC_card' : 'ecpc',	# 
-	'PCI_bus' : 'ecpi',	# 
-	'NuBus' : 'enub',	# 
-	'bus' : 'ebus',	# 
-	'Macintosh_video' : 'epmv',	# 
-	'SVGA' : 'epsg',	# 
-	'S_video' : 'epsv',	# 
-	'analog_audio' : 'epau',	# 
-	'digital_audio' : 'epda',	# 
-	'PostScript' : 'epps',	# 
+    'serial' : 'epsr',	# 
+    'AppleTalk' : 'epat',	# 
+    'IP' : 'epip',	# 
+    'SCSI' : 'ecsc',	# 
+    'ADB' : 'eadb',	# 
+    'FireWire' : 'ecfw',	# 
+    'IrDA' : 'epir',	# 
+    'IRTalk' : 'epit',	# 
+    'USB' : 'ecus',	# 
+    'PC_card' : 'ecpc',	# 
+    'PCI_bus' : 'ecpi',	# 
+    'NuBus' : 'enub',	# 
+    'bus' : 'ebus',	# 
+    'Macintosh_video' : 'epmv',	# 
+    'SVGA' : 'epsg',	# 
+    'S_video' : 'epsv',	# 
+    'analog_audio' : 'epau',	# 
+    'digital_audio' : 'epda',	# 
+    'PostScript' : 'epps',	# 
 }
 
 
@@ -328,16 +328,46 @@ _Enum_epro = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'cadb' : ADB_address,
-	'cadr' : address_specification,
-	'cat ' : AppleTalk_address,
-	'cbus' : bus_slot,
-	'cdev' : device_specification,
-	'cen ' : Ethernet_address,
-	'cfw ' : FireWire_address,
-	'cip ' : IP_address,
-	'clt ' : LocalTalk_address,
-	'cscs' : SCSI_address,
-	'ctok' : Token_Ring_address,
-	'cusb' : USB_address,
+    'cadb' : ADB_address,
+    'cadr' : address_specification,
+    'cat ' : AppleTalk_address,
+    'cbus' : bus_slot,
+    'cdev' : device_specification,
+    'cen ' : Ethernet_address,
+    'cfw ' : FireWire_address,
+    'cip ' : IP_address,
+    'clt ' : LocalTalk_address,
+    'cscs' : SCSI_address,
+    'ctok' : Token_Ring_address,
+    'cusb' : USB_address,
+}
+
+_propdeclarations = {
+    'ID  ' : _Prop_ID,
+    'c@#^' : _Prop__3c_inheritance_3e_,
+    'pALL' : _Prop_properties,
+    'patm' : _Prop_AppleTalk_machine,
+    'patt' : _Prop_AppleTalk_type,
+    'patz' : _Prop_AppleTalk_zone,
+    'pcon' : _Prop_conduit,
+    'pdns' : _Prop_DNS_form,
+    'pdva' : _Prop_device_address,
+    'pdvt' : _Prop_device_type,
+    'pnam' : _Prop_name,
+    'pnet' : _Prop_network,
+    'pnod' : _Prop_node,
+    'ppor' : _Prop_port,
+    'pprt' : _Prop_protocol,
+    'pscb' : _Prop_SCSI_bus,
+    'pslu' : _Prop_LUN,
+    'psoc' : _Prop_socket,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+    'econ' : _Enum_econ,
+    'edvt' : _Enum_edvt,
+    'epro' : _Enum_epro,
 }
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 4bbab39..5262225 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py
@@ -12,250 +12,250 @@ _code = 'qdrw'
 
 class QuickDraw_Graphics_Suite_Events:
 
-	pass
+    pass
 
 
 class arc(aetools.ComponentItem):
-	"""arc - An arc """
-	want = 'carc'
+    """arc - An arc """
+    want = 'carc'
 class _Prop_arc_angle(aetools.NProperty):
-	"""arc angle - the angle of the arc in degrees """
-	which = 'parc'
-	want = 'fixd'
+    """arc angle - the angle of the arc in degrees """
+    which = 'parc'
+    want = 'fixd'
 class _Prop_bounds(aetools.NProperty):
-	"""bounds - the smallest rectangle that contains the entire arc """
-	which = 'pbnd'
-	want = 'qdrt'
+    """bounds - the smallest rectangle that contains the entire arc """
+    which = 'pbnd'
+    want = 'qdrt'
 class _Prop_definition_rect(aetools.NProperty):
-	"""definition rect - the rectangle that contains the circle or oval used to define the arc """
-	which = 'pdrt'
-	want = 'qdrt'
+    """definition rect - the rectangle that contains the circle or oval used to define the arc """
+    which = 'pdrt'
+    want = 'qdrt'
 class _Prop_fill_color(aetools.NProperty):
-	"""fill color - the fill color """
-	which = 'flcl'
-	want = 'cRGB'
+    """fill color - the fill color """
+    which = 'flcl'
+    want = 'cRGB'
 class _Prop_fill_pattern(aetools.NProperty):
-	"""fill pattern - the fill pattern """
-	which = 'flpt'
-	want = 'cpix'
+    """fill pattern - the fill pattern """
+    which = 'flpt'
+    want = 'cpix'
 class _Prop_pen_color(aetools.NProperty):
-	"""pen color - the pen color """
-	which = 'ppcl'
-	want = 'cRGB'
+    """pen color - the pen color """
+    which = 'ppcl'
+    want = 'cRGB'
 class _Prop_pen_pattern(aetools.NProperty):
-	"""pen pattern - the pen pattern """
-	which = 'pppa'
-	want = 'cpix'
+    """pen pattern - the pen pattern """
+    which = 'pppa'
+    want = 'cpix'
 class _Prop_pen_width(aetools.NProperty):
-	"""pen width - the pen width """
-	which = 'ppwd'
-	want = 'shor'
+    """pen width - the pen width """
+    which = 'ppwd'
+    want = 'shor'
 class _Prop_start_angle(aetools.NProperty):
-	"""start angle - the angle that defines the start of the arc, in degrees """
-	which = 'pang'
-	want = 'fixd'
+    """start angle - the angle that defines the start of the arc, in degrees """
+    which = 'pang'
+    want = 'fixd'
 class _Prop_transfer_mode(aetools.NProperty):
-	"""transfer mode - the transfer mode """
-	which = 'pptm'
-	want = 'tran'
+    """transfer mode - the transfer mode """
+    which = 'pptm'
+    want = 'tran'
 
 arcs = arc
 
 class drawing_area(aetools.ComponentItem):
-	"""drawing area - Container for graphics and supporting information """
-	want = 'cdrw'
+    """drawing area - Container for graphics and supporting information """
+    want = 'cdrw'
 class _Prop_background_color(aetools.NProperty):
-	"""background color - the color used to fill in unoccupied areas """
-	which = 'pbcl'
-	want = 'cRGB'
+    """background color - the color used to fill in unoccupied areas """
+    which = 'pbcl'
+    want = 'cRGB'
 class _Prop_background_pattern(aetools.NProperty):
-	"""background pattern - the pattern used to fill in unoccupied areas """
-	which = 'pbpt'
-	want = 'cpix'
+    """background pattern - the pattern used to fill in unoccupied areas """
+    which = 'pbpt'
+    want = 'cpix'
 class _Prop_color_table(aetools.NProperty):
-	"""color table - the color table """
-	which = 'cltb'
-	want = 'clrt'
+    """color table - the color table """
+    which = 'cltb'
+    want = 'clrt'
 class _Prop_default_font(aetools.NProperty):
-	"""default font - the name of the default font for text objects """
-	which = 'ptxf'
-	want = 'itxt'
+    """default font - the name of the default font for text objects """
+    which = 'ptxf'
+    want = 'itxt'
 class _Prop_default_location(aetools.NProperty):
-	"""default location - the default location of each new graphic object """
-	which = 'pnel'
-	want = 'QDpt'
+    """default location - the default location of each new graphic object """
+    which = 'pnel'
+    want = 'QDpt'
 class _Prop_default_size(aetools.NProperty):
-	"""default size - the default size for text objects """
-	which = 'ptps'
-	want = 'fixd'
+    """default size - the default size for text objects """
+    which = 'ptps'
+    want = 'fixd'
 class _Prop_name(aetools.NProperty):
-	"""name - the name """
-	which = 'pnam'
-	want = 'itxt'
+    """name - the name """
+    which = 'pnam'
+    want = 'itxt'
 class _Prop_ordering(aetools.NProperty):
-	"""ordering - the ordered list of graphic objects in the drawing area """
-	which = 'gobs'
-	want = 'obj '
+    """ordering - the ordered list of graphic objects in the drawing area """
+    which = 'gobs'
+    want = 'obj '
 class _Prop_pixel_depth(aetools.NProperty):
-	"""pixel depth - the number of bits per pixel """
-	which = 'pdpt'
-	want = 'shor'
+    """pixel depth - the number of bits per pixel """
+    which = 'pdpt'
+    want = 'shor'
 class _Prop_style(aetools.NProperty):
-	"""style - the default text style for text objects """
-	which = 'txst'
-	want = 'tsty'
+    """style - the default text style for text objects """
+    which = 'txst'
+    want = 'tsty'
 class _Prop_text_color(aetools.NProperty):
-	"""text color - the default color for text objects """
-	which = 'ptxc'
-	want = 'cRGB'
+    """text color - the default color for text objects """
+    which = 'ptxc'
+    want = 'cRGB'
 class _Prop_update_on_change(aetools.NProperty):
-	"""update on change - Redraw after each change? """
-	which = 'pupd'
-	want = 'bool'
+    """update on change - Redraw after each change? """
+    which = 'pupd'
+    want = 'bool'
 class _Prop_writing_code(aetools.NProperty):
-	"""writing code - the script system and language of text objects in the drawing area """
-	which = 'psct'
-	want = 'intl'
+    """writing code - the script system and language of text objects in the drawing area """
+    which = 'psct'
+    want = 'intl'
 
 drawing_areas = drawing_area
 
 class graphic_objects(aetools.ComponentItem):
-	"""graphic objects -  """
-	want = 'cgob'
+    """graphic objects -  """
+    want = 'cgob'
 
 graphic_object = graphic_objects
 
 class graphic_shapes(aetools.ComponentItem):
-	"""graphic shapes -  """
-	want = 'cgsh'
+    """graphic shapes -  """
+    want = 'cgsh'
 
 graphic_shape = graphic_shapes
 
 class graphic_text(aetools.ComponentItem):
-	"""graphic text - A series of characters within a drawing area """
-	want = 'cgtx'
+    """graphic text - A series of characters within a drawing area """
+    want = 'cgtx'
 class _Prop_color(aetools.NProperty):
-	"""color - the color of the first character """
-	which = 'colr'
-	want = 'cRGB'
+    """color - the color of the first character """
+    which = 'colr'
+    want = 'cRGB'
 class _Prop_font(aetools.NProperty):
-	"""font - the name of the font of the first character """
-	which = 'font'
-	want = 'ctxt'
+    """font - the name of the font of the first character """
+    which = 'font'
+    want = 'ctxt'
 class _Prop_size(aetools.NProperty):
-	"""size - the size in points of the first character """
-	which = 'ptsz'
-	want = 'fixd'
+    """size - the size in points of the first character """
+    which = 'ptsz'
+    want = 'fixd'
 class _Prop_uniform_styles(aetools.NProperty):
-	"""uniform styles - the text styles that are uniform throughout the text """
-	which = 'ustl'
-	want = 'tsty'
+    """uniform styles - the text styles that are uniform throughout the text """
+    which = 'ustl'
+    want = 'tsty'
 
 class ovals(aetools.ComponentItem):
-	"""ovals -  """
-	want = 'covl'
+    """ovals -  """
+    want = 'covl'
 
 oval = ovals
 
 class polygon(aetools.ComponentItem):
-	"""polygon - A polygon """
-	want = 'cpgn'
+    """polygon - A polygon """
+    want = 'cpgn'
 class _Prop_point_list(aetools.NProperty):
-	"""point list - the list of points that define the polygon """
-	which = 'ptlt'
-	want = 'QDpt'
+    """point list - the list of points that define the polygon """
+    which = 'ptlt'
+    want = 'QDpt'
 
 polygons = polygon
 
 class graphic_groups(aetools.ComponentItem):
-	"""graphic groups -  """
-	want = 'cpic'
+    """graphic groups -  """
+    want = 'cpic'
 
 graphic_group = graphic_groups
 
 class pixel_maps(aetools.ComponentItem):
-	"""pixel maps -  """
-	want = 'cpix'
+    """pixel maps -  """
+    want = 'cpix'
 
 pixel_map = pixel_maps
 
 class pixel(aetools.ComponentItem):
-	"""pixel - A pixel """
-	want = 'cpxl'
+    """pixel - A pixel """
+    want = 'cpxl'
 
 pixels = pixel
 
 class rectangles(aetools.ComponentItem):
-	"""rectangles -  """
-	want = 'crec'
+    """rectangles -  """
+    want = 'crec'
 
 rectangle = rectangles
 
 class rounded_rectangle(aetools.ComponentItem):
-	"""rounded rectangle - A rounded rectangle """
-	want = 'crrc'
+    """rounded rectangle - A rounded rectangle """
+    want = 'crrc'
 class _Prop_corner_curve_height(aetools.NProperty):
-	"""corner curve height - the height of the oval used to define the shape of the rounded corners """
-	which = 'pchd'
-	want = 'shor'
+    """corner curve height - the height of the oval used to define the shape of the rounded corners """
+    which = 'pchd'
+    want = 'shor'
 class _Prop_corner_curve_width(aetools.NProperty):
-	"""corner curve width - the width of the oval used to define the shape of the rounded corners """
-	which = 'pcwd'
-	want = 'shor'
+    """corner curve width - the width of the oval used to define the shape of the rounded corners """
+    which = 'pcwd'
+    want = 'shor'
 
 rounded_rectangles = rounded_rectangle
 
 class graphic_line(aetools.ComponentItem):
-	"""graphic line - A graphic line """
-	want = 'glin'
+    """graphic line - A graphic line """
+    want = 'glin'
 class _Prop_arrow_style(aetools.NProperty):
-	"""arrow style - the arrow style """
-	which = 'arro'
-	want = 'arro'
+    """arrow style - the arrow style """
+    which = 'arro'
+    want = 'arro'
 class _Prop_dash_style(aetools.NProperty):
-	"""dash style - the dash style """
-	which = 'pdst'
-	want = 'tdas'
+    """dash style - the dash style """
+    which = 'pdst'
+    want = 'tdas'
 class _Prop_end_point(aetools.NProperty):
-	"""end point - the ending point of the line """
-	which = 'pend'
-	want = 'QDpt'
+    """end point - the ending point of the line """
+    which = 'pend'
+    want = 'QDpt'
 class _Prop_start_point(aetools.NProperty):
-	"""start point - the starting point of the line """
-	which = 'pstp'
-	want = 'QDpt'
+    """start point - the starting point of the line """
+    which = 'pstp'
+    want = 'QDpt'
 
 graphic_lines = graphic_line
 arc._superclassnames = []
 arc._privpropdict = {
-	'arc_angle' : _Prop_arc_angle,
-	'bounds' : _Prop_bounds,
-	'definition_rect' : _Prop_definition_rect,
-	'fill_color' : _Prop_fill_color,
-	'fill_pattern' : _Prop_fill_pattern,
-	'pen_color' : _Prop_pen_color,
-	'pen_pattern' : _Prop_pen_pattern,
-	'pen_width' : _Prop_pen_width,
-	'start_angle' : _Prop_start_angle,
-	'transfer_mode' : _Prop_transfer_mode,
+    'arc_angle' : _Prop_arc_angle,
+    'bounds' : _Prop_bounds,
+    'definition_rect' : _Prop_definition_rect,
+    'fill_color' : _Prop_fill_color,
+    'fill_pattern' : _Prop_fill_pattern,
+    'pen_color' : _Prop_pen_color,
+    'pen_pattern' : _Prop_pen_pattern,
+    'pen_width' : _Prop_pen_width,
+    'start_angle' : _Prop_start_angle,
+    'transfer_mode' : _Prop_transfer_mode,
 }
 arc._privelemdict = {
 }
 drawing_area._superclassnames = []
 drawing_area._privpropdict = {
-	'background_color' : _Prop_background_color,
-	'background_pattern' : _Prop_background_pattern,
-	'color_table' : _Prop_color_table,
-	'default_font' : _Prop_default_font,
-	'default_location' : _Prop_default_location,
-	'default_size' : _Prop_default_size,
-	'name' : _Prop_name,
-	'ordering' : _Prop_ordering,
-	'pixel_depth' : _Prop_pixel_depth,
-	'style' : _Prop_style,
-	'text_color' : _Prop_text_color,
-	'update_on_change' : _Prop_update_on_change,
-	'writing_code' : _Prop_writing_code,
+    'background_color' : _Prop_background_color,
+    'background_pattern' : _Prop_background_pattern,
+    'color_table' : _Prop_color_table,
+    'default_font' : _Prop_default_font,
+    'default_location' : _Prop_default_location,
+    'default_size' : _Prop_default_size,
+    'name' : _Prop_name,
+    'ordering' : _Prop_ordering,
+    'pixel_depth' : _Prop_pixel_depth,
+    'style' : _Prop_style,
+    'text_color' : _Prop_text_color,
+    'update_on_change' : _Prop_update_on_change,
+    'writing_code' : _Prop_writing_code,
 }
 drawing_area._privelemdict = {
 }
@@ -271,10 +271,10 @@ graphic_shapes._privelemdict = {
 }
 graphic_text._superclassnames = []
 graphic_text._privpropdict = {
-	'color' : _Prop_color,
-	'font' : _Prop_font,
-	'size' : _Prop_size,
-	'uniform_styles' : _Prop_uniform_styles,
+    'color' : _Prop_color,
+    'font' : _Prop_font,
+    'size' : _Prop_size,
+    'uniform_styles' : _Prop_uniform_styles,
 }
 graphic_text._privelemdict = {
 }
@@ -285,7 +285,7 @@ ovals._privelemdict = {
 }
 polygon._superclassnames = []
 polygon._privpropdict = {
-	'point_list' : _Prop_point_list,
+    'point_list' : _Prop_point_list,
 }
 polygon._privelemdict = {
 }
@@ -301,7 +301,7 @@ pixel_maps._privelemdict = {
 }
 pixel._superclassnames = []
 pixel._privpropdict = {
-	'color' : _Prop_color,
+    'color' : _Prop_color,
 }
 pixel._privelemdict = {
 }
@@ -312,43 +312,43 @@ rectangles._privelemdict = {
 }
 rounded_rectangle._superclassnames = []
 rounded_rectangle._privpropdict = {
-	'corner_curve_height' : _Prop_corner_curve_height,
-	'corner_curve_width' : _Prop_corner_curve_width,
+    'corner_curve_height' : _Prop_corner_curve_height,
+    'corner_curve_width' : _Prop_corner_curve_width,
 }
 rounded_rectangle._privelemdict = {
 }
 graphic_line._superclassnames = []
 graphic_line._privpropdict = {
-	'arrow_style' : _Prop_arrow_style,
-	'dash_style' : _Prop_dash_style,
-	'end_point' : _Prop_end_point,
-	'start_point' : _Prop_start_point,
+    'arrow_style' : _Prop_arrow_style,
+    'dash_style' : _Prop_dash_style,
+    'end_point' : _Prop_end_point,
+    'start_point' : _Prop_start_point,
 }
 graphic_line._privelemdict = {
 }
 _Enum_arro = {
-	'no_arrow' : 'arno',	# No arrow on line
-	'arrow_at_start' : 'arst',	# Arrow at start of line
-	'arrow_at_end' : 'aren',	# Arrow at end of line
-	'arrow_at_both_ends' : 'arbo',	# Arrow at both the start and the end of the line
+    'no_arrow' : 'arno',	# No arrow on line
+    'arrow_at_start' : 'arst',	# Arrow at start of line
+    'arrow_at_end' : 'aren',	# Arrow at end of line
+    'arrow_at_both_ends' : 'arbo',	# Arrow at both the start and the end of the line
 }
 
 _Enum_tran = {
-	'copy_pixels' : 'cpy ',	# 
-	'not_copy_pixels' : 'ncpy',	# 
-	'or_pixels' : 'or  ',	# 
-	'not_or_pixels' : 'ntor',	# 
-	'bic_pixels' : 'bic ',	# 
-	'not_bic_pixels' : 'nbic',	# 
-	'xor_pixels' : 'xor ',	# 
-	'not_xor_pixels' : 'nxor',	# 
-	'add_over_pixels' : 'addo',	# 
-	'add_pin_pixels' : 'addp',	# 
-	'sub_over_pixels' : 'subo',	# 
-	'sub_pin_pixels' : 'subp',	# 
-	'ad_max_pixels' : 'admx',	# 
-	'ad_min_pixels' : 'admn',	# 
-	'blend_pixels' : 'blnd',	# 
+    'copy_pixels' : 'cpy ',	# 
+    'not_copy_pixels' : 'ncpy',	# 
+    'or_pixels' : 'or  ',	# 
+    'not_or_pixels' : 'ntor',	# 
+    'bic_pixels' : 'bic ',	# 
+    'not_bic_pixels' : 'nbic',	# 
+    'xor_pixels' : 'xor ',	# 
+    'not_xor_pixels' : 'nxor',	# 
+    'add_over_pixels' : 'addo',	# 
+    'add_pin_pixels' : 'addp',	# 
+    'sub_over_pixels' : 'subo',	# 
+    'sub_pin_pixels' : 'subp',	# 
+    'ad_max_pixels' : 'admx',	# 
+    'ad_min_pixels' : 'admn',	# 
+    'blend_pixels' : 'blnd',	# 
 }
 
 
@@ -356,17 +356,62 @@ _Enum_tran = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'carc' : arc,
-	'cdrw' : drawing_area,
-	'cgob' : graphic_objects,
-	'cgsh' : graphic_shapes,
-	'cgtx' : graphic_text,
-	'covl' : ovals,
-	'cpgn' : polygon,
-	'cpic' : graphic_groups,
-	'cpix' : pixel_maps,
-	'cpxl' : pixel,
-	'crec' : rectangles,
-	'crrc' : rounded_rectangle,
-	'glin' : graphic_line,
+    'carc' : arc,
+    'cdrw' : drawing_area,
+    'cgob' : graphic_objects,
+    'cgsh' : graphic_shapes,
+    'cgtx' : graphic_text,
+    'covl' : ovals,
+    'cpgn' : polygon,
+    'cpic' : graphic_groups,
+    'cpix' : pixel_maps,
+    'cpxl' : pixel,
+    'crec' : rectangles,
+    'crrc' : rounded_rectangle,
+    'glin' : graphic_line,
+}
+
+_propdeclarations = {
+    'arro' : _Prop_arrow_style,
+    'cltb' : _Prop_color_table,
+    'colr' : _Prop_color,
+    'flcl' : _Prop_fill_color,
+    'flpt' : _Prop_fill_pattern,
+    'font' : _Prop_font,
+    'gobs' : _Prop_ordering,
+    'pang' : _Prop_start_angle,
+    'parc' : _Prop_arc_angle,
+    'pbcl' : _Prop_background_color,
+    'pbnd' : _Prop_bounds,
+    'pbpt' : _Prop_background_pattern,
+    'pchd' : _Prop_corner_curve_height,
+    'pcwd' : _Prop_corner_curve_width,
+    'pdpt' : _Prop_pixel_depth,
+    'pdrt' : _Prop_definition_rect,
+    'pdst' : _Prop_dash_style,
+    'pend' : _Prop_end_point,
+    'pnam' : _Prop_name,
+    'pnel' : _Prop_default_location,
+    'ppcl' : _Prop_pen_color,
+    'pppa' : _Prop_pen_pattern,
+    'pptm' : _Prop_transfer_mode,
+    'ppwd' : _Prop_pen_width,
+    'psct' : _Prop_writing_code,
+    'pstp' : _Prop_start_point,
+    'ptlt' : _Prop_point_list,
+    'ptps' : _Prop_default_size,
+    'ptsz' : _Prop_size,
+    'ptxc' : _Prop_text_color,
+    'ptxf' : _Prop_default_font,
+    'pupd' : _Prop_update_on_change,
+    'txst' : _Prop_style,
+    'ustl' : _Prop_uniform_styles,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+    'arro' : _Enum_arro,
+    'tran' : _Enum_tran,
 }
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 7c26d6b..31e98cc 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suppleme.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suppleme.py
@@ -12,37 +12,37 @@ _code = 'qdsp'
 
 class QuickDraw_Graphics_Suppleme_Events:
 
-	pass
+    pass
 
 
 class drawing_area(aetools.ComponentItem):
-	"""drawing area - Container for graphics and supporting information """
-	want = 'cdrw'
+    """drawing area - Container for graphics and supporting information """
+    want = 'cdrw'
 class _Prop_rotation(aetools.NProperty):
-	"""rotation - the default rotation for objects in the drawing area """
-	which = 'prot'
-	want = 'trot'
+    """rotation - the default rotation for objects in the drawing area """
+    which = 'prot'
+    want = 'trot'
 class _Prop_scale(aetools.NProperty):
-	"""scale - the default scaling for objects in the drawing area """
-	which = 'pscl'
-	want = 'fixd'
+    """scale - the default scaling for objects in the drawing area """
+    which = 'pscl'
+    want = 'fixd'
 class _Prop_translation(aetools.NProperty):
-	"""translation - the default repositioning for objects in the drawing area """
-	which = 'ptrs'
-	want = 'QDpt'
+    """translation - the default repositioning for objects in the drawing area """
+    which = 'ptrs'
+    want = 'QDpt'
 
 drawing_areas = drawing_area
 
 class graphic_groups(aetools.ComponentItem):
-	"""graphic groups -  """
-	want = 'cpic'
+    """graphic groups -  """
+    want = 'cpic'
 
 graphic_group = graphic_groups
 drawing_area._superclassnames = []
 drawing_area._privpropdict = {
-	'rotation' : _Prop_rotation,
-	'scale' : _Prop_scale,
-	'translation' : _Prop_translation,
+    'rotation' : _Prop_rotation,
+    'scale' : _Prop_scale,
+    'translation' : _Prop_translation,
 }
 drawing_area._privelemdict = {
 }
@@ -56,6 +56,18 @@ graphic_groups._privelemdict = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'cdrw' : drawing_area,
-	'cpic' : graphic_groups,
+    'cdrw' : drawing_area,
+    'cpic' : graphic_groups,
+}
+
+_propdeclarations = {
+    'prot' : _Prop_rotation,
+    'pscl' : _Prop_scale,
+    'ptrs' : _Prop_translation,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Required_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Required_Suite.py
index 0bd5696..1a45d92 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Required_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Required_Suite.py
@@ -13,7 +13,7 @@ _code = 'reqd'
 from _builtinSuites.builtin_Suite import *
 class Required_Suite_Events(builtin_Suite_Events):
 
-	pass
+    pass
 
 
 #
@@ -21,3 +21,12 @@ class Required_Suite_Events(builtin_Suite_Events):
 #
 _classdeclarations = {
 }
+
+_propdeclarations = {
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+}
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py
index 45a4b0d..0c1fd74 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Standard_Suite.py
@@ -13,550 +13,550 @@ _code = 'core'
 from _builtinSuites.builtin_Suite import *
 class Standard_Suite_Events(builtin_Suite_Events):
 
-	_argmap_class_info = {
-		'in_' : 'wrcd',
-	}
-
-	def class_info(self, _object=None, _attributes={}, **_arguments):
-		"""class info: (optional) Get information about an object class
-		Required argument: the object class about which information is requested
-		Keyword argument in_: the human language and script system in which to return information
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: a record containing the object\xd5s properties and elements
-		"""
-		_code = 'core'
-		_subcode = 'qobj'
-
-		aetools.keysubst(_arguments, self._argmap_class_info)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_close = {
-		'saving' : 'savo',
-		'saving_in' : 'kfil',
-	}
-
-	def close(self, _object, _attributes={}, **_arguments):
-		"""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 or alias in which to save the object
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'core'
-		_subcode = 'clos'
-
-		aetools.keysubst(_arguments, self._argmap_close)
-		_arguments['----'] = _object
-
-		aetools.enumsubst(_arguments, 'savo', _Enum_savo)
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_count = {
-		'each' : 'kocl',
-	}
-
-	def count(self, _object, _attributes={}, **_arguments):
-		"""count: Return the number of elements of an object
-		Required argument: the object whose elements are to be counted
-		Keyword argument each: if specified, restricts counting to objects of this class
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the number of elements
-		"""
-		_code = 'core'
-		_subcode = 'cnte'
-
-		aetools.keysubst(_arguments, self._argmap_count)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_data_size = {
-		'as' : 'rtyp',
-	}
-
-	def data_size(self, _object, _attributes={}, **_arguments):
-		"""data size: (optional) Return the size in bytes of an object
-		Required argument: the object whose data size is to be returned
-		Keyword argument as: the data type for which the size is calculated
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the size of the object in bytes
-		"""
-		_code = 'core'
-		_subcode = 'dsiz'
-
-		aetools.keysubst(_arguments, self._argmap_data_size)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def delete(self, _object, _attributes={}, **_arguments):
-		"""delete: Delete an object from its container. Note this does not work on script variables, only on elements of application classes.
-		Required argument: the element to delete
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'core'
-		_subcode = 'delo'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_duplicate = {
-		'to' : 'insh',
-		'with_properties' : 'prdt',
-	}
-
-	def duplicate(self, _object, _attributes={}, **_arguments):
-		"""duplicate: Duplicate one or more objects
-		Required argument: the object(s) to duplicate
-		Keyword argument to: the new location for the object(s)
-		Keyword argument with_properties: the initial values for properties of the new object that are to be different from the original
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: to the duplicated object(s)
-		"""
-		_code = 'core'
-		_subcode = 'clon'
-
-		aetools.keysubst(_arguments, self._argmap_duplicate)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_event_info = {
-		'in_' : 'wrcd',
-	}
-
-	def event_info(self, _object, _attributes={}, **_arguments):
-		"""event info: (optional) Get information about the Apple events in a suite
-		Required argument: the event class of the Apple events for which to return information
-		Keyword argument in_: the human language and script system in which to return information
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: a record containing the events and their parameters
-		"""
-		_code = 'core'
-		_subcode = 'gtei'
-
-		aetools.keysubst(_arguments, self._argmap_event_info)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def exists(self, _object, _attributes={}, **_arguments):
-		"""exists: Verify if an object exists
-		Required argument: the object in question
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: true if it exists, false if not
-		"""
-		_code = 'core'
-		_subcode = 'doex'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_make = {
-		'new' : 'kocl',
-		'at' : 'insh',
-		'with_data' : 'data',
-		'with_properties' : 'prdt',
-	}
-
-	def make(self, _no_object=None, _attributes={}, **_arguments):
-		"""make: Make a new element
-		Keyword argument new: the class of the new element
-		Keyword argument at: the location at which to insert the element
-		Keyword argument with_data: the initial data for the element
-		Keyword argument with_properties: the initial values for the properties of the element
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: to the new object(s)
-		"""
-		_code = 'core'
-		_subcode = 'crel'
-
-		aetools.keysubst(_arguments, self._argmap_make)
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_move = {
-		'to' : 'insh',
-	}
-
-	def move(self, _object, _attributes={}, **_arguments):
-		"""move: Move object(s) to a new location
-		Required argument: the object(s) to move
-		Keyword argument to: the new location for the object(s)
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: to the object(s) after they have been moved
-		"""
-		_code = 'core'
-		_subcode = 'move'
-
-		aetools.keysubst(_arguments, self._argmap_move)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def open(self, _object, _attributes={}, **_arguments):
-		"""open: Open the specified object(s)
-		Required argument: list of objects to open
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'odoc'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def print_(self, _object, _attributes={}, **_arguments):
-		"""print: Print the specified object(s)
-		Required argument: list of objects to print
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'pdoc'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_quit = {
-		'saving' : 'savo',
-	}
-
-	def quit(self, _no_object=None, _attributes={}, **_arguments):
-		"""quit: Quit an application
-		Keyword argument saving: specifies whether to save currently open documents
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'quit'
-
-		aetools.keysubst(_arguments, self._argmap_quit)
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-		aetools.enumsubst(_arguments, 'savo', _Enum_savo)
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def reopen(self, _no_object=None, _attributes={}, **_arguments):
-		"""reopen: Reactivate a running application.  Some applications will open a new untitled window if no window is open.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'rapp'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def run(self, _no_object=None, _attributes={}, **_arguments):
-		"""run: Run an application.  Most applications will open an empty, untitled window.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'oapp'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_save = {
-		'in_' : 'kfil',
-		'as' : 'fltp',
-	}
-
-	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 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
-		"""
-		_code = 'core'
-		_subcode = 'save'
-
-		aetools.keysubst(_arguments, self._argmap_save)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def select(self, _object, _attributes={}, **_arguments):
-		"""select: Make a selection
-		Required argument: the object to select
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'misc'
-		_subcode = 'slct'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_suite_info = {
-		'in_' : 'wrcd',
-	}
-
-	def suite_info(self, _object, _attributes={}, **_arguments):
-		"""suite info: (optional) Get information about event suite(s)
-		Required argument: the suite for which to return information
-		Keyword argument in_: the human language and script system in which to return information
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: a record containing the suites and their versions
-		"""
-		_code = 'core'
-		_subcode = 'gtsi'
-
-		aetools.keysubst(_arguments, self._argmap_suite_info)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    _argmap_class_info = {
+        'in_' : 'wrcd',
+    }
+
+    def class_info(self, _object=None, _attributes={}, **_arguments):
+        """class info: (optional) Get information about an object class
+        Required argument: the object class about which information is requested
+        Keyword argument in_: the human language and script system in which to return information
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: a record containing the object\xd5s properties and elements
+        """
+        _code = 'core'
+        _subcode = 'qobj'
+
+        aetools.keysubst(_arguments, self._argmap_class_info)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_close = {
+        'saving' : 'savo',
+        'saving_in' : 'kfil',
+    }
+
+    def close(self, _object, _attributes={}, **_arguments):
+        """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 or alias in which to save the object
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'core'
+        _subcode = 'clos'
+
+        aetools.keysubst(_arguments, self._argmap_close)
+        _arguments['----'] = _object
+
+        aetools.enumsubst(_arguments, 'savo', _Enum_savo)
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_count = {
+        'each' : 'kocl',
+    }
+
+    def count(self, _object, _attributes={}, **_arguments):
+        """count: Return the number of elements of an object
+        Required argument: the object whose elements are to be counted
+        Keyword argument each: if specified, restricts counting to objects of this class
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the number of elements
+        """
+        _code = 'core'
+        _subcode = 'cnte'
+
+        aetools.keysubst(_arguments, self._argmap_count)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_data_size = {
+        'as' : 'rtyp',
+    }
+
+    def data_size(self, _object, _attributes={}, **_arguments):
+        """data size: (optional) Return the size in bytes of an object
+        Required argument: the object whose data size is to be returned
+        Keyword argument as: the data type for which the size is calculated
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the size of the object in bytes
+        """
+        _code = 'core'
+        _subcode = 'dsiz'
+
+        aetools.keysubst(_arguments, self._argmap_data_size)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def delete(self, _object, _attributes={}, **_arguments):
+        """delete: Delete an object from its container. Note this does not work on script variables, only on elements of application classes.
+        Required argument: the element to delete
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'core'
+        _subcode = 'delo'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_duplicate = {
+        'to' : 'insh',
+        'with_properties' : 'prdt',
+    }
+
+    def duplicate(self, _object, _attributes={}, **_arguments):
+        """duplicate: Duplicate one or more objects
+        Required argument: the object(s) to duplicate
+        Keyword argument to: the new location for the object(s)
+        Keyword argument with_properties: the initial values for properties of the new object that are to be different from the original
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: to the duplicated object(s)
+        """
+        _code = 'core'
+        _subcode = 'clon'
+
+        aetools.keysubst(_arguments, self._argmap_duplicate)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_event_info = {
+        'in_' : 'wrcd',
+    }
+
+    def event_info(self, _object, _attributes={}, **_arguments):
+        """event info: (optional) Get information about the Apple events in a suite
+        Required argument: the event class of the Apple events for which to return information
+        Keyword argument in_: the human language and script system in which to return information
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: a record containing the events and their parameters
+        """
+        _code = 'core'
+        _subcode = 'gtei'
+
+        aetools.keysubst(_arguments, self._argmap_event_info)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def exists(self, _object, _attributes={}, **_arguments):
+        """exists: Verify if an object exists
+        Required argument: the object in question
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: true if it exists, false if not
+        """
+        _code = 'core'
+        _subcode = 'doex'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_make = {
+        'new' : 'kocl',
+        'at' : 'insh',
+        'with_data' : 'data',
+        'with_properties' : 'prdt',
+    }
+
+    def make(self, _no_object=None, _attributes={}, **_arguments):
+        """make: Make a new element
+        Keyword argument new: the class of the new element
+        Keyword argument at: the location at which to insert the element
+        Keyword argument with_data: the initial data for the element
+        Keyword argument with_properties: the initial values for the properties of the element
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: to the new object(s)
+        """
+        _code = 'core'
+        _subcode = 'crel'
+
+        aetools.keysubst(_arguments, self._argmap_make)
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_move = {
+        'to' : 'insh',
+    }
+
+    def move(self, _object, _attributes={}, **_arguments):
+        """move: Move object(s) to a new location
+        Required argument: the object(s) to move
+        Keyword argument to: the new location for the object(s)
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: to the object(s) after they have been moved
+        """
+        _code = 'core'
+        _subcode = 'move'
+
+        aetools.keysubst(_arguments, self._argmap_move)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def open(self, _object, _attributes={}, **_arguments):
+        """open: Open the specified object(s)
+        Required argument: list of objects to open
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'odoc'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def print_(self, _object, _attributes={}, **_arguments):
+        """print: Print the specified object(s)
+        Required argument: list of objects to print
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'pdoc'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_quit = {
+        'saving' : 'savo',
+    }
+
+    def quit(self, _no_object=None, _attributes={}, **_arguments):
+        """quit: Quit an application
+        Keyword argument saving: specifies whether to save currently open documents
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'quit'
+
+        aetools.keysubst(_arguments, self._argmap_quit)
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+        aetools.enumsubst(_arguments, 'savo', _Enum_savo)
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def reopen(self, _no_object=None, _attributes={}, **_arguments):
+        """reopen: Reactivate a running application.  Some applications will open a new untitled window if no window is open.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'rapp'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def run(self, _no_object=None, _attributes={}, **_arguments):
+        """run: Run an application.  Most applications will open an empty, untitled window.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'oapp'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_save = {
+        'in_' : 'kfil',
+        'as' : 'fltp',
+    }
+
+    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 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
+        """
+        _code = 'core'
+        _subcode = 'save'
+
+        aetools.keysubst(_arguments, self._argmap_save)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def select(self, _object, _attributes={}, **_arguments):
+        """select: Make a selection
+        Required argument: the object to select
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'misc'
+        _subcode = 'slct'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_suite_info = {
+        'in_' : 'wrcd',
+    }
+
+    def suite_info(self, _object, _attributes={}, **_arguments):
+        """suite info: (optional) Get information about event suite(s)
+        Required argument: the suite for which to return information
+        Keyword argument in_: the human language and script system in which to return information
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: a record containing the suites and their versions
+        """
+        _code = 'core'
+        _subcode = 'gtsi'
+
+        aetools.keysubst(_arguments, self._argmap_suite_info)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 class aliases(aetools.ComponentItem):
-	"""aliases -  """
-	want = 'alis'
+    """aliases -  """
+    want = 'alis'
 
 alias = aliases
 
 class application(aetools.ComponentItem):
-	"""application - An application program """
-	want = 'capp'
+    """application - An application program """
+    want = 'capp'
 class _Prop_clipboard(aetools.NProperty):
-	"""clipboard - the contents of the clipboard for this application """
-	which = 'pcli'
-	want = '****'
+    """clipboard - the contents of the clipboard for this application """
+    which = 'pcli'
+    want = '****'
 class _Prop_frontmost(aetools.NProperty):
-	"""frontmost - Is this the frontmost application? """
-	which = 'pisf'
-	want = 'bool'
+    """frontmost - Is this the frontmost application? """
+    which = 'pisf'
+    want = 'bool'
 class _Prop_name(aetools.NProperty):
-	"""name - the name of the application """
-	which = 'pnam'
-	want = 'itxt'
+    """name - the name of the application """
+    which = 'pnam'
+    want = 'itxt'
 class _Prop_selection(aetools.NProperty):
-	"""selection - the selection visible to the user.  Use the \xd4select\xd5 command to set a new selection; use \xd4contents of selection\xd5 to get or change information in the document. """
-	which = 'sele'
-	want = 'csel'
+    """selection - the selection visible to the user.  Use the \xd4select\xd5 command to set a new selection; use \xd4contents of selection\xd5 to get or change information in the document. """
+    which = 'sele'
+    want = 'csel'
 class _Prop_version(aetools.NProperty):
-	"""version - the version of the application """
-	which = 'vers'
-	want = 'vers'
+    """version - the version of the application """
+    which = 'vers'
+    want = 'vers'
 
 applications = application
 
 class insertion_points(aetools.ComponentItem):
-	"""insertion points -  """
-	want = 'cins'
+    """insertion points -  """
+    want = 'cins'
 
 insertion_point = insertion_points
 
 class selection_2d_object(aetools.ComponentItem):
-	"""selection-object - A way to refer to the state of the current of the selection.  Use the \xd4select\xd5 command to make a new selection. """
-	want = 'csel'
+    """selection-object - A way to refer to the state of the current of the selection.  Use the \xd4select\xd5 command to make a new selection. """
+    want = 'csel'
 class _Prop_contents(aetools.NProperty):
-	"""contents - the information currently selected.  Use \xd4contents of selection\xd5 to get or change information in a document. """
-	which = 'pcnt'
-	want = '****'
+    """contents - the information currently selected.  Use \xd4contents of selection\xd5 to get or change information in a document. """
+    which = 'pcnt'
+    want = '****'
 
 class window(aetools.ComponentItem):
-	"""window - A window """
-	want = 'cwin'
+    """window - A window """
+    want = 'cwin'
 class _Prop_bounds(aetools.NProperty):
-	"""bounds - the boundary rectangle for the window """
-	which = 'pbnd'
-	want = 'qdrt'
+    """bounds - the boundary rectangle for the window """
+    which = 'pbnd'
+    want = 'qdrt'
 class _Prop_closeable(aetools.NProperty):
-	"""closeable - Does the window have a close box? """
-	which = 'hclb'
-	want = 'bool'
+    """closeable - Does the window have a close box? """
+    which = 'hclb'
+    want = 'bool'
 class _Prop_floating(aetools.NProperty):
-	"""floating - Does the window float? """
-	which = 'isfl'
-	want = 'bool'
+    """floating - Does the window float? """
+    which = 'isfl'
+    want = 'bool'
 class _Prop_index(aetools.NProperty):
-	"""index - the number of the window """
-	which = 'pidx'
-	want = 'long'
+    """index - the number of the window """
+    which = 'pidx'
+    want = 'long'
 class _Prop_modal(aetools.NProperty):
-	"""modal - Is the window modal? """
-	which = 'pmod'
-	want = 'bool'
+    """modal - Is the window modal? """
+    which = 'pmod'
+    want = 'bool'
 class _Prop_resizable(aetools.NProperty):
-	"""resizable - Is the window resizable? """
-	which = 'prsz'
-	want = 'bool'
+    """resizable - Is the window resizable? """
+    which = 'prsz'
+    want = 'bool'
 class _Prop_titled(aetools.NProperty):
-	"""titled - Does the window have a title bar? """
-	which = 'ptit'
-	want = 'bool'
+    """titled - Does the window have a title bar? """
+    which = 'ptit'
+    want = 'bool'
 class _Prop_visible(aetools.NProperty):
-	"""visible - Is the window visible? """
-	which = 'pvis'
-	want = 'bool'
+    """visible - Is the window visible? """
+    which = 'pvis'
+    want = 'bool'
 class _Prop_zoomable(aetools.NProperty):
-	"""zoomable - Is the window zoomable? """
-	which = 'iszm'
-	want = 'bool'
+    """zoomable - Is the window zoomable? """
+    which = 'iszm'
+    want = 'bool'
 class _Prop_zoomed(aetools.NProperty):
-	"""zoomed - Is the window zoomed? """
-	which = 'pzum'
-	want = 'bool'
+    """zoomed - Is the window zoomed? """
+    which = 'pzum'
+    want = 'bool'
 
 windows = window
 
 class document(aetools.ComponentItem):
-	"""document - A document of a scriptable application """
-	want = 'docu'
+    """document - A document of a scriptable application """
+    want = 'docu'
 class _Prop_modified(aetools.NProperty):
-	"""modified - Has the document been modified since the last save? """
-	which = 'imod'
-	want = 'bool'
+    """modified - Has the document been modified since the last save? """
+    which = 'imod'
+    want = 'bool'
 
 documents = document
 
 class file(aetools.ComponentItem):
-	"""file - a file on a disk or server """
-	want = 'file'
+    """file - a file on a disk or server """
+    want = 'file'
 class _Prop_stationery(aetools.NProperty):
-	"""stationery - Is the file a stationery file? """
-	which = 'pspd'
-	want = 'bool'
+    """stationery - Is the file a stationery file? """
+    which = 'pspd'
+    want = 'bool'
 
 files = file
 aliases._superclassnames = []
@@ -566,11 +566,11 @@ aliases._privelemdict = {
 }
 application._superclassnames = []
 application._privpropdict = {
-	'clipboard' : _Prop_clipboard,
-	'frontmost' : _Prop_frontmost,
-	'name' : _Prop_name,
-	'selection' : _Prop_selection,
-	'version' : _Prop_version,
+    'clipboard' : _Prop_clipboard,
+    'frontmost' : _Prop_frontmost,
+    'name' : _Prop_name,
+    'selection' : _Prop_selection,
+    'version' : _Prop_version,
 }
 application._privelemdict = {
 }
@@ -581,81 +581,81 @@ insertion_points._privelemdict = {
 }
 selection_2d_object._superclassnames = []
 selection_2d_object._privpropdict = {
-	'contents' : _Prop_contents,
+    'contents' : _Prop_contents,
 }
 selection_2d_object._privelemdict = {
 }
 window._superclassnames = []
 window._privpropdict = {
-	'bounds' : _Prop_bounds,
-	'closeable' : _Prop_closeable,
-	'floating' : _Prop_floating,
-	'index' : _Prop_index,
-	'modal' : _Prop_modal,
-	'resizable' : _Prop_resizable,
-	'titled' : _Prop_titled,
-	'visible' : _Prop_visible,
-	'zoomable' : _Prop_zoomable,
-	'zoomed' : _Prop_zoomed,
+    'bounds' : _Prop_bounds,
+    'closeable' : _Prop_closeable,
+    'floating' : _Prop_floating,
+    'index' : _Prop_index,
+    'modal' : _Prop_modal,
+    'resizable' : _Prop_resizable,
+    'titled' : _Prop_titled,
+    'visible' : _Prop_visible,
+    'zoomable' : _Prop_zoomable,
+    'zoomed' : _Prop_zoomed,
 }
 window._privelemdict = {
 }
 document._superclassnames = []
 document._privpropdict = {
-	'modified' : _Prop_modified,
+    'modified' : _Prop_modified,
 }
 document._privelemdict = {
 }
 file._superclassnames = []
 file._privpropdict = {
-	'stationery' : _Prop_stationery,
+    'stationery' : _Prop_stationery,
 }
 file._privelemdict = {
 }
 class _3c_(aetools.NComparison):
-	"""< - Less than """
+    """< - Less than """
 class _3d_(aetools.NComparison):
-	"""= - Equal """
+    """= - Equal """
 class _3e_(aetools.NComparison):
-	"""> - Greater than """
+    """> - Greater than """
 class contains(aetools.NComparison):
-	"""contains - Contains """
+    """contains - Contains """
 class ends_with(aetools.NComparison):
-	"""ends with - Ends with """
+    """ends with - Ends with """
 class starts_with(aetools.NComparison):
-	"""starts with - Starts with """
+    """starts with - Starts with """
 class _b2_(aetools.NComparison):
-	"""\xb2 - Less than or equal to """
+    """\xb2 - Less than or equal to """
 class _b3_(aetools.NComparison):
-	"""\xb3 - Greater than or equal to """
+    """\xb3 - Greater than or equal to """
 _Enum_kfrm = {
-	'index' : 'indx',	# keyform designating indexed access
-	'named' : 'name',	# keyform designating named access
-	'id' : 'ID  ',	# keyform designating access by unique identifier
+    'index' : 'indx',	# keyform designating indexed access
+    'named' : 'name',	# keyform designating named access
+    'id' : 'ID  ',	# keyform designating access by unique identifier
 }
 
 _Enum_savo = {
-	'yes' : 'yes ',	# Save objects now
-	'no' : 'no  ',	# Do not save objects
-	'ask' : 'ask ',	# Ask the user whether to save
+    'yes' : 'yes ',	# Save objects now
+    'no' : 'no  ',	# Do not save objects
+    'ask' : 'ask ',	# Ask the user whether to save
 }
 
 _Enum_styl = {
-	'plain' : 'plan',	# Plain
-	'bold' : 'bold',	# Bold
-	'italic' : 'ital',	# Italic
-	'outline' : 'outl',	# Outline
-	'shadow' : 'shad',	# Shadow
-	'underline' : 'undl',	# Underline
-	'superscript' : 'spsc',	# Superscript
-	'subscript' : 'sbsc',	# Subscript
-	'strikethrough' : 'strk',	# Strikethrough
-	'small_caps' : 'smcp',	# Small caps
-	'all_caps' : 'alcp',	# All capital letters
-	'all_lowercase' : 'lowc',	# Lowercase
-	'condensed' : 'cond',	# Condensed
-	'expanded' : 'pexp',	# Expanded
-	'hidden' : 'hidn',	# Hidden
+    'plain' : 'plan',	# Plain
+    'bold' : 'bold',	# Bold
+    'italic' : 'ital',	# Italic
+    'outline' : 'outl',	# Outline
+    'shadow' : 'shad',	# Shadow
+    'underline' : 'undl',	# Underline
+    'superscript' : 'spsc',	# Superscript
+    'subscript' : 'sbsc',	# Subscript
+    'strikethrough' : 'strk',	# Strikethrough
+    'small_caps' : 'smcp',	# Small caps
+    'all_caps' : 'alcp',	# All capital letters
+    'all_lowercase' : 'lowc',	# Lowercase
+    'condensed' : 'cond',	# Condensed
+    'expanded' : 'pexp',	# Expanded
+    'hidden' : 'hidn',	# Hidden
 }
 
 
@@ -663,11 +663,49 @@ _Enum_styl = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'alis' : aliases,
-	'capp' : application,
-	'cins' : insertion_points,
-	'csel' : selection_2d_object,
-	'cwin' : window,
-	'docu' : document,
-	'file' : file,
+    'alis' : aliases,
+    'capp' : application,
+    'cins' : insertion_points,
+    'csel' : selection_2d_object,
+    'cwin' : window,
+    'docu' : document,
+    'file' : file,
+}
+
+_propdeclarations = {
+    'hclb' : _Prop_closeable,
+    'imod' : _Prop_modified,
+    'isfl' : _Prop_floating,
+    'iszm' : _Prop_zoomable,
+    'pbnd' : _Prop_bounds,
+    'pcli' : _Prop_clipboard,
+    'pcnt' : _Prop_contents,
+    'pidx' : _Prop_index,
+    'pisf' : _Prop_frontmost,
+    'pmod' : _Prop_modal,
+    'pnam' : _Prop_name,
+    'prsz' : _Prop_resizable,
+    'pspd' : _Prop_stationery,
+    'ptit' : _Prop_titled,
+    'pvis' : _Prop_visible,
+    'pzum' : _Prop_zoomed,
+    'sele' : _Prop_selection,
+    'vers' : _Prop_version,
+}
+
+_compdeclarations = {
+    '<   ' : _3c_,
+    '<=  ' : _b2_,
+    '=   ' : _3d_,
+    '>   ' : _3e_,
+    '>=  ' : _b3_,
+    'bgwt' : starts_with,
+    'cont' : contains,
+    'ends' : ends_with,
+}
+
+_enumdeclarations = {
+    'kfrm' : _Enum_kfrm,
+    'savo' : _Enum_savo,
+    'styl' : _Enum_styl,
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Table_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Table_Suite.py
index 09e326c..d4a00a4 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Table_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Table_Suite.py
@@ -12,54 +12,54 @@ _code = 'tbls'
 
 class Table_Suite_Events:
 
-	pass
+    pass
 
 
 class cell(aetools.ComponentItem):
-	"""cell - A cell """
-	want = 'ccel'
+    """cell - A cell """
+    want = 'ccel'
 class _Prop_formula(aetools.NProperty):
-	"""formula - the formula of the cell """
-	which = 'pfor'
-	want = 'ctxt'
+    """formula - the formula of the cell """
+    which = 'pfor'
+    want = 'ctxt'
 class _Prop_protection(aetools.NProperty):
-	"""protection - Indicates whether value or formula in the cell can be changed """
-	which = 'ppro'
-	want = 'prtn'
+    """protection - Indicates whether value or formula in the cell can be changed """
+    which = 'ppro'
+    want = 'prtn'
 
 cells = cell
 
 class column(aetools.ComponentItem):
-	"""column - A column """
-	want = 'ccol'
+    """column - A column """
+    want = 'ccol'
 class _Prop_name(aetools.NProperty):
-	"""name - the name of the column """
-	which = 'pnam'
-	want = 'itxt'
+    """name - the name of the column """
+    which = 'pnam'
+    want = 'itxt'
 
 columns = column
 
 class rows(aetools.ComponentItem):
-	"""rows -  """
-	want = 'crow'
+    """rows -  """
+    want = 'crow'
 
 row = rows
 
 class tables(aetools.ComponentItem):
-	"""tables -  """
-	want = 'ctbl'
+    """tables -  """
+    want = 'ctbl'
 
 table = tables
 cell._superclassnames = []
 cell._privpropdict = {
-	'formula' : _Prop_formula,
-	'protection' : _Prop_protection,
+    'formula' : _Prop_formula,
+    'protection' : _Prop_protection,
 }
 cell._privelemdict = {
 }
 column._superclassnames = []
 column._privpropdict = {
-	'name' : _Prop_name,
+    'name' : _Prop_name,
 }
 column._privelemdict = {
 }
@@ -74,9 +74,9 @@ tables._privpropdict = {
 tables._privelemdict = {
 }
 _Enum_prtn = {
-	'read_only' : 'nmod',	# Can\xd5t change values or formulas
-	'formulas_protected' : 'fpro',	# Can changes values but not formulas
-	'read_2f_write' : 'modf',	# Can change values and formulas
+    'read_only' : 'nmod',	# Can\xd5t change values or formulas
+    'formulas_protected' : 'fpro',	# Can changes values but not formulas
+    'read_2f_write' : 'modf',	# Can change values and formulas
 }
 
 
@@ -84,8 +84,21 @@ _Enum_prtn = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'ccel' : cell,
-	'ccol' : column,
-	'crow' : rows,
-	'ctbl' : tables,
+    'ccel' : cell,
+    'ccol' : column,
+    'crow' : rows,
+    'ctbl' : tables,
+}
+
+_propdeclarations = {
+    'pfor' : _Prop_formula,
+    'pnam' : _Prop_name,
+    'ppro' : _Prop_protection,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+    'prtn' : _Enum_prtn,
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/Text_Suite.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/Text_Suite.py
index 2d9d84a..47764eb 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Text_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Text_Suite.py
@@ -12,70 +12,70 @@ _code = 'TEXT'
 
 class Text_Suite_Events:
 
-	pass
+    pass
 
 
 class text_flow(aetools.ComponentItem):
-	"""text flow - A contiguous block of text.  Page layout applications call this a \xd4story.\xd5 """
-	want = 'cflo'
+    """text flow - A contiguous block of text.  Page layout applications call this a \xd4story.\xd5 """
+    want = 'cflo'
 class _Prop__3c_inheritance_3e_(aetools.NProperty):
-	"""<inheritance> - inherits some of its properties from this class """
-	which = 'c@#^'
-	want = 'ctxt'
+    """<inheritance> - inherits some of its properties from this class """
+    which = 'c@#^'
+    want = 'ctxt'
 class _Prop_name(aetools.NProperty):
-	"""name - the name """
-	which = 'pnam'
-	want = 'itxt'
+    """name - the name """
+    which = 'pnam'
+    want = 'itxt'
 
 text_flows = text_flow
 
 class character(aetools.ComponentItem):
-	"""character - A character """
-	want = 'cha '
+    """character - A character """
+    want = 'cha '
 
 class line(aetools.ComponentItem):
-	"""line - A line of text """
-	want = 'clin'
+    """line - A line of text """
+    want = 'clin'
 class _Prop_justification(aetools.NProperty):
-	"""justification - the justification of the text """
-	which = 'pjst'
-	want = 'just'
+    """justification - the justification of the text """
+    which = 'pjst'
+    want = 'just'
 
 lines = line
 
 class paragraph(aetools.ComponentItem):
-	"""paragraph - A paragraph """
-	want = 'cpar'
+    """paragraph - A paragraph """
+    want = 'cpar'
 
 paragraphs = paragraph
 
 class text(aetools.ComponentItem):
-	"""text - Text """
-	want = 'ctxt'
+    """text - Text """
+    want = 'ctxt'
 class _Prop_color(aetools.NProperty):
-	"""color - the color of the first character """
-	which = 'colr'
-	want = 'cRGB'
+    """color - the color of the first character """
+    which = 'colr'
+    want = 'cRGB'
 class _Prop_font(aetools.NProperty):
-	"""font - the name of the font of the first character """
-	which = 'font'
-	want = 'ctxt'
+    """font - the name of the font of the first character """
+    which = 'font'
+    want = 'ctxt'
 class _Prop_size(aetools.NProperty):
-	"""size - the size in points of the first character """
-	which = 'ptsz'
-	want = 'fixd'
+    """size - the size in points of the first character """
+    which = 'ptsz'
+    want = 'fixd'
 class _Prop_style(aetools.NProperty):
-	"""style - the text style of the first character of the first character """
-	which = 'txst'
-	want = 'tsty'
+    """style - the text style of the first character of the first character """
+    which = 'txst'
+    want = 'tsty'
 class _Prop_uniform_styles(aetools.NProperty):
-	"""uniform styles - the text styles that are uniform throughout the text """
-	which = 'ustl'
-	want = 'tsty'
+    """uniform styles - the text styles that are uniform throughout the text """
+    which = 'ustl'
+    want = 'tsty'
 class _Prop_writing_code(aetools.NProperty):
-	"""writing code - the script system and language """
-	which = 'psct'
-	want = 'intl'
+    """writing code - the script system and language """
+    which = 'psct'
+    want = 'intl'
 #        element 'cha ' as ['indx']
 #        element 'clin' as ['indx']
 #        element 'cpar' as ['indx']
@@ -83,102 +83,102 @@ class _Prop_writing_code(aetools.NProperty):
 #        element 'cwor' as ['indx']
 
 class word(aetools.ComponentItem):
-	"""word - A word """
-	want = 'cwor'
+    """word - A word """
+    want = 'cwor'
 
 words = word
 
 class text_style_info(aetools.ComponentItem):
-	"""text style info - On and Off styles of text run """
-	want = 'tsty'
+    """text style info - On and Off styles of text run """
+    want = 'tsty'
 class _Prop_off_styles(aetools.NProperty):
-	"""off styles - the styles that are off for the text """
-	which = 'ofst'
-	want = 'styl'
+    """off styles - the styles that are off for the text """
+    which = 'ofst'
+    want = 'styl'
 class _Prop_on_styles(aetools.NProperty):
-	"""on styles - the styles that are on for the text """
-	which = 'onst'
-	want = 'styl'
+    """on styles - the styles that are on for the text """
+    which = 'onst'
+    want = 'styl'
 
 text_style_infos = text_style_info
 text_flow._superclassnames = ['text']
 text_flow._privpropdict = {
-	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
-	'name' : _Prop_name,
+    '_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
+    'name' : _Prop_name,
 }
 text_flow._privelemdict = {
 }
 character._superclassnames = ['text']
 character._privpropdict = {
-	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
+    '_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
 }
 character._privelemdict = {
 }
 line._superclassnames = ['text']
 line._privpropdict = {
-	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
-	'justification' : _Prop_justification,
+    '_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
+    'justification' : _Prop_justification,
 }
 line._privelemdict = {
 }
 paragraph._superclassnames = ['text']
 paragraph._privpropdict = {
-	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
+    '_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
 }
 paragraph._privelemdict = {
 }
 text._superclassnames = []
 text._privpropdict = {
-	'color' : _Prop_color,
-	'font' : _Prop_font,
-	'size' : _Prop_size,
-	'style' : _Prop_style,
-	'uniform_styles' : _Prop_uniform_styles,
-	'writing_code' : _Prop_writing_code,
+    'color' : _Prop_color,
+    'font' : _Prop_font,
+    'size' : _Prop_size,
+    'style' : _Prop_style,
+    'uniform_styles' : _Prop_uniform_styles,
+    'writing_code' : _Prop_writing_code,
 }
 text._privelemdict = {
-	'character' : character,
-	'line' : line,
-	'paragraph' : paragraph,
-	'text' : text,
-	'word' : word,
+    'character' : character,
+    'line' : line,
+    'paragraph' : paragraph,
+    'text' : text,
+    'word' : word,
 }
 word._superclassnames = ['text']
 word._privpropdict = {
-	'_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
+    '_3c_inheritance_3e_' : _Prop__3c_inheritance_3e_,
 }
 word._privelemdict = {
 }
 text_style_info._superclassnames = []
 text_style_info._privpropdict = {
-	'off_styles' : _Prop_off_styles,
-	'on_styles' : _Prop_on_styles,
+    'off_styles' : _Prop_off_styles,
+    'on_styles' : _Prop_on_styles,
 }
 text_style_info._privelemdict = {
 }
 _Enum_just = {
-	'left' : 'left',	# Align with left margin
-	'right' : 'rght',	# Align with right margin
-	'center' : 'cent',	# Align with center
-	'full' : 'full',	# Align with both left and right margins
+    'left' : 'left',	# Align with left margin
+    'right' : 'rght',	# Align with right margin
+    'center' : 'cent',	# Align with center
+    'full' : 'full',	# Align with both left and right margins
 }
 
 _Enum_styl = {
-	'plain' : 'plan',	# Plain
-	'bold' : 'bold',	# Bold
-	'italic' : 'ital',	# Italic
-	'outline' : 'outl',	# Outline
-	'shadow' : 'shad',	# Shadow
-	'underline' : 'undl',	# Underline
-	'superscript' : 'spsc',	# Superscript
-	'subscript' : 'sbsc',	# Subscript
-	'strikethrough' : 'strk',	# Strikethrough
-	'small_caps' : 'smcp',	# Small caps
-	'all_caps' : 'alcp',	# All capital letters
-	'all_lowercase' : 'lowc',	# Lowercase
-	'condensed' : 'cond',	# Condensed
-	'expanded' : 'pexp',	# Expanded
-	'hidden' : 'hidn',	# Hidden
+    'plain' : 'plan',	# Plain
+    'bold' : 'bold',	# Bold
+    'italic' : 'ital',	# Italic
+    'outline' : 'outl',	# Outline
+    'shadow' : 'shad',	# Shadow
+    'underline' : 'undl',	# Underline
+    'superscript' : 'spsc',	# Superscript
+    'subscript' : 'sbsc',	# Subscript
+    'strikethrough' : 'strk',	# Strikethrough
+    'small_caps' : 'smcp',	# Small caps
+    'all_caps' : 'alcp',	# All capital letters
+    'all_lowercase' : 'lowc',	# Lowercase
+    'condensed' : 'cond',	# Condensed
+    'expanded' : 'pexp',	# Expanded
+    'hidden' : 'hidn',	# Hidden
 }
 
 
@@ -186,11 +186,33 @@ _Enum_styl = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'cflo' : text_flow,
-	'cha ' : character,
-	'clin' : line,
-	'cpar' : paragraph,
-	'ctxt' : text,
-	'cwor' : word,
-	'tsty' : text_style_info,
+    'cflo' : text_flow,
+    'cha ' : character,
+    'clin' : line,
+    'cpar' : paragraph,
+    'ctxt' : text,
+    'cwor' : word,
+    'tsty' : text_style_info,
+}
+
+_propdeclarations = {
+    'c@#^' : _Prop__3c_inheritance_3e_,
+    'colr' : _Prop_color,
+    'font' : _Prop_font,
+    'ofst' : _Prop_off_styles,
+    'onst' : _Prop_on_styles,
+    'pjst' : _Prop_justification,
+    'pnam' : _Prop_name,
+    'psct' : _Prop_writing_code,
+    'ptsz' : _Prop_size,
+    'txst' : _Prop_style,
+    'ustl' : _Prop_uniform_styles,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+    'just' : _Enum_just,
+    'styl' : _Enum_styl,
 }
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 1b42dae..7a04a0d 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/Type_Names_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/Type_Names_Suite.py
@@ -12,172 +12,172 @@ _code = 'tpnm'
 
 class Type_Names_Suite_Events:
 
-	pass
+    pass
 
 
 class PostScript_picture(aetools.ComponentItem):
-	"""PostScript picture -  """
-	want = 'EPS '
+    """PostScript picture -  """
+    want = 'EPS '
 
 class point(aetools.ComponentItem):
-	"""point - point coordinates """
-	want = 'QDpt'
+    """point - point coordinates """
+    want = 'QDpt'
 
 class string(aetools.ComponentItem):
-	"""string - a string of characters """
-	want = 'TEXT'
+    """string - a string of characters """
+    want = 'TEXT'
 
 plain_text = string
 
 plain_text = string
 
 class TIFF_picture(aetools.ComponentItem):
-	"""TIFF picture -  """
-	want = 'TIFF'
+    """TIFF picture -  """
+    want = 'TIFF'
 
 class application_dictionary(aetools.ComponentItem):
-	"""application dictionary -  """
-	want = 'aete'
+    """application dictionary -  """
+    want = 'aete'
 
 class system_dictionary(aetools.ComponentItem):
-	"""system dictionary -  """
-	want = 'aeut'
+    """system dictionary -  """
+    want = 'aeut'
 
 class color_table(aetools.ComponentItem):
-	"""color table -  """
-	want = 'clrt'
+    """color table -  """
+    want = 'clrt'
 
 class menu_item(aetools.ComponentItem):
-	"""menu item -  """
-	want = 'cmen'
+    """menu item -  """
+    want = 'cmen'
 
 class menu(aetools.ComponentItem):
-	"""menu -  """
-	want = 'cmnu'
+    """menu -  """
+    want = 'cmnu'
 
 class double_integer(aetools.ComponentItem):
-	"""double integer -  """
-	want = 'comp'
+    """double integer -  """
+    want = 'comp'
 
 class type_element_info(aetools.ComponentItem):
-	"""type element info -  """
-	want = 'elin'
+    """type element info -  """
+    want = 'elin'
 
 class type_event_info(aetools.ComponentItem):
-	"""type event info - information about an event """
-	want = 'evin'
+    """type event info - information about an event """
+    want = 'evin'
 
 class extended_real(aetools.ComponentItem):
-	"""extended real -  """
-	want = 'exte'
+    """extended real -  """
+    want = 'exte'
 
 class fixed(aetools.ComponentItem):
-	"""fixed - a real number """
-	want = 'fixd'
+    """fixed - a real number """
+    want = 'fixd'
 
 class fixed_point(aetools.ComponentItem):
-	"""fixed point -  """
-	want = 'fpnt'
+    """fixed point -  """
+    want = 'fpnt'
 
 class fixed_rectangle(aetools.ComponentItem):
-	"""fixed rectangle -  """
-	want = 'frct'
+    """fixed rectangle -  """
+    want = 'frct'
 
 class type_class_info(aetools.ComponentItem):
-	"""type class info - information about properties and elements of a class """
-	want = 'gcli'
+    """type class info - information about properties and elements of a class """
+    want = 'gcli'
 
 class location_reference(aetools.ComponentItem):
-	"""location reference -  """
-	want = 'insl'
+    """location reference -  """
+    want = 'insl'
 
 class long_fixed_point(aetools.ComponentItem):
-	"""long fixed point -  """
-	want = 'lfpt'
+    """long fixed point -  """
+    want = 'lfpt'
 
 class long_fixed_rectangle(aetools.ComponentItem):
-	"""long fixed rectangle -  """
-	want = 'lfrc'
+    """long fixed rectangle -  """
+    want = 'lfrc'
 
 class long_fixed(aetools.ComponentItem):
-	"""long fixed -  """
-	want = 'lfxd'
+    """long fixed -  """
+    want = 'lfxd'
 
 class long_point(aetools.ComponentItem):
-	"""long point -  """
-	want = 'lpnt'
+    """long point -  """
+    want = 'lpnt'
 
 class long_rectangle(aetools.ComponentItem):
-	"""long rectangle -  """
-	want = 'lrct'
+    """long rectangle -  """
+    want = 'lrct'
 
 class machine_location(aetools.ComponentItem):
-	"""machine location -  """
-	want = 'mLoc'
+    """machine location -  """
+    want = 'mLoc'
 
 class unsigned_integer(aetools.ComponentItem):
-	"""unsigned integer -  """
-	want = 'magn'
+    """unsigned integer -  """
+    want = 'magn'
 
 class null(aetools.ComponentItem):
-	"""null -  """
-	want = 'null'
+    """null -  """
+    want = 'null'
 
 class type_property_info(aetools.ComponentItem):
-	"""type property info -  """
-	want = 'pinf'
+    """type property info -  """
+    want = 'pinf'
 
 class type_parameter_info(aetools.ComponentItem):
-	"""type parameter info -  """
-	want = 'pmin'
+    """type parameter info -  """
+    want = 'pmin'
 
 class bounding_rectangle(aetools.ComponentItem):
-	"""bounding rectangle - bounding rectangle """
-	want = 'qdrt'
+    """bounding rectangle - bounding rectangle """
+    want = 'qdrt'
 
 class small_integer(aetools.ComponentItem):
-	"""small integer -  """
-	want = 'shor'
+    """small integer -  """
+    want = 'shor'
 
 class small_real(aetools.ComponentItem):
-	"""small real -  """
-	want = 'sing'
+    """small real -  """
+    want = 'sing'
 
 class scrap_styles(aetools.ComponentItem):
-	"""scrap styles -  """
-	want = 'styl'
+    """scrap styles -  """
+    want = 'styl'
 
 class type_suite_info(aetools.ComponentItem):
-	"""type suite info -  """
-	want = 'suin'
+    """type suite info -  """
+    want = 'suin'
 
 class target_id(aetools.ComponentItem):
-	"""target id -  """
-	want = 'targ'
+    """target id -  """
+    want = 'targ'
 
 class dash_style(aetools.ComponentItem):
-	"""dash style -  """
-	want = 'tdas'
+    """dash style -  """
+    want = 'tdas'
 
 class pixel_map_record(aetools.ComponentItem):
-	"""pixel map record -  """
-	want = 'tpmm'
+    """pixel map record -  """
+    want = 'tpmm'
 
 class RGB16_color(aetools.ComponentItem):
-	"""RGB16 color -  """
-	want = 'tr16'
+    """RGB16 color -  """
+    want = 'tr16'
 
 class RGB96_color(aetools.ComponentItem):
-	"""RGB96 color -  """
-	want = 'tr96'
+    """RGB96 color -  """
+    want = 'tr96'
 
 class rotation(aetools.ComponentItem):
-	"""rotation -  """
-	want = 'trot'
+    """rotation -  """
+    want = 'trot'
 
 class version(aetools.ComponentItem):
-	"""version -  """
-	want = 'vers'
+    """version -  """
+    want = 'vers'
 PostScript_picture._superclassnames = []
 PostScript_picture._privpropdict = {
 }
@@ -383,44 +383,53 @@ version._privelemdict = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'EPS ' : PostScript_picture,
-	'QDpt' : point,
-	'TEXT' : string,
-	'TIFF' : TIFF_picture,
-	'aete' : application_dictionary,
-	'aeut' : system_dictionary,
-	'clrt' : color_table,
-	'cmen' : menu_item,
-	'cmnu' : menu,
-	'comp' : double_integer,
-	'elin' : type_element_info,
-	'evin' : type_event_info,
-	'exte' : extended_real,
-	'fixd' : fixed,
-	'fpnt' : fixed_point,
-	'frct' : fixed_rectangle,
-	'gcli' : type_class_info,
-	'insl' : location_reference,
-	'lfpt' : long_fixed_point,
-	'lfrc' : long_fixed_rectangle,
-	'lfxd' : long_fixed,
-	'lpnt' : long_point,
-	'lrct' : long_rectangle,
-	'mLoc' : machine_location,
-	'magn' : unsigned_integer,
-	'null' : null,
-	'pinf' : type_property_info,
-	'pmin' : type_parameter_info,
-	'qdrt' : bounding_rectangle,
-	'shor' : small_integer,
-	'sing' : small_real,
-	'styl' : scrap_styles,
-	'suin' : type_suite_info,
-	'targ' : target_id,
-	'tdas' : dash_style,
-	'tpmm' : pixel_map_record,
-	'tr16' : RGB16_color,
-	'tr96' : RGB96_color,
-	'trot' : rotation,
-	'vers' : version,
+    'EPS ' : PostScript_picture,
+    'QDpt' : point,
+    'TEXT' : string,
+    'TIFF' : TIFF_picture,
+    'aete' : application_dictionary,
+    'aeut' : system_dictionary,
+    'clrt' : color_table,
+    'cmen' : menu_item,
+    'cmnu' : menu,
+    'comp' : double_integer,
+    'elin' : type_element_info,
+    'evin' : type_event_info,
+    'exte' : extended_real,
+    'fixd' : fixed,
+    'fpnt' : fixed_point,
+    'frct' : fixed_rectangle,
+    'gcli' : type_class_info,
+    'insl' : location_reference,
+    'lfpt' : long_fixed_point,
+    'lfrc' : long_fixed_rectangle,
+    'lfxd' : long_fixed,
+    'lpnt' : long_point,
+    'lrct' : long_rectangle,
+    'mLoc' : machine_location,
+    'magn' : unsigned_integer,
+    'null' : null,
+    'pinf' : type_property_info,
+    'pmin' : type_parameter_info,
+    'qdrt' : bounding_rectangle,
+    'shor' : small_integer,
+    'sing' : small_real,
+    'styl' : scrap_styles,
+    'suin' : type_suite_info,
+    'targ' : target_id,
+    'tdas' : dash_style,
+    'tpmm' : pixel_map_record,
+    'tr16' : RGB16_color,
+    'tr96' : RGB96_color,
+    'trot' : rotation,
+    'vers' : version,
+}
+
+_propdeclarations = {
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
index 20c775b..21a289a 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
@@ -16,29 +16,29 @@ import Type_Names_Suite
 
 
 _code_to_module = {
-	'TEXT' : Text_Suite,
-	'ascr' : AppleScript_Suite,
-	'core' : Standard_Suite,
-	'macc' : Macintosh_Connectivity_Clas,
-	'qdrw' : QuickDraw_Graphics_Suite,
-	'qdsp' : QuickDraw_Graphics_Suppleme,
-	'reqd' : Required_Suite,
-	'tbls' : Table_Suite,
-	'tpnm' : Type_Names_Suite,
+    'TEXT' : Text_Suite,
+    'ascr' : AppleScript_Suite,
+    'core' : Standard_Suite,
+    'macc' : Macintosh_Connectivity_Clas,
+    'qdrw' : QuickDraw_Graphics_Suite,
+    'qdsp' : QuickDraw_Graphics_Suppleme,
+    'reqd' : Required_Suite,
+    'tbls' : Table_Suite,
+    'tpnm' : Type_Names_Suite,
 }
 
 
 
 _code_to_fullname = {
-	'TEXT' : ('StdSuites.Text_Suite', 'Text_Suite'),
-	'ascr' : ('StdSuites.AppleScript_Suite', 'AppleScript_Suite'),
-	'core' : ('StdSuites.Standard_Suite', 'Standard_Suite'),
-	'macc' : ('StdSuites.Macintosh_Connectivity_Clas', 'Macintosh_Connectivity_Clas'),
-	'qdrw' : ('StdSuites.QuickDraw_Graphics_Suite', 'QuickDraw_Graphics_Suite'),
-	'qdsp' : ('StdSuites.QuickDraw_Graphics_Suppleme', 'QuickDraw_Graphics_Suppleme'),
-	'reqd' : ('StdSuites.Required_Suite', 'Required_Suite'),
-	'tbls' : ('StdSuites.Table_Suite', 'Table_Suite'),
-	'tpnm' : ('StdSuites.Type_Names_Suite', 'Type_Names_Suite'),
+    'TEXT' : ('StdSuites.Text_Suite', 'Text_Suite'),
+    'ascr' : ('StdSuites.AppleScript_Suite', 'AppleScript_Suite'),
+    'core' : ('StdSuites.Standard_Suite', 'Standard_Suite'),
+    'macc' : ('StdSuites.Macintosh_Connectivity_Clas', 'Macintosh_Connectivity_Clas'),
+    'qdrw' : ('StdSuites.QuickDraw_Graphics_Suite', 'QuickDraw_Graphics_Suite'),
+    'qdsp' : ('StdSuites.QuickDraw_Graphics_Suppleme', 'QuickDraw_Graphics_Suppleme'),
+    'reqd' : ('StdSuites.Required_Suite', 'Required_Suite'),
+    'tbls' : ('StdSuites.Table_Suite', 'Table_Suite'),
+    'tpnm' : ('StdSuites.Type_Names_Suite', 'Type_Names_Suite'),
 }
 
 from Text_Suite import *
@@ -52,16 +52,16 @@ from Table_Suite import *
 from Type_Names_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', {}))
+    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
 
@@ -263,210 +263,210 @@ getbaseclasses(row)
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'jul ' : July,
-	'may ' : May,
-	'TEXT' : string,
-	'cmet' : cubic_metres,
-	'STXT' : styled_text,
-	'nds ' : number_2c__date_or_text,
-	'feet' : feet,
-	'feb ' : February,
-	'nmbr' : number,
-	'mile' : miles,
-	'kprs' : keystroke,
-	'psct' : writing_code,
-	'degf' : degrees_Fahrenheit,
-	'lrs ' : list_2c__record_or_text,
-	'ldt ' : date,
-	'litr' : litres,
-	'nd  ' : number_or_date,
-	'cmtr' : centimetres,
-	'evnt' : event,
-	'pstr' : Pascal_string,
-	'zone' : zone,
-	'PICT' : picture,
-	'ls  ' : list_or_string,
-	'long' : integer,
-	'sf  ' : alias_or_string,
-	'citl' : writing_code_info,
-	'citm' : text_item,
-	'mach' : machine,
-	'type' : type_class,
-	'prep' : preposition,
-	'tue ' : Tuesday,
-	'case' : upper_case,
-	'vers' : version,
-	'wed ' : Wednesday,
-	'dec ' : December,
-	'sqkm' : square_kilometres,
-	'obj ' : reference,
-	'vect' : vector,
-	'wkdy' : weekday,
-	'cRGB' : RGB_color,
-	'sun ' : Sunday,
-	'itxt' : international_text,
-	'scnd' : seconds,
-	'mar ' : March,
-	'kmtr' : kilometres,
-	'sqft' : square_feet,
-	'list' : list,
-	'doub' : real,
-	'nov ' : November,
-	'qrts' : quarts,
-	'degc' : degrees_Celsius,
-	'msng' : missing_value,
-	'alis' : alias,
-	'jan ' : January,
-	'metr' : metres,
-	'mnth' : month,
-	'ns  ' : number_or_string,
-	'jun ' : June,
-	'aug ' : August,
-	'llst' : linked_list,
-	'styl' : styled_Clipboard_text,
-	'encs' : encoded_string,
-	'galn' : gallons,
-	'cuin' : cubic_inches,
-	'fri ' : Friday,
-	'sutx' : styled_Unicode_text,
-	'lr  ' : list_or_record,
-	'degk' : degrees_Kelvin,
-	'mon ' : Monday,
-	'snd ' : sound,
-	'pcls' : class_,
-	'kgrm' : kilograms,
-	'scpt' : script,
-	'****' : anything,
-	'prop' : property,
-	'reco' : record,
-	'bool' : boolean,
-	'oct ' : October,
-	'sqrm' : square_metres,
-	'inch' : inches,
-	'kfrm' : reference_form,
-	'cobj' : item,
-	'gram' : grams,
-	'cha ' : character,
-	'apr ' : April,
-	'undf' : empty_ae_name_,
-	'capp' : app,
-	'enum' : constant,
-	'hand' : handler,
-	'sqmi' : square_miles,
-	'rdat' : data,
-	'cstr' : C_string,
-	'utxt' : Unicode_text,
-	'thu ' : Thursday,
-	'sqyd' : square_yards,
-	'yard' : yards,
-	'cyrd' : cubic_yards,
-	'ozs ' : ounces,
-	'lbs ' : pounds,
-	'cfet' : cubic_feet,
-	'ccmt' : cubic_centimetres,
-	'sat ' : Saturday,
-	'sep ' : September,
-	'fss ' : file_specification,
-	'ctxt' : text,
-	'cwin' : window,
-	'file' : file,
-	'csel' : selection_2d_object,
-	'alis' : alias,
-	'capp' : application,
-	'cins' : insertion_point,
-	'docu' : document,
-	'shor' : small_integer,
-	'tr16' : RGB16_color,
-	'vers' : version,
-	'aeut' : system_dictionary,
-	'clrt' : color_table,
-	'fpnt' : fixed_point,
-	'TEXT' : plain_text,
-	'elin' : type_element_info,
-	'insl' : location_reference,
-	'mLoc' : machine_location,
-	'EPS ' : PostScript_picture,
-	'QDpt' : point,
-	'cmen' : menu_item,
-	'tpmm' : pixel_map_record,
-	'aete' : application_dictionary,
-	'magn' : unsigned_integer,
-	'cmnu' : menu,
-	'frct' : fixed_rectangle,
-	'lfrc' : long_fixed_rectangle,
-	'evin' : type_event_info,
-	'sing' : small_real,
-	'suin' : type_suite_info,
-	'trot' : rotation,
-	'pmin' : type_parameter_info,
-	'fixd' : fixed,
-	'styl' : scrap_styles,
-	'lpnt' : long_point,
-	'gcli' : type_class_info,
-	'TIFF' : TIFF_picture,
-	'tr96' : RGB96_color,
-	'tdas' : dash_style,
-	'exte' : extended_real,
-	'pinf' : type_property_info,
-	'lfpt' : long_fixed_point,
-	'lrct' : long_rectangle,
-	'qdrt' : bounding_rectangle,
-	'comp' : double_integer,
-	'lfxd' : long_fixed,
-	'null' : null,
-	'targ' : target_id,
-	'cpar' : paragraph,
-	'cha ' : character,
-	'cflo' : text_flow,
-	'tsty' : text_style_info,
-	'clin' : line,
-	'cwor' : word,
-	'ctxt' : text,
-	'cpic' : graphic_group,
-	'covl' : oval,
-	'cgtx' : graphic_text,
-	'cgsh' : graphic_shape,
-	'glin' : graphic_line,
-	'cgob' : graphic_object,
-	'cdrw' : drawing_area,
-	'cpgn' : polygon,
-	'cpxl' : pixel,
-	'crrc' : rounded_rectangle,
-	'carc' : arc,
-	'cpix' : pixel_map,
-	'crec' : rectangle,
-	'cpic' : graphic_group,
-	'cdrw' : drawing_area,
-	'cat ' : AppleTalk_address,
-	'cadr' : address_specification,
-	'ctok' : Token_Ring_address,
-	'cfw ' : FireWire_address,
-	'cbus' : bus_slot,
-	'cscs' : SCSI_address,
-	'cadb' : ADB_address,
-	'cusb' : USB_address,
-	'cdev' : device_specification,
-	'clt ' : LocalTalk_address,
-	'cip ' : IP_address,
-	'cen ' : Ethernet_address,
-	'ccel' : cell,
-	'ccol' : column,
-	'ctbl' : table,
-	'crow' : row,
+    'jul ' : July,
+    'may ' : May,
+    'TEXT' : string,
+    'cmet' : cubic_metres,
+    'STXT' : styled_text,
+    'nds ' : number_2c__date_or_text,
+    'feet' : feet,
+    'feb ' : February,
+    'nmbr' : number,
+    'mile' : miles,
+    'kprs' : keystroke,
+    'psct' : writing_code,
+    'degf' : degrees_Fahrenheit,
+    'lrs ' : list_2c__record_or_text,
+    'ldt ' : date,
+    'litr' : litres,
+    'nd  ' : number_or_date,
+    'cmtr' : centimetres,
+    'evnt' : event,
+    'pstr' : Pascal_string,
+    'zone' : zone,
+    'PICT' : picture,
+    'ls  ' : list_or_string,
+    'long' : integer,
+    'sf  ' : alias_or_string,
+    'citl' : writing_code_info,
+    'citm' : text_item,
+    'mach' : machine,
+    'type' : type_class,
+    'prep' : preposition,
+    'tue ' : Tuesday,
+    'case' : upper_case,
+    'vers' : version,
+    'wed ' : Wednesday,
+    'dec ' : December,
+    'sqkm' : square_kilometres,
+    'obj ' : reference,
+    'vect' : vector,
+    'wkdy' : weekday,
+    'cRGB' : RGB_color,
+    'sun ' : Sunday,
+    'itxt' : international_text,
+    'scnd' : seconds,
+    'mar ' : March,
+    'kmtr' : kilometres,
+    'sqft' : square_feet,
+    'list' : list,
+    'doub' : real,
+    'nov ' : November,
+    'qrts' : quarts,
+    'degc' : degrees_Celsius,
+    'msng' : missing_value,
+    'alis' : alias,
+    'jan ' : January,
+    'metr' : metres,
+    'mnth' : month,
+    'ns  ' : number_or_string,
+    'jun ' : June,
+    'aug ' : August,
+    'llst' : linked_list,
+    'styl' : styled_Clipboard_text,
+    'encs' : encoded_string,
+    'galn' : gallons,
+    'cuin' : cubic_inches,
+    'fri ' : Friday,
+    'sutx' : styled_Unicode_text,
+    'lr  ' : list_or_record,
+    'degk' : degrees_Kelvin,
+    'mon ' : Monday,
+    'snd ' : sound,
+    'pcls' : class_,
+    'kgrm' : kilograms,
+    'scpt' : script,
+    '****' : anything,
+    'prop' : property,
+    'reco' : record,
+    'bool' : boolean,
+    'oct ' : October,
+    'sqrm' : square_metres,
+    'inch' : inches,
+    'kfrm' : reference_form,
+    'cobj' : item,
+    'gram' : grams,
+    'cha ' : character,
+    'apr ' : April,
+    'undf' : empty_ae_name_,
+    'capp' : app,
+    'enum' : constant,
+    'hand' : handler,
+    'sqmi' : square_miles,
+    'rdat' : data,
+    'cstr' : C_string,
+    'utxt' : Unicode_text,
+    'thu ' : Thursday,
+    'sqyd' : square_yards,
+    'yard' : yards,
+    'cyrd' : cubic_yards,
+    'ozs ' : ounces,
+    'lbs ' : pounds,
+    'cfet' : cubic_feet,
+    'ccmt' : cubic_centimetres,
+    'sat ' : Saturday,
+    'sep ' : September,
+    'fss ' : file_specification,
+    'ctxt' : text,
+    'cwin' : window,
+    'file' : file,
+    'csel' : selection_2d_object,
+    'alis' : alias,
+    'capp' : application,
+    'cins' : insertion_point,
+    'docu' : document,
+    'shor' : small_integer,
+    'tr16' : RGB16_color,
+    'vers' : version,
+    'aeut' : system_dictionary,
+    'clrt' : color_table,
+    'fpnt' : fixed_point,
+    'TEXT' : plain_text,
+    'elin' : type_element_info,
+    'insl' : location_reference,
+    'mLoc' : machine_location,
+    'EPS ' : PostScript_picture,
+    'QDpt' : point,
+    'cmen' : menu_item,
+    'tpmm' : pixel_map_record,
+    'aete' : application_dictionary,
+    'magn' : unsigned_integer,
+    'cmnu' : menu,
+    'frct' : fixed_rectangle,
+    'lfrc' : long_fixed_rectangle,
+    'evin' : type_event_info,
+    'sing' : small_real,
+    'suin' : type_suite_info,
+    'trot' : rotation,
+    'pmin' : type_parameter_info,
+    'fixd' : fixed,
+    'styl' : scrap_styles,
+    'lpnt' : long_point,
+    'gcli' : type_class_info,
+    'TIFF' : TIFF_picture,
+    'tr96' : RGB96_color,
+    'tdas' : dash_style,
+    'exte' : extended_real,
+    'pinf' : type_property_info,
+    'lfpt' : long_fixed_point,
+    'lrct' : long_rectangle,
+    'qdrt' : bounding_rectangle,
+    'comp' : double_integer,
+    'lfxd' : long_fixed,
+    'null' : null,
+    'targ' : target_id,
+    'cpar' : paragraph,
+    'cha ' : character,
+    'cflo' : text_flow,
+    'tsty' : text_style_info,
+    'clin' : line,
+    'cwor' : word,
+    'ctxt' : text,
+    'cpic' : graphic_group,
+    'covl' : oval,
+    'cgtx' : graphic_text,
+    'cgsh' : graphic_shape,
+    'glin' : graphic_line,
+    'cgob' : graphic_object,
+    'cdrw' : drawing_area,
+    'cpgn' : polygon,
+    'cpxl' : pixel,
+    'crrc' : rounded_rectangle,
+    'carc' : arc,
+    'cpix' : pixel_map,
+    'crec' : rectangle,
+    'cpic' : graphic_group,
+    'cdrw' : drawing_area,
+    'cat ' : AppleTalk_address,
+    'cadr' : address_specification,
+    'ctok' : Token_Ring_address,
+    'cfw ' : FireWire_address,
+    'cbus' : bus_slot,
+    'cscs' : SCSI_address,
+    'cadb' : ADB_address,
+    'cusb' : USB_address,
+    'cdev' : device_specification,
+    'clt ' : LocalTalk_address,
+    'cip ' : IP_address,
+    'cen ' : Ethernet_address,
+    'ccel' : cell,
+    'ccol' : column,
+    'ctbl' : table,
+    'crow' : row,
 }
 
 
 class StdSuites(Text_Suite_Events,
-		AppleScript_Suite_Events,
-		Standard_Suite_Events,
-		Macintosh_Connectivity_Clas_Events,
-		QuickDraw_Graphics_Suite_Events,
-		QuickDraw_Graphics_Suppleme_Events,
-		Required_Suite_Events,
-		Table_Suite_Events,
-		Type_Names_Suite_Events,
-		aetools.TalkTo):
-	_signature = 'ascr'
+        AppleScript_Suite_Events,
+        Standard_Suite_Events,
+        Macintosh_Connectivity_Clas_Events,
+        QuickDraw_Graphics_Suite_Events,
+        QuickDraw_Graphics_Suppleme_Events,
+        Required_Suite_Events,
+        Table_Suite_Events,
+        Type_Names_Suite_Events,
+        aetools.TalkTo):
+    _signature = 'ascr'
 
-	_moduleName = 'StdSuites'
+    _moduleName = 'StdSuites'
 
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Disk_2d_Folder_2d_File_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Disk_2d_Folder_2d_File_Suite.py
index 548e981..b3e1757 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Disk_2d_Folder_2d_File_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Disk_2d_Folder_2d_File_Suite.py
@@ -12,48 +12,48 @@ _code = 'cdis'
 
 class Disk_2d_Folder_2d_File_Suite_Events:
 
-	_argmap_move = {
-		'to' : 'insh',
-	}
+    _argmap_move = {
+        'to' : 'insh',
+    }
 
-	def move(self, _object, _attributes={}, **_arguments):
-		"""move: Move disk item(s) to a new location.
-		Required argument: the object for the command
-		Keyword argument to: The new location for the disk item(s).
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the reply for the command
-		"""
-		_code = 'core'
-		_subcode = 'move'
+    def move(self, _object, _attributes={}, **_arguments):
+        """move: Move disk item(s) to a new location.
+        Required argument: the object for the command
+        Keyword argument to: The new location for the disk item(s).
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the reply for the command
+        """
+        _code = 'core'
+        _subcode = 'move'
 
-		aetools.keysubst(_arguments, self._argmap_move)
-		_arguments['----'] = _object
+        aetools.keysubst(_arguments, self._argmap_move)
+        _arguments['----'] = _object
 
 
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 class alias(aetools.ComponentItem):
-	"""alias - An alias in the file system """
-	want = 'alis'
+    """alias - An alias in the file system """
+    want = 'alis'
 class _Prop__3c_Inheritance_3e_(aetools.NProperty):
-	"""<Inheritance> - All of the properties of the superclass. """
-	which = 'c@#^'
-	want = 'cobj'
+    """<Inheritance> - All of the properties of the superclass. """
+    which = 'c@#^'
+    want = 'cobj'
 class _Prop_properties(aetools.NProperty):
-	"""properties - every property of the alias """
-	which = 'pALL'
-	want = '****'
+    """properties - every property of the alias """
+    which = 'pALL'
+    want = '****'
 class _Prop_version(aetools.NProperty):
-	"""version - the version of the application bundle referenced by the alias (visible at the bottom of the "Get Info" window) """
-	which = 'vers'
-	want = 'utxt'
+    """version - the version of the application bundle referenced by the alias (visible at the bottom of the "Get Info" window) """
+    which = 'vers'
+    want = 'utxt'
 #        element 'alis' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'cfol' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'cobj' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -62,36 +62,36 @@ class _Prop_version(aetools.NProperty):
 aliases = alias
 
 class disk(aetools.ComponentItem):
-	"""disk - A disk in the file system """
-	want = 'cdis'
+    """disk - A disk in the file system """
+    want = 'cdis'
 class _Prop_capacity(aetools.NProperty):
-	"""capacity - the total number of bytes (free or used) on the disk """
-	which = 'capa'
-	want = 'magn'
+    """capacity - the total number of bytes (free or used) on the disk """
+    which = 'capa'
+    want = 'magn'
 class _Prop_ejectable(aetools.NProperty):
-	"""ejectable - Can the media be ejected (floppies, CD's, and so on)? """
-	which = 'isej'
-	want = 'bool'
+    """ejectable - Can the media be ejected (floppies, CD's, and so on)? """
+    which = 'isej'
+    want = 'bool'
 class _Prop_format(aetools.NProperty):
-	"""format - the file system format of this disk """
-	which = 'dfmt'
-	want = 'edfm'
+    """format - the file system format of this disk """
+    which = 'dfmt'
+    want = 'edfm'
 class _Prop_free_space(aetools.NProperty):
-	"""free space - the number of free bytes left on the disk """
-	which = 'frsp'
-	want = 'magn'
+    """free space - the number of free bytes left on the disk """
+    which = 'frsp'
+    want = 'magn'
 class _Prop_ignore_privileges(aetools.NProperty):
-	"""ignore privileges - Ignore permissions on this disk? """
-	which = 'igpr'
-	want = 'bool'
+    """ignore privileges - Ignore permissions on this disk? """
+    which = 'igpr'
+    want = 'bool'
 class _Prop_local_volume(aetools.NProperty):
-	"""local volume - Is the media a local volume (as opposed to a file server)? """
-	which = 'isrv'
-	want = 'bool'
+    """local volume - Is the media a local volume (as opposed to a file server)? """
+    which = 'isrv'
+    want = 'bool'
 class _Prop_startup(aetools.NProperty):
-	"""startup - Is this disk the boot disk? """
-	which = 'istd'
-	want = 'bool'
+    """startup - Is this disk the boot disk? """
+    which = 'istd'
+    want = 'bool'
 #        element 'alis' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'cfol' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'cobj' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -100,8 +100,8 @@ class _Prop_startup(aetools.NProperty):
 disks = disk
 
 class folder(aetools.ComponentItem):
-	"""folder - A folder in the file system """
-	want = 'cfol'
+    """folder - A folder in the file system """
+    want = 'cfol'
 #        element 'alis' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'cfol' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'cobj' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -110,178 +110,178 @@ class folder(aetools.ComponentItem):
 folders = folder
 
 class item(aetools.ComponentItem):
-	"""item - An item in the file system """
-	want = 'cobj'
+    """item - An item in the file system """
+    want = 'cobj'
 class _Prop_POSIX_path(aetools.NProperty):
-	"""POSIX path - the POSIX file system path of the item """
-	which = 'posx'
-	want = 'utxt'
+    """POSIX path - the POSIX file system path of the item """
+    which = 'posx'
+    want = 'utxt'
 class _Prop_busy_status(aetools.NProperty):
-	"""busy status - Is the item busy? """
-	which = 'busy'
-	want = 'bool'
+    """busy status - Is the item busy? """
+    which = 'busy'
+    want = 'bool'
 class _Prop_creation_date(aetools.NProperty):
-	"""creation date - the date on which the item was created """
-	which = 'ascd'
-	want = '****'
+    """creation date - the date on which the item was created """
+    which = 'ascd'
+    want = '****'
 class _Prop_displayed_name(aetools.NProperty):
-	"""displayed name - the name of the item as displayed in the User Interface """
-	which = 'dnam'
-	want = 'utxt'
+    """displayed name - the name of the item as displayed in the User Interface """
+    which = 'dnam'
+    want = 'utxt'
 class _Prop_modification_date(aetools.NProperty):
-	"""modification date - the date on which the item was last modified """
-	which = 'asmo'
-	want = '****'
+    """modification date - the date on which the item was last modified """
+    which = 'asmo'
+    want = '****'
 class _Prop_name(aetools.NProperty):
-	"""name - the name of the item """
-	which = 'pnam'
-	want = 'utxt'
+    """name - the name of the item """
+    which = 'pnam'
+    want = 'utxt'
 class _Prop_name_extension(aetools.NProperty):
-	"""name extension - the extension portion of the name """
-	which = 'extn'
-	want = 'utxt'
+    """name extension - the extension portion of the name """
+    which = 'extn'
+    want = 'utxt'
 class _Prop_package_folder(aetools.NProperty):
-	"""package folder - Is the item a package? """
-	which = 'pkgf'
-	want = 'bool'
+    """package folder - Is the item a package? """
+    which = 'pkgf'
+    want = 'bool'
 class _Prop_path(aetools.NProperty):
-	"""path - the file system path of the item """
-	which = 'ppth'
-	want = 'utxt'
+    """path - the file system path of the item """
+    which = 'ppth'
+    want = 'utxt'
 class _Prop_url(aetools.NProperty):
-	"""url - the url of the item """
-	which = 'url '
-	want = 'utxt'
+    """url - the url of the item """
+    which = 'url '
+    want = 'utxt'
 class _Prop_visible(aetools.NProperty):
-	"""visible - Is the item visible? """
-	which = 'pvis'
-	want = 'bool'
+    """visible - Is the item visible? """
+    which = 'pvis'
+    want = 'bool'
 class _Prop_volume(aetools.NProperty):
-	"""volume - the volume on which the item resides """
-	which = 'volu'
-	want = 'utxt'
+    """volume - the volume on which the item resides """
+    which = 'volu'
+    want = 'utxt'
 
 items = item
 
 class file(aetools.ComponentItem):
-	"""file - A file in the file system """
-	want = 'file'
+    """file - A file in the file system """
+    want = 'file'
 class _Prop_creator_type(aetools.NProperty):
-	"""creator type - the OSType identifying the application that created the file """
-	which = 'fcrt'
-	want = 'utxt'
+    """creator type - the OSType identifying the application that created the file """
+    which = 'fcrt'
+    want = 'utxt'
 class _Prop_file_type(aetools.NProperty):
-	"""file type - the OSType identifying the type of data contained in the file """
-	which = 'asty'
-	want = 'utxt'
+    """file type - the OSType identifying the type of data contained in the file """
+    which = 'asty'
+    want = 'utxt'
 class _Prop_physical_size(aetools.NProperty):
-	"""physical size - the actual space used by the file on disk """
-	which = 'phys'
-	want = '****'
+    """physical size - the actual space used by the file on disk """
+    which = 'phys'
+    want = '****'
 class _Prop_product_version(aetools.NProperty):
-	"""product version - the version of the product (visible at the top of the "Get Info" window) """
-	which = 'ver2'
-	want = 'utxt'
+    """product version - the version of the product (visible at the top of the "Get Info" window) """
+    which = 'ver2'
+    want = 'utxt'
 class _Prop_size(aetools.NProperty):
-	"""size - the logical size of the file """
-	which = 'ptsz'
-	want = '****'
+    """size - the logical size of the file """
+    which = 'ptsz'
+    want = '****'
 class _Prop_stationery(aetools.NProperty):
-	"""stationery - Is the file a stationery pad? """
-	which = 'pspd'
-	want = 'bool'
+    """stationery - Is the file a stationery pad? """
+    which = 'pspd'
+    want = 'bool'
 
 files = file
 alias._superclassnames = ['item']
 alias._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'properties' : _Prop_properties,
-	'version' : _Prop_version,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'properties' : _Prop_properties,
+    'version' : _Prop_version,
 }
 alias._privelemdict = {
-	'alias' : alias,
-	'file' : file,
-	'folder' : folder,
-	'item' : item,
+    'alias' : alias,
+    'file' : file,
+    'folder' : folder,
+    'item' : item,
 }
 disk._superclassnames = ['item']
 disk._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'capacity' : _Prop_capacity,
-	'ejectable' : _Prop_ejectable,
-	'format' : _Prop_format,
-	'free_space' : _Prop_free_space,
-	'ignore_privileges' : _Prop_ignore_privileges,
-	'local_volume' : _Prop_local_volume,
-	'properties' : _Prop_properties,
-	'startup' : _Prop_startup,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'capacity' : _Prop_capacity,
+    'ejectable' : _Prop_ejectable,
+    'format' : _Prop_format,
+    'free_space' : _Prop_free_space,
+    'ignore_privileges' : _Prop_ignore_privileges,
+    'local_volume' : _Prop_local_volume,
+    'properties' : _Prop_properties,
+    'startup' : _Prop_startup,
 }
 disk._privelemdict = {
-	'alias' : alias,
-	'file' : file,
-	'folder' : folder,
-	'item' : item,
+    'alias' : alias,
+    'file' : file,
+    'folder' : folder,
+    'item' : item,
 }
 folder._superclassnames = ['item']
 folder._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'properties' : _Prop_properties,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'properties' : _Prop_properties,
 }
 folder._privelemdict = {
-	'alias' : alias,
-	'file' : file,
-	'folder' : folder,
-	'item' : item,
+    'alias' : alias,
+    'file' : file,
+    'folder' : folder,
+    'item' : item,
 }
 item._superclassnames = []
 item._privpropdict = {
-	'POSIX_path' : _Prop_POSIX_path,
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'busy_status' : _Prop_busy_status,
-	'creation_date' : _Prop_creation_date,
-	'displayed_name' : _Prop_displayed_name,
-	'modification_date' : _Prop_modification_date,
-	'name' : _Prop_name,
-	'name_extension' : _Prop_name_extension,
-	'package_folder' : _Prop_package_folder,
-	'path' : _Prop_path,
-	'properties' : _Prop_properties,
-	'url' : _Prop_url,
-	'visible' : _Prop_visible,
-	'volume' : _Prop_volume,
+    'POSIX_path' : _Prop_POSIX_path,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'busy_status' : _Prop_busy_status,
+    'creation_date' : _Prop_creation_date,
+    'displayed_name' : _Prop_displayed_name,
+    'modification_date' : _Prop_modification_date,
+    'name' : _Prop_name,
+    'name_extension' : _Prop_name_extension,
+    'package_folder' : _Prop_package_folder,
+    'path' : _Prop_path,
+    'properties' : _Prop_properties,
+    'url' : _Prop_url,
+    'visible' : _Prop_visible,
+    'volume' : _Prop_volume,
 }
 item._privelemdict = {
 }
 file._superclassnames = ['item']
 file._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'creator_type' : _Prop_creator_type,
-	'file_type' : _Prop_file_type,
-	'physical_size' : _Prop_physical_size,
-	'product_version' : _Prop_product_version,
-	'properties' : _Prop_properties,
-	'size' : _Prop_size,
-	'stationery' : _Prop_stationery,
-	'version' : _Prop_version,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'creator_type' : _Prop_creator_type,
+    'file_type' : _Prop_file_type,
+    'physical_size' : _Prop_physical_size,
+    'product_version' : _Prop_product_version,
+    'properties' : _Prop_properties,
+    'size' : _Prop_size,
+    'stationery' : _Prop_stationery,
+    'version' : _Prop_version,
 }
 file._privelemdict = {
 }
 _Enum_edfm = {
-	'MS_2d_DOS_format' : 'dfms',	# MS-DOS format
-	'Apple_Photo_format' : 'dfph',	# Apple Photo format
-	'ISO_9660_format' : 'df96',	# ISO 9660 format
-	'QuickTake_format' : 'dfqt',	# QuickTake format
-	'AppleShare_format' : 'dfas',	# AppleShare format
-	'High_Sierra_format' : 'dfhs',	# High Sierra format
-	'Mac_OS_Extended_format' : 'dfh+',	# Mac OS Extended format
-	'UDF_format' : 'dfud',	# UDF format
-	'unknown_format' : 'df??',	# unknown format
-	'audio_format' : 'dfau',	# audio format
-	'Mac_OS_format' : 'dfhf',	# Mac OS format
-	'UFS_format' : 'dfuf',	# UFS format
-	'NFS_format' : 'dfnf',	# NFS format
-	'ProDOS_format' : 'dfpr',	# ProDOS format
-	'WebDAV_format' : 'dfwd',	# WebDAV format
+    'MS_2d_DOS_format' : 'dfms',	# MS-DOS format
+    'Apple_Photo_format' : 'dfph',	# Apple Photo format
+    'ISO_9660_format' : 'df96',	# ISO 9660 format
+    'QuickTake_format' : 'dfqt',	# QuickTake format
+    'AppleShare_format' : 'dfas',	# AppleShare format
+    'High_Sierra_format' : 'dfhs',	# High Sierra format
+    'Mac_OS_Extended_format' : 'dfh+',	# Mac OS Extended format
+    'UDF_format' : 'dfud',	# UDF format
+    'unknown_format' : 'df??',	# unknown format
+    'audio_format' : 'dfau',	# audio format
+    'Mac_OS_format' : 'dfhf',	# Mac OS format
+    'UFS_format' : 'dfuf',	# UFS format
+    'NFS_format' : 'dfnf',	# NFS format
+    'ProDOS_format' : 'dfpr',	# ProDOS format
+    'WebDAV_format' : 'dfwd',	# WebDAV format
 }
 
 
@@ -289,9 +289,47 @@ _Enum_edfm = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'alis' : alias,
-	'cdis' : disk,
-	'cfol' : folder,
-	'cobj' : item,
-	'file' : file,
+    'alis' : alias,
+    'cdis' : disk,
+    'cfol' : folder,
+    'cobj' : item,
+    'file' : file,
+}
+
+_propdeclarations = {
+    'ascd' : _Prop_creation_date,
+    'asmo' : _Prop_modification_date,
+    'asty' : _Prop_file_type,
+    'busy' : _Prop_busy_status,
+    'c@#^' : _Prop__3c_Inheritance_3e_,
+    'capa' : _Prop_capacity,
+    'dfmt' : _Prop_format,
+    'dnam' : _Prop_displayed_name,
+    'extn' : _Prop_name_extension,
+    'fcrt' : _Prop_creator_type,
+    'frsp' : _Prop_free_space,
+    'igpr' : _Prop_ignore_privileges,
+    'isej' : _Prop_ejectable,
+    'isrv' : _Prop_local_volume,
+    'istd' : _Prop_startup,
+    'pALL' : _Prop_properties,
+    'phys' : _Prop_physical_size,
+    'pkgf' : _Prop_package_folder,
+    'pnam' : _Prop_name,
+    'posx' : _Prop_POSIX_path,
+    'ppth' : _Prop_path,
+    'pspd' : _Prop_stationery,
+    'ptsz' : _Prop_size,
+    'pvis' : _Prop_visible,
+    'url ' : _Prop_url,
+    'ver2' : _Prop_product_version,
+    'vers' : _Prop_version,
+    'volu' : _Prop_volume,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+    'edfm' : _Enum_edfm,
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Folder_Actions_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Folder_Actions_Suite.py
index 680cd1d..fda155d 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Folder_Actions_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Folder_Actions_Suite.py
@@ -12,210 +12,210 @@ _code = 'faco'
 
 class Folder_Actions_Suite_Events:
 
-	_argmap_attach_action_to = {
-		'using' : 'faal',
-	}
-
-	def attach_action_to(self, _object, _attributes={}, **_arguments):
-		"""attach action to: Attach an action to a folder
-		Required argument: the object for the command
-		Keyword argument using: a file containing the script to attach
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the reply for the command
-		"""
-		_code = 'faco'
-		_subcode = 'atfa'
-
-		aetools.keysubst(_arguments, self._argmap_attach_action_to)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def attached_scripts(self, _object, _attributes={}, **_arguments):
-		"""attached scripts: List the actions attached to a folder
-		Required argument: the object for the command
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the reply for the command
-		"""
-		_code = 'faco'
-		_subcode = 'lact'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_do_folder_action = {
-		'with_window_size' : 'fnsz',
-		'with_item_list' : 'flst',
-		'folder_action_code' : 'actn',
-	}
-
-	def do_folder_action(self, _object, _attributes={}, **_arguments):
-		"""do folder action: Event the Finder sends to the Folder Actions FBA
-		Required argument: the object for the command
-		Keyword argument with_window_size: the new window size for the folder action message to process
-		Keyword argument with_item_list: a list of items for the folder action message to process
-		Keyword argument folder_action_code: the folder action message to process
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the reply for the command
-		"""
-		_code = 'faco'
-		_subcode = 'fola'
-
-		aetools.keysubst(_arguments, self._argmap_do_folder_action)
-		_arguments['----'] = _object
-
-		aetools.enumsubst(_arguments, 'actn', _Enum_actn)
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_edit_action_of = {
-		'using_action_name' : 'snam',
-		'using_action_number' : 'indx',
-	}
-
-	def edit_action_of(self, _object, _attributes={}, **_arguments):
-		"""edit action of: Edit as action of a folder
-		Required argument: the object for the command
-		Keyword argument using_action_name: ...or the name of the action to edit
-		Keyword argument using_action_number: the index number of the action to edit...
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the reply for the command
-		"""
-		_code = 'faco'
-		_subcode = 'edfa'
-
-		aetools.keysubst(_arguments, self._argmap_edit_action_of)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_remove_action_from = {
-		'using_action_name' : 'snam',
-		'using_action_number' : 'indx',
-	}
-
-	def remove_action_from(self, _object, _attributes={}, **_arguments):
-		"""remove action from: Remove a folder action from a folder
-		Required argument: the object for the command
-		Keyword argument using_action_name: ...or the name of the action to remove
-		Keyword argument using_action_number: the index number of the action to remove...
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the reply for the command
-		"""
-		_code = 'faco'
-		_subcode = 'rmfa'
-
-		aetools.keysubst(_arguments, self._argmap_remove_action_from)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    _argmap_attach_action_to = {
+        'using' : 'faal',
+    }
+
+    def attach_action_to(self, _object, _attributes={}, **_arguments):
+        """attach action to: Attach an action to a folder
+        Required argument: the object for the command
+        Keyword argument using: a file containing the script to attach
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the reply for the command
+        """
+        _code = 'faco'
+        _subcode = 'atfa'
+
+        aetools.keysubst(_arguments, self._argmap_attach_action_to)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def attached_scripts(self, _object, _attributes={}, **_arguments):
+        """attached scripts: List the actions attached to a folder
+        Required argument: the object for the command
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the reply for the command
+        """
+        _code = 'faco'
+        _subcode = 'lact'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_do_folder_action = {
+        'with_window_size' : 'fnsz',
+        'with_item_list' : 'flst',
+        'folder_action_code' : 'actn',
+    }
+
+    def do_folder_action(self, _object, _attributes={}, **_arguments):
+        """do folder action: Event the Finder sends to the Folder Actions FBA
+        Required argument: the object for the command
+        Keyword argument with_window_size: the new window size for the folder action message to process
+        Keyword argument with_item_list: a list of items for the folder action message to process
+        Keyword argument folder_action_code: the folder action message to process
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the reply for the command
+        """
+        _code = 'faco'
+        _subcode = 'fola'
+
+        aetools.keysubst(_arguments, self._argmap_do_folder_action)
+        _arguments['----'] = _object
+
+        aetools.enumsubst(_arguments, 'actn', _Enum_actn)
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_edit_action_of = {
+        'using_action_name' : 'snam',
+        'using_action_number' : 'indx',
+    }
+
+    def edit_action_of(self, _object, _attributes={}, **_arguments):
+        """edit action of: Edit as action of a folder
+        Required argument: the object for the command
+        Keyword argument using_action_name: ...or the name of the action to edit
+        Keyword argument using_action_number: the index number of the action to edit...
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the reply for the command
+        """
+        _code = 'faco'
+        _subcode = 'edfa'
+
+        aetools.keysubst(_arguments, self._argmap_edit_action_of)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_remove_action_from = {
+        'using_action_name' : 'snam',
+        'using_action_number' : 'indx',
+    }
+
+    def remove_action_from(self, _object, _attributes={}, **_arguments):
+        """remove action from: Remove a folder action from a folder
+        Required argument: the object for the command
+        Keyword argument using_action_name: ...or the name of the action to remove
+        Keyword argument using_action_number: the index number of the action to remove...
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the reply for the command
+        """
+        _code = 'faco'
+        _subcode = 'rmfa'
+
+        aetools.keysubst(_arguments, self._argmap_remove_action_from)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 class folder_action(aetools.ComponentItem):
-	"""folder action - An action attached to a folder in the file system """
-	want = 'foac'
+    """folder action - An action attached to a folder in the file system """
+    want = 'foac'
 class _Prop__3c_Inheritance_3e_(aetools.NProperty):
-	"""<Inheritance> - All of the properties of the superclass. """
-	which = 'c@#^'
-	want = 'cobj'
+    """<Inheritance> - All of the properties of the superclass. """
+    which = 'c@#^'
+    want = 'cobj'
 class _Prop_enabled(aetools.NProperty):
-	"""enabled - Is the folder action enabled? """
-	which = 'enaB'
-	want = 'bool'
+    """enabled - Is the folder action enabled? """
+    which = 'enaB'
+    want = 'bool'
 class _Prop_name(aetools.NProperty):
-	"""name - the name of the folder action, which is also the name of the folder """
-	which = 'pnam'
-	want = 'utxt'
+    """name - the name of the folder action, which is also the name of the folder """
+    which = 'pnam'
+    want = 'utxt'
 class _Prop_path(aetools.NProperty):
-	"""path - the path to the folder to which the folder action applies """
-	which = 'ppth'
-	want = '****'
+    """path - the path to the folder to which the folder action applies """
+    which = 'ppth'
+    want = '****'
 class _Prop_properties(aetools.NProperty):
-	"""properties - every property of the folder action """
-	which = 'pALL'
-	want = '****'
+    """properties - every property of the folder action """
+    which = 'pALL'
+    want = '****'
 class _Prop_volume(aetools.NProperty):
-	"""volume - the volume on which the folder action resides """
-	which = 'volu'
-	want = 'utxt'
+    """volume - the volume on which the folder action resides """
+    which = 'volu'
+    want = 'utxt'
 #        element 'scpt' as ['name', 'indx', 'rele', 'rang', 'test']
 
 folder_actions = folder_action
 
 class script(aetools.ComponentItem):
-	"""script - A script invoked by a folder action """
-	want = 'scpt'
+    """script - A script invoked by a folder action """
+    want = 'scpt'
 class _Prop_POSIX_path(aetools.NProperty):
-	"""POSIX path - the POSIX file system path of the disk """
-	which = 'posx'
-	want = 'utxt'
+    """POSIX path - the POSIX file system path of the disk """
+    which = 'posx'
+    want = 'utxt'
 
 scripts = script
 import Standard_Suite
 folder_action._superclassnames = ['item']
 folder_action._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'enabled' : _Prop_enabled,
-	'name' : _Prop_name,
-	'path' : _Prop_path,
-	'properties' : _Prop_properties,
-	'volume' : _Prop_volume,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'enabled' : _Prop_enabled,
+    'name' : _Prop_name,
+    'path' : _Prop_path,
+    'properties' : _Prop_properties,
+    'volume' : _Prop_volume,
 }
 folder_action._privelemdict = {
-	'script' : script,
+    'script' : script,
 }
 script._superclassnames = ['item']
 script._privpropdict = {
-	'POSIX_path' : _Prop_POSIX_path,
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'name' : _Prop_name,
-	'path' : _Prop_path,
-	'properties' : _Prop_properties,
+    'POSIX_path' : _Prop_POSIX_path,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'name' : _Prop_name,
+    'path' : _Prop_path,
+    'properties' : _Prop_properties,
 }
 script._privelemdict = {
 }
 _Enum_actn = {
-	'items_added' : 'fget',	# items added
-	'items_removed' : 'flos',	# items removed
-	'window_closed' : 'fclo',	# window closed
-	'window_moved' : 'fsiz',	# window moved
-	'window_opened' : 'fopn',	# window opened
+    'items_added' : 'fget',	# items added
+    'items_removed' : 'flos',	# items removed
+    'window_closed' : 'fclo',	# window closed
+    'window_moved' : 'fsiz',	# window moved
+    'window_opened' : 'fopn',	# window opened
 }
 
 
@@ -223,6 +223,23 @@ _Enum_actn = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'foac' : folder_action,
-	'scpt' : script,
+    'foac' : folder_action,
+    'scpt' : script,
+}
+
+_propdeclarations = {
+    'c@#^' : _Prop__3c_Inheritance_3e_,
+    'enaB' : _Prop_enabled,
+    'pALL' : _Prop_properties,
+    'pnam' : _Prop_name,
+    'posx' : _Prop_POSIX_path,
+    'ppth' : _Prop_path,
+    'volu' : _Prop_volume,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+    'actn' : _Enum_actn,
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Hidden_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Hidden_Suite.py
index 16971d7..e80ace1 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Hidden_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Hidden_Suite.py
@@ -13,25 +13,25 @@ _code = 'tpnm'
 from StdSuites.Type_Names_Suite import *
 class Hidden_Suite_Events(Type_Names_Suite_Events):
 
-	def do_script(self, _object, _attributes={}, **_arguments):
-		"""do script: Execute an OSA script.
-		Required argument: the object for the command
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'misc'
-		_subcode = 'dosc'
+    def do_script(self, _object, _attributes={}, **_arguments):
+        """do script: Execute an OSA script.
+        Required argument: the object for the command
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'misc'
+        _subcode = 'dosc'
 
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
 
 
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 #
@@ -39,3 +39,12 @@ class Hidden_Suite_Events(Type_Names_Suite_Events):
 #
 _classdeclarations = {
 }
+
+_propdeclarations = {
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+}
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Login_Items_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Login_Items_Suite.py
index 4ab4911..ed09245 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Login_Items_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Login_Items_Suite.py
@@ -12,42 +12,42 @@ _code = 'logi'
 
 class Login_Items_Suite_Events:
 
-	pass
+    pass
 
 
 class login_item(aetools.ComponentItem):
-	"""login item - an item to be launched or opened at login """
-	want = 'logi'
+    """login item - an item to be launched or opened at login """
+    want = 'logi'
 class _Prop__3c_Inheritance_3e_(aetools.NProperty):
-	"""<Inheritance> - All of the properties of the superclass. """
-	which = 'c@#^'
-	want = 'cobj'
+    """<Inheritance> - All of the properties of the superclass. """
+    which = 'c@#^'
+    want = 'cobj'
 class _Prop_hidden(aetools.NProperty):
-	"""hidden - Is the Login Item hidden when launched? """
-	which = 'hidn'
-	want = 'bool'
+    """hidden - Is the Login Item hidden when launched? """
+    which = 'hidn'
+    want = 'bool'
 class _Prop_kind(aetools.NProperty):
-	"""kind - the file type of the Login Item """
-	which = 'kind'
-	want = 'utxt'
+    """kind - the file type of the Login Item """
+    which = 'kind'
+    want = 'utxt'
 class _Prop_name(aetools.NProperty):
-	"""name - the name of the Login Item """
-	which = 'pnam'
-	want = 'utxt'
+    """name - the name of the Login Item """
+    which = 'pnam'
+    want = 'utxt'
 class _Prop_path(aetools.NProperty):
-	"""path - the file system path to the Login Item """
-	which = 'ppth'
-	want = 'utxt'
+    """path - the file system path to the Login Item """
+    which = 'ppth'
+    want = 'utxt'
 
 login_items = login_item
 import Standard_Suite
 login_item._superclassnames = ['item']
 login_item._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'hidden' : _Prop_hidden,
-	'kind' : _Prop_kind,
-	'name' : _Prop_name,
-	'path' : _Prop_path,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'hidden' : _Prop_hidden,
+    'kind' : _Prop_kind,
+    'name' : _Prop_name,
+    'path' : _Prop_path,
 }
 login_item._privelemdict = {
 }
@@ -56,5 +56,19 @@ login_item._privelemdict = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'logi' : login_item,
+    'logi' : login_item,
+}
+
+_propdeclarations = {
+    'c@#^' : _Prop__3c_Inheritance_3e_,
+    'hidn' : _Prop_hidden,
+    'kind' : _Prop_kind,
+    'pnam' : _Prop_name,
+    'ppth' : _Prop_path,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Power_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Power_Suite.py
index 8eecdd0..b32e1c7 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Power_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Power_Suite.py
@@ -12,65 +12,65 @@ _code = 'powr'
 
 class Power_Suite_Events:
 
-	def restart(self, _object, _attributes={}, **_arguments):
-		"""restart: Restart the computer
-		Required argument: the object for the command
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'fndr'
-		_subcode = 'rest'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def shut_down(self, _object, _attributes={}, **_arguments):
-		"""shut down: Shut Down the computer
-		Required argument: the object for the command
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'fndr'
-		_subcode = 'shut'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def sleep(self, _object, _attributes={}, **_arguments):
-		"""sleep: Put the computer to sleep
-		Required argument: the object for the command
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'fndr'
-		_subcode = 'slep'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    def restart(self, _object, _attributes={}, **_arguments):
+        """restart: Restart the computer
+        Required argument: the object for the command
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'fndr'
+        _subcode = 'rest'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def shut_down(self, _object, _attributes={}, **_arguments):
+        """shut down: Shut Down the computer
+        Required argument: the object for the command
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'fndr'
+        _subcode = 'shut'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def sleep(self, _object, _attributes={}, **_arguments):
+        """sleep: Put the computer to sleep
+        Required argument: the object for the command
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'fndr'
+        _subcode = 'slep'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 #
@@ -78,3 +78,12 @@ class Power_Suite_Events:
 #
 _classdeclarations = {
 }
+
+_propdeclarations = {
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+}
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Processes_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Processes_Suite.py
index ce9562c..1104e0b 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Processes_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Processes_Suite.py
@@ -12,225 +12,225 @@ _code = 'prcs'
 
 class Processes_Suite_Events:
 
-	def cancel(self, _object, _attributes={}, **_arguments):
-		"""cancel: cause the target process to behave as if the UI element were cancelled
-		Required argument: the object for the command
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'prcs'
-		_subcode = 'cncl'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_click = {
-		'at' : 'insh',
-	}
-
-	def click(self, _object, _attributes={}, **_arguments):
-		"""click: cause the target process to behave as if the UI element were clicked
-		Required argument: the object for the command
-		Keyword argument at: when sent to a "process" object, the { x, y } location at which to click, in global coordinates
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'prcs'
-		_subcode = 'clic'
-
-		aetools.keysubst(_arguments, self._argmap_click)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def confirm(self, _object, _attributes={}, **_arguments):
-		"""confirm: cause the target process to behave as if the UI element were confirmed
-		Required argument: the object for the command
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'prcs'
-		_subcode = 'cnfm'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def decrement(self, _object, _attributes={}, **_arguments):
-		"""decrement: cause the target process to behave as if the UI element were decremented
-		Required argument: the object for the command
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'prcs'
-		_subcode = 'decr'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def increment(self, _object, _attributes={}, **_arguments):
-		"""increment: cause the target process to behave as if the UI element were incremented
-		Required argument: the object for the command
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'prcs'
-		_subcode = 'incE'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def key_down(self, _object, _attributes={}, **_arguments):
-		"""key down: cause the target process to behave as if keys were held down
-		Required argument: the object for the command
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'prcs'
-		_subcode = 'keyF'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def key_up(self, _object, _attributes={}, **_arguments):
-		"""key up: cause the target process to behave as if keys were released
-		Required argument: the object for the command
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'prcs'
-		_subcode = 'keyU'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_keystroke = {
-		'with' : 'with',
-	}
-
-	def keystroke(self, _object, _attributes={}, **_arguments):
-		"""keystroke: cause the target process to behave as if keystrokes were entered
-		Required argument: the object for the command
-		Keyword argument with: modifiers with which the keystrokes are to be entered
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'prcs'
-		_subcode = 'kprs'
-
-		aetools.keysubst(_arguments, self._argmap_keystroke)
-		_arguments['----'] = _object
-
-		aetools.enumsubst(_arguments, 'with', _Enum_eMds)
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def pick(self, _object, _attributes={}, **_arguments):
-		"""pick: cause the target process to behave as if the UI element were picked
-		Required argument: the object for the command
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'prcs'
-		_subcode = 'pick'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def select(self, _object, _attributes={}, **_arguments):
-		"""select: set the selected property of the UI element
-		Required argument: the object for the command
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'misc'
-		_subcode = 'slct'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    def cancel(self, _object, _attributes={}, **_arguments):
+        """cancel: cause the target process to behave as if the UI element were cancelled
+        Required argument: the object for the command
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'prcs'
+        _subcode = 'cncl'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_click = {
+        'at' : 'insh',
+    }
+
+    def click(self, _object, _attributes={}, **_arguments):
+        """click: cause the target process to behave as if the UI element were clicked
+        Required argument: the object for the command
+        Keyword argument at: when sent to a "process" object, the { x, y } location at which to click, in global coordinates
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'prcs'
+        _subcode = 'clic'
+
+        aetools.keysubst(_arguments, self._argmap_click)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def confirm(self, _object, _attributes={}, **_arguments):
+        """confirm: cause the target process to behave as if the UI element were confirmed
+        Required argument: the object for the command
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'prcs'
+        _subcode = 'cnfm'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def decrement(self, _object, _attributes={}, **_arguments):
+        """decrement: cause the target process to behave as if the UI element were decremented
+        Required argument: the object for the command
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'prcs'
+        _subcode = 'decr'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def increment(self, _object, _attributes={}, **_arguments):
+        """increment: cause the target process to behave as if the UI element were incremented
+        Required argument: the object for the command
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'prcs'
+        _subcode = 'incE'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def key_down(self, _object, _attributes={}, **_arguments):
+        """key down: cause the target process to behave as if keys were held down
+        Required argument: the object for the command
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'prcs'
+        _subcode = 'keyF'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def key_up(self, _object, _attributes={}, **_arguments):
+        """key up: cause the target process to behave as if keys were released
+        Required argument: the object for the command
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'prcs'
+        _subcode = 'keyU'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_keystroke = {
+        'with' : 'with',
+    }
+
+    def keystroke(self, _object, _attributes={}, **_arguments):
+        """keystroke: cause the target process to behave as if keystrokes were entered
+        Required argument: the object for the command
+        Keyword argument with: modifiers with which the keystrokes are to be entered
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'prcs'
+        _subcode = 'kprs'
+
+        aetools.keysubst(_arguments, self._argmap_keystroke)
+        _arguments['----'] = _object
+
+        aetools.enumsubst(_arguments, 'with', _Enum_eMds)
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def pick(self, _object, _attributes={}, **_arguments):
+        """pick: cause the target process to behave as if the UI element were picked
+        Required argument: the object for the command
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'prcs'
+        _subcode = 'pick'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def select(self, _object, _attributes={}, **_arguments):
+        """select: set the selected property of the UI element
+        Required argument: the object for the command
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'misc'
+        _subcode = 'slct'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 class browser(aetools.ComponentItem):
-	"""browser - A browser belonging to a window """
-	want = 'broW'
+    """browser - A browser belonging to a window """
+    want = 'broW'
 class _Prop__3c_Inheritance_3e_(aetools.NProperty):
-	"""<Inheritance> - All of the properties of the superclass. """
-	which = 'c@#^'
-	want = 'uiel'
+    """<Inheritance> - All of the properties of the superclass. """
+    which = 'c@#^'
+    want = 'uiel'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -276,8 +276,8 @@ class _Prop__3c_Inheritance_3e_(aetools.NProperty):
 browsers = browser
 
 class busy_indicator(aetools.ComponentItem):
-	"""busy indicator - A busy indicator belonging to a window """
-	want = 'busi'
+    """busy indicator - A busy indicator belonging to a window """
+    want = 'busi'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -323,8 +323,8 @@ class busy_indicator(aetools.ComponentItem):
 busy_indicators = busy_indicator
 
 class button(aetools.ComponentItem):
-	"""button - A button belonging to a window or scroll bar """
-	want = 'butT'
+    """button - A button belonging to a window or scroll bar """
+    want = 'butT'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -370,8 +370,8 @@ class button(aetools.ComponentItem):
 buttons = button
 
 class application(aetools.ComponentItem):
-	"""application - A application presenting UI elements """
-	want = 'capp'
+    """application - A application presenting UI elements """
+    want = 'capp'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -417,8 +417,8 @@ class application(aetools.ComponentItem):
 applications = application
 
 class column(aetools.ComponentItem):
-	"""column - A column belonging to a table """
-	want = 'ccol'
+    """column - A column belonging to a table """
+    want = 'ccol'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -464,8 +464,8 @@ class column(aetools.ComponentItem):
 columns = column
 
 class check_box(aetools.ComponentItem):
-	"""check box - A check box belonging to a window """
-	want = 'chbx'
+    """check box - A check box belonging to a window """
+    want = 'chbx'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -511,8 +511,8 @@ class check_box(aetools.ComponentItem):
 check_boxes = check_box
 
 class color_well(aetools.ComponentItem):
-	"""color well - A color well belonging to a window """
-	want = 'colW'
+    """color well - A color well belonging to a window """
+    want = 'colW'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -558,8 +558,8 @@ class color_well(aetools.ComponentItem):
 color_wells = color_well
 
 class combo_box(aetools.ComponentItem):
-	"""combo box - A combo box belonging to a window """
-	want = 'comB'
+    """combo box - A combo box belonging to a window """
+    want = 'comB'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -605,8 +605,8 @@ class combo_box(aetools.ComponentItem):
 combo_boxes = combo_box
 
 class row(aetools.ComponentItem):
-	"""row - A row belonging to a table """
-	want = 'crow'
+    """row - A row belonging to a table """
+    want = 'crow'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -652,8 +652,8 @@ class row(aetools.ComponentItem):
 rows = row
 
 class window(aetools.ComponentItem):
-	"""window - A window belonging to a process """
-	want = 'cwin'
+    """window - A window belonging to a process """
+    want = 'cwin'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -731,8 +731,8 @@ class window(aetools.ComponentItem):
 windows = window
 
 class drawer(aetools.ComponentItem):
-	"""drawer - A drawer that may be extended from a window """
-	want = 'draA'
+    """drawer - A drawer that may be extended from a window """
+    want = 'draA'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -778,8 +778,8 @@ class drawer(aetools.ComponentItem):
 drawers = drawer
 
 class grow_area(aetools.ComponentItem):
-	"""grow area - A grow area belonging to a window """
-	want = 'grow'
+    """grow area - A grow area belonging to a window """
+    want = 'grow'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -825,8 +825,8 @@ class grow_area(aetools.ComponentItem):
 grow_areas = grow_area
 
 class image(aetools.ComponentItem):
-	"""image - An image belonging to a static text field """
-	want = 'imaA'
+    """image - An image belonging to a static text field """
+    want = 'imaA'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -872,8 +872,8 @@ class image(aetools.ComponentItem):
 images = image
 
 class incrementor(aetools.ComponentItem):
-	"""incrementor - A incrementor belonging to a window """
-	want = 'incr'
+    """incrementor - A incrementor belonging to a window """
+    want = 'incr'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -919,8 +919,8 @@ class incrementor(aetools.ComponentItem):
 incrementors = incrementor
 
 class list(aetools.ComponentItem):
-	"""list - A list belonging to a window """
-	want = 'list'
+    """list - A list belonging to a window """
+    want = 'list'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -966,8 +966,8 @@ class list(aetools.ComponentItem):
 lists = list
 
 class menu_bar(aetools.ComponentItem):
-	"""menu bar - A menu bar belonging to a process """
-	want = 'mbar'
+    """menu bar - A menu bar belonging to a process """
+    want = 'mbar'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -1014,8 +1014,8 @@ class menu_bar(aetools.ComponentItem):
 menu_bars = menu_bar
 
 class menu_button(aetools.ComponentItem):
-	"""menu button - A menu button belonging to a window """
-	want = 'menB'
+    """menu button - A menu button belonging to a window """
+    want = 'menB'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -1061,8 +1061,8 @@ class menu_button(aetools.ComponentItem):
 menu_buttons = menu_button
 
 class menu(aetools.ComponentItem):
-	"""menu - A menu belonging to a menu bar """
-	want = 'menE'
+    """menu - A menu belonging to a menu bar """
+    want = 'menE'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -1109,8 +1109,8 @@ class menu(aetools.ComponentItem):
 menus = menu
 
 class menu_item(aetools.ComponentItem):
-	"""menu item - A menu item belonging to a menu """
-	want = 'menI'
+    """menu item - A menu item belonging to a menu """
+    want = 'menI'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -1157,8 +1157,8 @@ class menu_item(aetools.ComponentItem):
 menu_items = menu_item
 
 class outline(aetools.ComponentItem):
-	"""outline - A outline belonging to a window """
-	want = 'outl'
+    """outline - A outline belonging to a window """
+    want = 'outl'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -1204,12 +1204,12 @@ class outline(aetools.ComponentItem):
 outlines = outline
 
 class application_process(aetools.ComponentItem):
-	"""application process - A process launched from an application file """
-	want = 'pcap'
+    """application process - A process launched from an application file """
+    want = 'pcap'
 class _Prop_application_file(aetools.NProperty):
-	"""application file - a reference to the application file from which this process was launched """
-	which = 'appf'
-	want = '****'
+    """application file - a reference to the application file from which this process was launched """
+    which = 'appf'
+    want = '****'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -1257,12 +1257,12 @@ class _Prop_application_file(aetools.NProperty):
 application_processes = application_process
 
 class desk_accessory_process(aetools.ComponentItem):
-	"""desk accessory process - A process launched from an desk accessory file """
-	want = 'pcda'
+    """desk accessory process - A process launched from an desk accessory file """
+    want = 'pcda'
 class _Prop_desk_accessory_file(aetools.NProperty):
-	"""desk accessory file - a reference to the desk accessory file from which this process was launched """
-	which = 'dafi'
-	want = '****'
+    """desk accessory file - a reference to the desk accessory file from which this process was launched """
+    which = 'dafi'
+    want = '****'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -1310,8 +1310,8 @@ class _Prop_desk_accessory_file(aetools.NProperty):
 desk_accessory_processes = desk_accessory_process
 
 class pop_up_button(aetools.ComponentItem):
-	"""pop up button - A pop up button belonging to a window """
-	want = 'popB'
+    """pop up button - A pop up button belonging to a window """
+    want = 'popB'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -1357,64 +1357,64 @@ class pop_up_button(aetools.ComponentItem):
 pop_up_buttons = pop_up_button
 
 class process(aetools.ComponentItem):
-	"""process - A process running on this computer """
-	want = 'prcs'
+    """process - A process running on this computer """
+    want = 'prcs'
 class _Prop_Classic(aetools.NProperty):
-	"""Classic - Is the process running in the Classic environment? """
-	which = 'clsc'
-	want = 'bool'
+    """Classic - Is the process running in the Classic environment? """
+    which = 'clsc'
+    want = 'bool'
 class _Prop_accepts_high_level_events(aetools.NProperty):
-	"""accepts high level events - Is the process high-level event aware (accepts open application, open document, print document, and quit)? """
-	which = 'isab'
-	want = 'bool'
+    """accepts high level events - Is the process high-level event aware (accepts open application, open document, print document, and quit)? """
+    which = 'isab'
+    want = 'bool'
 class _Prop_accepts_remote_events(aetools.NProperty):
-	"""accepts remote events - Does the process accept remote events? """
-	which = 'revt'
-	want = 'bool'
+    """accepts remote events - Does the process accept remote events? """
+    which = 'revt'
+    want = 'bool'
 class _Prop_creator_type(aetools.NProperty):
-	"""creator type - the OSType of the creator of the process (the signature) """
-	which = 'fcrt'
-	want = 'utxt'
+    """creator type - the OSType of the creator of the process (the signature) """
+    which = 'fcrt'
+    want = 'utxt'
 class _Prop_displayed_name(aetools.NProperty):
-	"""displayed name - the name of the file from which the process was launched, as displayed in the User Interface """
-	which = 'dnam'
-	want = 'utxt'
+    """displayed name - the name of the file from which the process was launched, as displayed in the User Interface """
+    which = 'dnam'
+    want = 'utxt'
 class _Prop_file(aetools.NProperty):
-	"""file - the file from which the process was launched """
-	which = 'file'
-	want = '****'
+    """file - the file from which the process was launched """
+    which = 'file'
+    want = '****'
 class _Prop_file_type(aetools.NProperty):
-	"""file type - the OSType of the file type of the process """
-	which = 'asty'
-	want = 'utxt'
+    """file type - the OSType of the file type of the process """
+    which = 'asty'
+    want = 'utxt'
 class _Prop_frontmost(aetools.NProperty):
-	"""frontmost - Is the process the frontmost process """
-	which = 'pisf'
-	want = 'bool'
+    """frontmost - Is the process the frontmost process """
+    which = 'pisf'
+    want = 'bool'
 class _Prop_has_scripting_terminology(aetools.NProperty):
-	"""has scripting terminology - Does the process have a scripting terminology, i.e., can it be scripted? """
-	which = 'hscr'
-	want = 'bool'
+    """has scripting terminology - Does the process have a scripting terminology, i.e., can it be scripted? """
+    which = 'hscr'
+    want = 'bool'
 class _Prop_name(aetools.NProperty):
-	"""name - the name of the process """
-	which = 'pnam'
-	want = 'utxt'
+    """name - the name of the process """
+    which = 'pnam'
+    want = 'utxt'
 class _Prop_partition_space_used(aetools.NProperty):
-	"""partition space used - the number of bytes currently used in the process' partition """
-	which = 'pusd'
-	want = 'magn'
+    """partition space used - the number of bytes currently used in the process' partition """
+    which = 'pusd'
+    want = 'magn'
 class _Prop_properties(aetools.NProperty):
-	"""properties - every property of the process """
-	which = 'pALL'
-	want = '****'
+    """properties - every property of the process """
+    which = 'pALL'
+    want = '****'
 class _Prop_total_partition_size(aetools.NProperty):
-	"""total partition size - the size of the partition with which the process was launched """
-	which = 'appt'
-	want = 'magn'
+    """total partition size - the size of the partition with which the process was launched """
+    which = 'appt'
+    want = 'magn'
 class _Prop_visible(aetools.NProperty):
-	"""visible - Is the process' layer visible? """
-	which = 'pvis'
-	want = 'bool'
+    """visible - Is the process' layer visible? """
+    which = 'pvis'
+    want = 'bool'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -1462,8 +1462,8 @@ class _Prop_visible(aetools.NProperty):
 processes = process
 
 class progress_indicator(aetools.ComponentItem):
-	"""progress indicator - A progress indicator belonging to a window """
-	want = 'proI'
+    """progress indicator - A progress indicator belonging to a window """
+    want = 'proI'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -1509,8 +1509,8 @@ class progress_indicator(aetools.ComponentItem):
 progress_indicators = progress_indicator
 
 class radio_button(aetools.ComponentItem):
-	"""radio button - A radio button belonging to a window """
-	want = 'radB'
+    """radio button - A radio button belonging to a window """
+    want = 'radB'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -1556,8 +1556,8 @@ class radio_button(aetools.ComponentItem):
 radio_buttons = radio_button
 
 class relevance_indicator(aetools.ComponentItem):
-	"""relevance indicator - A relevance indicator belonging to a window """
-	want = 'reli'
+    """relevance indicator - A relevance indicator belonging to a window """
+    want = 'reli'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -1603,8 +1603,8 @@ class relevance_indicator(aetools.ComponentItem):
 relevance_indicators = relevance_indicator
 
 class radio_group(aetools.ComponentItem):
-	"""radio group - A radio button group belonging to a window """
-	want = 'rgrp'
+    """radio group - A radio button group belonging to a window """
+    want = 'rgrp'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -1651,8 +1651,8 @@ class radio_group(aetools.ComponentItem):
 radio_groups = radio_group
 
 class scroll_area(aetools.ComponentItem):
-	"""scroll area - A scroll area belonging to a window """
-	want = 'scra'
+    """scroll area - A scroll area belonging to a window """
+    want = 'scra'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -1698,8 +1698,8 @@ class scroll_area(aetools.ComponentItem):
 scroll_areas = scroll_area
 
 class scroll_bar(aetools.ComponentItem):
-	"""scroll bar - A scroll bar belonging to a window """
-	want = 'scrb'
+    """scroll bar - A scroll bar belonging to a window """
+    want = 'scrb'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -1747,8 +1747,8 @@ class scroll_bar(aetools.ComponentItem):
 scroll_bars = scroll_bar
 
 class group(aetools.ComponentItem):
-	"""group - A group belonging to a window """
-	want = 'sgrp'
+    """group - A group belonging to a window """
+    want = 'sgrp'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -1796,8 +1796,8 @@ class group(aetools.ComponentItem):
 groups = group
 
 class sheet(aetools.ComponentItem):
-	"""sheet - A sheet displayed over a window """
-	want = 'sheE'
+    """sheet - A sheet displayed over a window """
+    want = 'sheE'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -1843,8 +1843,8 @@ class sheet(aetools.ComponentItem):
 sheets = sheet
 
 class slider(aetools.ComponentItem):
-	"""slider - A slider belonging to a window """
-	want = 'sliI'
+    """slider - A slider belonging to a window """
+    want = 'sliI'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -1890,8 +1890,8 @@ class slider(aetools.ComponentItem):
 sliders = slider
 
 class splitter_group(aetools.ComponentItem):
-	"""splitter group - A splitter group belonging to a window """
-	want = 'splg'
+    """splitter group - A splitter group belonging to a window """
+    want = 'splg'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -1937,8 +1937,8 @@ class splitter_group(aetools.ComponentItem):
 splitter_groups = splitter_group
 
 class splitter(aetools.ComponentItem):
-	"""splitter - A splitter belonging to a window """
-	want = 'splr'
+    """splitter - A splitter belonging to a window """
+    want = 'splr'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -1984,8 +1984,8 @@ class splitter(aetools.ComponentItem):
 splitters = splitter
 
 class static_text(aetools.ComponentItem):
-	"""static text - A static text field belonging to a window """
-	want = 'sttx'
+    """static text - A static text field belonging to a window """
+    want = 'sttx'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -2032,8 +2032,8 @@ class static_text(aetools.ComponentItem):
 static_texts = static_text
 
 class system_wide_UI_element(aetools.ComponentItem):
-	"""system wide UI element - The system wide UI element, a container for UI elements that do not belong to a process or application """
-	want = 'sysw'
+    """system wide UI element - The system wide UI element, a container for UI elements that do not belong to a process or application """
+    want = 'sysw'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -2077,8 +2077,8 @@ class system_wide_UI_element(aetools.ComponentItem):
 #        element 'vali' as ['name', 'indx', 'rele', 'rang', 'test']
 
 class tab_group(aetools.ComponentItem):
-	"""tab group - A tab group belonging to a window """
-	want = 'tab '
+    """tab group - A tab group belonging to a window """
+    want = 'tab '
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -2124,8 +2124,8 @@ class tab_group(aetools.ComponentItem):
 tab_groups = tab_group
 
 class table(aetools.ComponentItem):
-	"""table - A table belonging to a window """
-	want = 'tabB'
+    """table - A table belonging to a window """
+    want = 'tabB'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -2171,8 +2171,8 @@ class table(aetools.ComponentItem):
 tables = table
 
 class tool_bar(aetools.ComponentItem):
-	"""tool bar - A tool bar belonging to a window """
-	want = 'tbar'
+    """tool bar - A tool bar belonging to a window """
+    want = 'tbar'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -2218,8 +2218,8 @@ class tool_bar(aetools.ComponentItem):
 tool_bars = tool_bar
 
 class text_area(aetools.ComponentItem):
-	"""text area - A text area belonging to a window """
-	want = 'txta'
+    """text area - A text area belonging to a window """
+    want = 'txta'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -2265,8 +2265,8 @@ class text_area(aetools.ComponentItem):
 text_areas = text_area
 
 class text_field(aetools.ComponentItem):
-	"""text field - A text field belonging to a window """
-	want = 'txtf'
+    """text field - A text field belonging to a window """
+    want = 'txtf'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -2312,68 +2312,68 @@ class text_field(aetools.ComponentItem):
 text_fields = text_field
 
 class UI_element(aetools.ComponentItem):
-	"""UI element - A piece of the user interface of a process """
-	want = 'uiel'
+    """UI element - A piece of the user interface of a process """
+    want = 'uiel'
 class _Prop_class_(aetools.NProperty):
-	"""class - the class of the UI Element, which identifies it function """
-	which = 'pcls'
-	want = 'type'
+    """class - the class of the UI Element, which identifies it function """
+    which = 'pcls'
+    want = 'type'
 class _Prop_description(aetools.NProperty):
-	"""description - a more complete description of the UI element and its capabilities """
-	which = 'desc'
-	want = 'utxt'
+    """description - a more complete description of the UI element and its capabilities """
+    which = 'desc'
+    want = 'utxt'
 class _Prop_enabled(aetools.NProperty):
-	"""enabled - Is the UI element enabled? ( Does it accept clicks? ) """
-	which = 'enab'
-	want = 'bool'
+    """enabled - Is the UI element enabled? ( Does it accept clicks? ) """
+    which = 'enab'
+    want = 'bool'
 class _Prop_focused(aetools.NProperty):
-	"""focused - Is the focus on this UI element? """
-	which = 'focu'
-	want = 'bool'
+    """focused - Is the focus on this UI element? """
+    which = 'focu'
+    want = 'bool'
 class _Prop_help(aetools.NProperty):
-	"""help - an encoded description of the UI element and its capabilities """
-	which = 'help'
-	want = 'utxt'
+    """help - an encoded description of the UI element and its capabilities """
+    which = 'help'
+    want = 'utxt'
 class _Prop_maximum(aetools.NProperty):
-	"""maximum - the maximum vale that the UI element can take on """
-	which = 'maxi'
-	want = 'long'
+    """maximum - the maximum vale that the UI element can take on """
+    which = 'maxi'
+    want = 'long'
 class _Prop_minimum(aetools.NProperty):
-	"""minimum - the minimum vale that the UI element can take on """
-	which = 'mini'
-	want = 'long'
+    """minimum - the minimum vale that the UI element can take on """
+    which = 'mini'
+    want = 'long'
 class _Prop_orientation(aetools.NProperty):
-	"""orientation - the orientation of the UI element """
-	which = 'orie'
-	want = 'utxt'
+    """orientation - the orientation of the UI element """
+    which = 'orie'
+    want = 'utxt'
 class _Prop_position(aetools.NProperty):
-	"""position - the position of the UI element """
-	which = 'posn'
-	want = 'QDpt'
+    """position - the position of the UI element """
+    which = 'posn'
+    want = 'QDpt'
 class _Prop_role(aetools.NProperty):
-	"""role - an encoded description of the UI element and its capabilities """
-	which = 'role'
-	want = 'utxt'
+    """role - an encoded description of the UI element and its capabilities """
+    which = 'role'
+    want = 'utxt'
 class _Prop_selected(aetools.NProperty):
-	"""selected - Is the UI element selected? """
-	which = 'selE'
-	want = '****'
+    """selected - Is the UI element selected? """
+    which = 'selE'
+    want = '****'
 class _Prop_size(aetools.NProperty):
-	"""size - the size of the UI element """
-	which = 'ptsz'
-	want = 'QDpt'
+    """size - the size of the UI element """
+    which = 'ptsz'
+    want = 'QDpt'
 class _Prop_subrole(aetools.NProperty):
-	"""subrole - an encoded description of the UI element and its capabilities """
-	which = 'sbrl'
-	want = 'utxt'
+    """subrole - an encoded description of the UI element and its capabilities """
+    which = 'sbrl'
+    want = 'utxt'
 class _Prop_title(aetools.NProperty):
-	"""title - the title of the UI element as it appears on the screen """
-	which = 'titl'
-	want = 'utxt'
+    """title - the title of the UI element as it appears on the screen """
+    which = 'titl'
+    want = 'utxt'
 class _Prop_value(aetools.NProperty):
-	"""value - the current value of the UI element """
-	which = 'valu'
-	want = 'long'
+    """value - the current value of the UI element """
+    which = 'valu'
+    want = 'long'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -2419,8 +2419,8 @@ class _Prop_value(aetools.NProperty):
 UI_elements = UI_element
 
 class value_indicator(aetools.ComponentItem):
-	"""value indicator - A value indicator ( thumb or slider ) belonging to a scroll bar """
-	want = 'vali'
+    """value indicator - A value indicator ( thumb or slider ) belonging to a scroll bar """
+    want = 'vali'
 #        element 'broW' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'busi' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'butT' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -2466,2164 +2466,2164 @@ class value_indicator(aetools.ComponentItem):
 value_indicators = value_indicator
 browser._superclassnames = ['UI_element']
 browser._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 browser._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 busy_indicator._superclassnames = ['UI_element']
 busy_indicator._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 busy_indicator._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 button._superclassnames = ['UI_element']
 button._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 button._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 application._superclassnames = ['UI_element']
 application._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 application._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 column._superclassnames = ['UI_element']
 column._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 column._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 check_box._superclassnames = ['UI_element']
 check_box._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 check_box._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 color_well._superclassnames = ['UI_element']
 color_well._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 color_well._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 combo_box._superclassnames = ['UI_element']
 combo_box._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 combo_box._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 row._superclassnames = ['UI_element']
 row._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 row._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 window._superclassnames = ['UI_element']
 window._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 window._privelemdict = {
-	'UI_element' : UI_element,
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'button' : button,
-	'check_box' : check_box,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'drawer' : drawer,
-	'group' : group,
-	'group' : group,
-	'grow_area' : grow_area,
-	'grow_area' : grow_area,
-	'image' : image,
-	'image' : image,
-	'incrementor' : incrementor,
-	'incrementor' : incrementor,
-	'list' : list,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'sheet' : sheet,
-	'slider' : slider,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'tab_group' : tab_group,
-	'table' : table,
-	'table' : table,
-	'text_area' : text_area,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'button' : button,
+    'check_box' : check_box,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'drawer' : drawer,
+    'group' : group,
+    'group' : group,
+    'grow_area' : grow_area,
+    'grow_area' : grow_area,
+    'image' : image,
+    'image' : image,
+    'incrementor' : incrementor,
+    'incrementor' : incrementor,
+    'list' : list,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'sheet' : sheet,
+    'slider' : slider,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'tab_group' : tab_group,
+    'table' : table,
+    'table' : table,
+    'text_area' : text_area,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 drawer._superclassnames = ['UI_element']
 drawer._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 drawer._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 grow_area._superclassnames = ['UI_element']
 grow_area._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 grow_area._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 image._superclassnames = ['UI_element']
 image._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 image._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 incrementor._superclassnames = ['UI_element']
 incrementor._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 incrementor._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 list._superclassnames = ['UI_element']
 list._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 list._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 menu_bar._superclassnames = ['UI_element']
 menu_bar._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 menu_bar._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 menu_button._superclassnames = ['UI_element']
 menu_button._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 menu_button._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 menu._superclassnames = ['UI_element']
 menu._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 menu._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 menu_item._superclassnames = ['UI_element']
 menu_item._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 menu_item._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 outline._superclassnames = ['UI_element']
 outline._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 outline._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 application_process._superclassnames = ['process']
 application_process._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'application_file' : _Prop_application_file,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'application_file' : _Prop_application_file,
 }
 application_process._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
+    'window' : window,
 }
 desk_accessory_process._superclassnames = ['process']
 desk_accessory_process._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'desk_accessory_file' : _Prop_desk_accessory_file,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'desk_accessory_file' : _Prop_desk_accessory_file,
 }
 desk_accessory_process._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
+    'window' : window,
 }
 pop_up_button._superclassnames = ['UI_element']
 pop_up_button._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 pop_up_button._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 process._superclassnames = ['UI_element']
 process._privpropdict = {
-	'Classic' : _Prop_Classic,
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'accepts_high_level_events' : _Prop_accepts_high_level_events,
-	'accepts_remote_events' : _Prop_accepts_remote_events,
-	'creator_type' : _Prop_creator_type,
-	'displayed_name' : _Prop_displayed_name,
-	'file' : _Prop_file,
-	'file_type' : _Prop_file_type,
-	'frontmost' : _Prop_frontmost,
-	'has_scripting_terminology' : _Prop_has_scripting_terminology,
-	'name' : _Prop_name,
-	'partition_space_used' : _Prop_partition_space_used,
-	'properties' : _Prop_properties,
-	'total_partition_size' : _Prop_total_partition_size,
-	'visible' : _Prop_visible,
+    'Classic' : _Prop_Classic,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'accepts_high_level_events' : _Prop_accepts_high_level_events,
+    'accepts_remote_events' : _Prop_accepts_remote_events,
+    'creator_type' : _Prop_creator_type,
+    'displayed_name' : _Prop_displayed_name,
+    'file' : _Prop_file,
+    'file_type' : _Prop_file_type,
+    'frontmost' : _Prop_frontmost,
+    'has_scripting_terminology' : _Prop_has_scripting_terminology,
+    'name' : _Prop_name,
+    'partition_space_used' : _Prop_partition_space_used,
+    'properties' : _Prop_properties,
+    'total_partition_size' : _Prop_total_partition_size,
+    'visible' : _Prop_visible,
 }
 process._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
+    'window' : window,
 }
 progress_indicator._superclassnames = ['UI_element']
 progress_indicator._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 progress_indicator._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 radio_button._superclassnames = ['UI_element']
 radio_button._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 radio_button._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 relevance_indicator._superclassnames = ['UI_element']
 relevance_indicator._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 relevance_indicator._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 radio_group._superclassnames = ['UI_element']
 radio_group._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 radio_group._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 scroll_area._superclassnames = ['UI_element']
 scroll_area._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 scroll_area._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 scroll_bar._superclassnames = ['UI_element']
 scroll_bar._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 scroll_bar._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 group._superclassnames = ['UI_element']
 group._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 group._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 sheet._superclassnames = ['UI_element']
 sheet._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 sheet._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 slider._superclassnames = ['UI_element']
 slider._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 slider._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 splitter_group._superclassnames = ['UI_element']
 splitter_group._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 splitter_group._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 splitter._superclassnames = ['UI_element']
 splitter._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 splitter._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 static_text._superclassnames = ['UI_element']
 static_text._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 static_text._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 system_wide_UI_element._superclassnames = ['UI_element']
 system_wide_UI_element._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 system_wide_UI_element._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 tab_group._superclassnames = ['UI_element']
 tab_group._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 tab_group._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 table._superclassnames = ['UI_element']
 table._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 table._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 tool_bar._superclassnames = ['UI_element']
 tool_bar._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 tool_bar._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 text_area._superclassnames = ['UI_element']
 text_area._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 text_area._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 text_field._superclassnames = ['UI_element']
 text_field._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 text_field._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 import Standard_Suite
 UI_element._superclassnames = ['item']
 UI_element._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'class_' : _Prop_class_,
-	'description' : _Prop_description,
-	'enabled' : _Prop_enabled,
-	'focused' : _Prop_focused,
-	'help' : _Prop_help,
-	'maximum' : _Prop_maximum,
-	'minimum' : _Prop_minimum,
-	'name' : _Prop_name,
-	'orientation' : _Prop_orientation,
-	'position' : _Prop_position,
-	'role' : _Prop_role,
-	'selected' : _Prop_selected,
-	'size' : _Prop_size,
-	'subrole' : _Prop_subrole,
-	'title' : _Prop_title,
-	'value' : _Prop_value,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'class_' : _Prop_class_,
+    'description' : _Prop_description,
+    'enabled' : _Prop_enabled,
+    'focused' : _Prop_focused,
+    'help' : _Prop_help,
+    'maximum' : _Prop_maximum,
+    'minimum' : _Prop_minimum,
+    'name' : _Prop_name,
+    'orientation' : _Prop_orientation,
+    'position' : _Prop_position,
+    'role' : _Prop_role,
+    'selected' : _Prop_selected,
+    'size' : _Prop_size,
+    'subrole' : _Prop_subrole,
+    'title' : _Prop_title,
+    'value' : _Prop_value,
 }
 UI_element._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 value_indicator._superclassnames = ['UI_element']
 value_indicator._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 value_indicator._privelemdict = {
-	'UI_element' : UI_element,
-	'application' : application,
-	'browser' : browser,
-	'busy_indicator' : busy_indicator,
-	'button' : button,
-	'check_box' : check_box,
-	'color_well' : color_well,
-	'column' : column,
-	'combo_box' : combo_box,
-	'drawer' : drawer,
-	'group' : group,
-	'grow_area' : grow_area,
-	'image' : image,
-	'incrementor' : incrementor,
-	'list' : list,
-	'menu' : menu,
-	'menu_bar' : menu_bar,
-	'menu_button' : menu_button,
-	'menu_item' : menu_item,
-	'outline' : outline,
-	'pop_up_button' : pop_up_button,
-	'progress_indicator' : progress_indicator,
-	'radio_button' : radio_button,
-	'radio_group' : radio_group,
-	'relevance_indicator' : relevance_indicator,
-	'row' : row,
-	'scroll_area' : scroll_area,
-	'scroll_bar' : scroll_bar,
-	'sheet' : sheet,
-	'slider' : slider,
-	'splitter' : splitter,
-	'splitter_group' : splitter_group,
-	'static_text' : static_text,
-	'system_wide_UI_element' : system_wide_UI_element,
-	'tab_group' : tab_group,
-	'table' : table,
-	'text_area' : text_area,
-	'text_field' : text_field,
-	'tool_bar' : tool_bar,
-	'value_indicator' : value_indicator,
-	'window' : window,
+    'UI_element' : UI_element,
+    'application' : application,
+    'browser' : browser,
+    'busy_indicator' : busy_indicator,
+    'button' : button,
+    'check_box' : check_box,
+    'color_well' : color_well,
+    'column' : column,
+    'combo_box' : combo_box,
+    'drawer' : drawer,
+    'group' : group,
+    'grow_area' : grow_area,
+    'image' : image,
+    'incrementor' : incrementor,
+    'list' : list,
+    'menu' : menu,
+    'menu_bar' : menu_bar,
+    'menu_button' : menu_button,
+    'menu_item' : menu_item,
+    'outline' : outline,
+    'pop_up_button' : pop_up_button,
+    'progress_indicator' : progress_indicator,
+    'radio_button' : radio_button,
+    'radio_group' : radio_group,
+    'relevance_indicator' : relevance_indicator,
+    'row' : row,
+    'scroll_area' : scroll_area,
+    'scroll_bar' : scroll_bar,
+    'sheet' : sheet,
+    'slider' : slider,
+    'splitter' : splitter,
+    'splitter_group' : splitter_group,
+    'static_text' : static_text,
+    'system_wide_UI_element' : system_wide_UI_element,
+    'tab_group' : tab_group,
+    'table' : table,
+    'text_area' : text_area,
+    'text_field' : text_field,
+    'tool_bar' : tool_bar,
+    'value_indicator' : value_indicator,
+    'window' : window,
 }
 _Enum_eMds = {
-	'command_down' : 'Kcmd',	# command down
-	'option_down' : 'Kopt',	# option down
-	'control_down' : 'Kctl',	# control down
-	'shift_down' : 'Ksft',	# shift down
+    'command_down' : 'Kcmd',	# command down
+    'option_down' : 'Kopt',	# option down
+    'control_down' : 'Kctl',	# control down
+    'shift_down' : 'Ksft',	# shift down
 }
 
 _Enum_eMky = {
-	'control' : 'eCnt',	# control
-	'shift' : 'eSft',	# shift
-	'command' : 'eCmd',	# command
-	'option' : 'eOpt',	# option
+    'control' : 'eCnt',	# control
+    'shift' : 'eSft',	# shift
+    'command' : 'eCmd',	# command
+    'option' : 'eOpt',	# option
 }
 
 
@@ -4631,48 +4631,91 @@ _Enum_eMky = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'broW' : browser,
-	'busi' : busy_indicator,
-	'butT' : button,
-	'capp' : application,
-	'ccol' : column,
-	'chbx' : check_box,
-	'colW' : color_well,
-	'comB' : combo_box,
-	'crow' : row,
-	'cwin' : window,
-	'draA' : drawer,
-	'grow' : grow_area,
-	'imaA' : image,
-	'incr' : incrementor,
-	'list' : list,
-	'mbar' : menu_bar,
-	'menB' : menu_button,
-	'menE' : menu,
-	'menI' : menu_item,
-	'outl' : outline,
-	'pcap' : application_process,
-	'pcda' : desk_accessory_process,
-	'popB' : pop_up_button,
-	'prcs' : process,
-	'proI' : progress_indicator,
-	'radB' : radio_button,
-	'reli' : relevance_indicator,
-	'rgrp' : radio_group,
-	'scra' : scroll_area,
-	'scrb' : scroll_bar,
-	'sgrp' : group,
-	'sheE' : sheet,
-	'sliI' : slider,
-	'splg' : splitter_group,
-	'splr' : splitter,
-	'sttx' : static_text,
-	'sysw' : system_wide_UI_element,
-	'tab ' : tab_group,
-	'tabB' : table,
-	'tbar' : tool_bar,
-	'txta' : text_area,
-	'txtf' : text_field,
-	'uiel' : UI_element,
-	'vali' : value_indicator,
+    'broW' : browser,
+    'busi' : busy_indicator,
+    'butT' : button,
+    'capp' : application,
+    'ccol' : column,
+    'chbx' : check_box,
+    'colW' : color_well,
+    'comB' : combo_box,
+    'crow' : row,
+    'cwin' : window,
+    'draA' : drawer,
+    'grow' : grow_area,
+    'imaA' : image,
+    'incr' : incrementor,
+    'list' : list,
+    'mbar' : menu_bar,
+    'menB' : menu_button,
+    'menE' : menu,
+    'menI' : menu_item,
+    'outl' : outline,
+    'pcap' : application_process,
+    'pcda' : desk_accessory_process,
+    'popB' : pop_up_button,
+    'prcs' : process,
+    'proI' : progress_indicator,
+    'radB' : radio_button,
+    'reli' : relevance_indicator,
+    'rgrp' : radio_group,
+    'scra' : scroll_area,
+    'scrb' : scroll_bar,
+    'sgrp' : group,
+    'sheE' : sheet,
+    'sliI' : slider,
+    'splg' : splitter_group,
+    'splr' : splitter,
+    'sttx' : static_text,
+    'sysw' : system_wide_UI_element,
+    'tab ' : tab_group,
+    'tabB' : table,
+    'tbar' : tool_bar,
+    'txta' : text_area,
+    'txtf' : text_field,
+    'uiel' : UI_element,
+    'vali' : value_indicator,
+}
+
+_propdeclarations = {
+    'appf' : _Prop_application_file,
+    'appt' : _Prop_total_partition_size,
+    'asty' : _Prop_file_type,
+    'c@#^' : _Prop__3c_Inheritance_3e_,
+    'clsc' : _Prop_Classic,
+    'dafi' : _Prop_desk_accessory_file,
+    'desc' : _Prop_description,
+    'dnam' : _Prop_displayed_name,
+    'enab' : _Prop_enabled,
+    'fcrt' : _Prop_creator_type,
+    'file' : _Prop_file,
+    'focu' : _Prop_focused,
+    'help' : _Prop_help,
+    'hscr' : _Prop_has_scripting_terminology,
+    'isab' : _Prop_accepts_high_level_events,
+    'maxi' : _Prop_maximum,
+    'mini' : _Prop_minimum,
+    'orie' : _Prop_orientation,
+    'pALL' : _Prop_properties,
+    'pcls' : _Prop_class_,
+    'pisf' : _Prop_frontmost,
+    'pnam' : _Prop_name,
+    'posn' : _Prop_position,
+    'ptsz' : _Prop_size,
+    'pusd' : _Prop_partition_space_used,
+    'pvis' : _Prop_visible,
+    'revt' : _Prop_accepts_remote_events,
+    'role' : _Prop_role,
+    'sbrl' : _Prop_subrole,
+    'selE' : _Prop_selected,
+    'titl' : _Prop_title,
+    'valu' : _Prop_value,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
+    'eMds' : _Enum_eMds,
+    'eMky' : _Enum_eMky,
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Standard_Suite.py
index 27a978e..e772664 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Standard_Suite.py
@@ -12,517 +12,517 @@ _code = '????'
 
 class Standard_Suite_Events:
 
-	_argmap_close = {
-		'saving_in' : 'kfil',
-		'saving' : 'savo',
-	}
-
-	def close(self, _object, _attributes={}, **_arguments):
-		"""close: Close an object.
-		Required argument: the object for the command
-		Keyword argument saving_in: The file in which to save the object.
-		Keyword argument saving: Specifies whether changes should be saved before closing.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'core'
-		_subcode = 'clos'
-
-		aetools.keysubst(_arguments, self._argmap_close)
-		_arguments['----'] = _object
-
-		aetools.enumsubst(_arguments, 'savo', _Enum_savo)
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_count = {
-		'each' : 'kocl',
-	}
-
-	def count(self, _object, _attributes={}, **_arguments):
-		"""count: Return the number of elements of a particular class within an object.
-		Required argument: the object for the command
-		Keyword argument each: The class of objects to be counted.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the reply for the command
-		"""
-		_code = 'core'
-		_subcode = 'cnte'
-
-		aetools.keysubst(_arguments, self._argmap_count)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def delete(self, _object, _attributes={}, **_arguments):
-		"""delete: Delete an object.
-		Required argument: the object for the command
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'core'
-		_subcode = 'delo'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_duplicate = {
-		'to' : 'insh',
-		'with_properties' : 'prdt',
-	}
-
-	def duplicate(self, _object, _attributes={}, **_arguments):
-		"""duplicate: Copy object(s) and put the copies at a new location.
-		Required argument: the object for the command
-		Keyword argument to: The location for the new object(s).
-		Keyword argument with_properties: Properties to be set in the new duplicated object(s).
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'core'
-		_subcode = 'clon'
-
-		aetools.keysubst(_arguments, self._argmap_duplicate)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def exists(self, _object, _attributes={}, **_arguments):
-		"""exists: Verify if an object exists.
-		Required argument: the object for the command
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the reply for the command
-		"""
-		_code = 'core'
-		_subcode = 'doex'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def get(self, _object, _attributes={}, **_arguments):
-		"""get: Get the data for an object.
-		Required argument: the object for the command
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the reply for the command
-		"""
-		_code = 'core'
-		_subcode = 'getd'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_make = {
-		'at' : 'insh',
-		'new' : 'kocl',
-		'with_data' : 'data',
-		'with_properties' : 'prdt',
-	}
-
-	def make(self, _no_object=None, _attributes={}, **_arguments):
-		"""make: Make a new object.
-		Keyword argument at: The location at which to insert the object.
-		Keyword argument new: The class of the new object.
-		Keyword argument with_data: The initial data for the object.
-		Keyword argument with_properties: The initial values for properties of the object.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the reply for the command
-		"""
-		_code = 'core'
-		_subcode = 'crel'
-
-		aetools.keysubst(_arguments, self._argmap_make)
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_move = {
-		'to' : 'insh',
-	}
-
-	def move(self, _object, _attributes={}, **_arguments):
-		"""move: Move object(s) to a new location.
-		Required argument: the object for the command
-		Keyword argument to: The new location for the object(s).
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'core'
-		_subcode = 'move'
-
-		aetools.keysubst(_arguments, self._argmap_move)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def open(self, _object=None, _attributes={}, **_arguments):
-		"""open: Open an object.
-		Required argument: list of objects
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'odoc'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def print_(self, _object=None, _attributes={}, **_arguments):
-		"""print: Print an object.
-		Required argument: list of objects
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'pdoc'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_quit = {
-		'saving' : 'savo',
-	}
-
-	def quit(self, _object, _attributes={}, **_arguments):
-		"""quit: Quit an application.
-		Required argument: the object for the command
-		Keyword argument saving: Specifies whether changes should be saved before quitting.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'quit'
-
-		aetools.keysubst(_arguments, self._argmap_quit)
-		_arguments['----'] = _object
-
-		aetools.enumsubst(_arguments, 'savo', _Enum_savo)
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_save = {
-		'in_' : 'kfil',
-		'as' : 'fltp',
-	}
-
-	def save(self, _object, _attributes={}, **_arguments):
-		"""save: Save an object.
-		Required argument: the object for the command
-		Keyword argument in_: The file in which to save the object.
-		Keyword argument as: The file type in which to save the data.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'core'
-		_subcode = 'save'
-
-		aetools.keysubst(_arguments, self._argmap_save)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_set = {
-		'to' : 'data',
-	}
-
-	def set(self, _object, _attributes={}, **_arguments):
-		"""set: Set an object's data.
-		Required argument: the object for the command
-		Keyword argument to: The new value.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'core'
-		_subcode = 'setd'
-
-		aetools.keysubst(_arguments, self._argmap_set)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    _argmap_close = {
+        'saving_in' : 'kfil',
+        'saving' : 'savo',
+    }
+
+    def close(self, _object, _attributes={}, **_arguments):
+        """close: Close an object.
+        Required argument: the object for the command
+        Keyword argument saving_in: The file in which to save the object.
+        Keyword argument saving: Specifies whether changes should be saved before closing.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'core'
+        _subcode = 'clos'
+
+        aetools.keysubst(_arguments, self._argmap_close)
+        _arguments['----'] = _object
+
+        aetools.enumsubst(_arguments, 'savo', _Enum_savo)
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_count = {
+        'each' : 'kocl',
+    }
+
+    def count(self, _object, _attributes={}, **_arguments):
+        """count: Return the number of elements of a particular class within an object.
+        Required argument: the object for the command
+        Keyword argument each: The class of objects to be counted.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the reply for the command
+        """
+        _code = 'core'
+        _subcode = 'cnte'
+
+        aetools.keysubst(_arguments, self._argmap_count)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def delete(self, _object, _attributes={}, **_arguments):
+        """delete: Delete an object.
+        Required argument: the object for the command
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'core'
+        _subcode = 'delo'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_duplicate = {
+        'to' : 'insh',
+        'with_properties' : 'prdt',
+    }
+
+    def duplicate(self, _object, _attributes={}, **_arguments):
+        """duplicate: Copy object(s) and put the copies at a new location.
+        Required argument: the object for the command
+        Keyword argument to: The location for the new object(s).
+        Keyword argument with_properties: Properties to be set in the new duplicated object(s).
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'core'
+        _subcode = 'clon'
+
+        aetools.keysubst(_arguments, self._argmap_duplicate)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def exists(self, _object, _attributes={}, **_arguments):
+        """exists: Verify if an object exists.
+        Required argument: the object for the command
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the reply for the command
+        """
+        _code = 'core'
+        _subcode = 'doex'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def get(self, _object, _attributes={}, **_arguments):
+        """get: Get the data for an object.
+        Required argument: the object for the command
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the reply for the command
+        """
+        _code = 'core'
+        _subcode = 'getd'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_make = {
+        'at' : 'insh',
+        'new' : 'kocl',
+        'with_data' : 'data',
+        'with_properties' : 'prdt',
+    }
+
+    def make(self, _no_object=None, _attributes={}, **_arguments):
+        """make: Make a new object.
+        Keyword argument at: The location at which to insert the object.
+        Keyword argument new: The class of the new object.
+        Keyword argument with_data: The initial data for the object.
+        Keyword argument with_properties: The initial values for properties of the object.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the reply for the command
+        """
+        _code = 'core'
+        _subcode = 'crel'
+
+        aetools.keysubst(_arguments, self._argmap_make)
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_move = {
+        'to' : 'insh',
+    }
+
+    def move(self, _object, _attributes={}, **_arguments):
+        """move: Move object(s) to a new location.
+        Required argument: the object for the command
+        Keyword argument to: The new location for the object(s).
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'core'
+        _subcode = 'move'
+
+        aetools.keysubst(_arguments, self._argmap_move)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def open(self, _object=None, _attributes={}, **_arguments):
+        """open: Open an object.
+        Required argument: list of objects
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'odoc'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def print_(self, _object=None, _attributes={}, **_arguments):
+        """print: Print an object.
+        Required argument: list of objects
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'pdoc'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_quit = {
+        'saving' : 'savo',
+    }
+
+    def quit(self, _object, _attributes={}, **_arguments):
+        """quit: Quit an application.
+        Required argument: the object for the command
+        Keyword argument saving: Specifies whether changes should be saved before quitting.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'quit'
+
+        aetools.keysubst(_arguments, self._argmap_quit)
+        _arguments['----'] = _object
+
+        aetools.enumsubst(_arguments, 'savo', _Enum_savo)
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_save = {
+        'in_' : 'kfil',
+        'as' : 'fltp',
+    }
+
+    def save(self, _object, _attributes={}, **_arguments):
+        """save: Save an object.
+        Required argument: the object for the command
+        Keyword argument in_: The file in which to save the object.
+        Keyword argument as: The file type in which to save the data.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'core'
+        _subcode = 'save'
+
+        aetools.keysubst(_arguments, self._argmap_save)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_set = {
+        'to' : 'data',
+    }
+
+    def set(self, _object, _attributes={}, **_arguments):
+        """set: Set an object's data.
+        Required argument: the object for the command
+        Keyword argument to: The new value.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'core'
+        _subcode = 'setd'
+
+        aetools.keysubst(_arguments, self._argmap_set)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 class application(aetools.ComponentItem):
-	"""application - An application's top level scripting object. """
-	want = 'capp'
+    """application - An application's top level scripting object. """
+    want = 'capp'
 class _Prop__3c_Inheritance_3e_(aetools.NProperty):
-	"""<Inheritance> - All of the properties of the superclass. """
-	which = 'c@#^'
-	want = 'cobj'
+    """<Inheritance> - All of the properties of the superclass. """
+    which = 'c@#^'
+    want = 'cobj'
 class _Prop_frontmost(aetools.NProperty):
-	"""frontmost - Is this the frontmost (active) application? """
-	which = 'pisf'
-	want = 'bool'
+    """frontmost - Is this the frontmost (active) application? """
+    which = 'pisf'
+    want = 'bool'
 class _Prop_name(aetools.NProperty):
-	"""name - The name of the application. """
-	which = 'pnam'
-	want = 'utxt'
+    """name - The name of the application. """
+    which = 'pnam'
+    want = 'utxt'
 class _Prop_version(aetools.NProperty):
-	"""version - The version of the application. """
-	which = 'vers'
-	want = 'utxt'
+    """version - The version of the application. """
+    which = 'vers'
+    want = 'utxt'
 #        element 'cwin' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'docu' as ['name', 'indx', 'rele', 'rang', 'test']
 
 applications = application
 
 class item(aetools.ComponentItem):
-	"""item - A scriptable object. """
-	want = 'cobj'
+    """item - A scriptable object. """
+    want = 'cobj'
 class _Prop_class_(aetools.NProperty):
-	"""class - The class of the object. """
-	which = 'pcls'
-	want = 'type'
+    """class - The class of the object. """
+    which = 'pcls'
+    want = 'type'
 class _Prop_properties(aetools.NProperty):
-	"""properties - All of the object's properties. """
-	which = 'pALL'
-	want = 'reco'
+    """properties - All of the object's properties. """
+    which = 'pALL'
+    want = 'reco'
 
 items = item
 
 class color(aetools.ComponentItem):
-	"""color - A color. """
-	want = 'colr'
+    """color - A color. """
+    want = 'colr'
 
 colors = color
 
 class window(aetools.ComponentItem):
-	"""window - A window. """
-	want = 'cwin'
+    """window - A window. """
+    want = 'cwin'
 class _Prop_bounds(aetools.NProperty):
-	"""bounds - The bounding rectangle of the window. """
-	which = 'pbnd'
-	want = 'qdrt'
+    """bounds - The bounding rectangle of the window. """
+    which = 'pbnd'
+    want = 'qdrt'
 class _Prop_closeable(aetools.NProperty):
-	"""closeable - Whether the window has a close box. """
-	which = 'hclb'
-	want = 'bool'
+    """closeable - Whether the window has a close box. """
+    which = 'hclb'
+    want = 'bool'
 class _Prop_document(aetools.NProperty):
-	"""document - The document whose contents are being displayed in the window. """
-	which = 'docu'
-	want = 'docu'
+    """document - The document whose contents are being displayed in the window. """
+    which = 'docu'
+    want = 'docu'
 class _Prop_floating(aetools.NProperty):
-	"""floating - Whether the window floats. """
-	which = 'isfl'
-	want = 'bool'
+    """floating - Whether the window floats. """
+    which = 'isfl'
+    want = 'bool'
 class _Prop_id(aetools.NProperty):
-	"""id - The unique identifier of the window. """
-	which = 'ID  '
-	want = 'long'
+    """id - The unique identifier of the window. """
+    which = 'ID  '
+    want = 'long'
 class _Prop_index(aetools.NProperty):
-	"""index - The index of the window in the back-to-front window ordering. """
-	which = 'pidx'
-	want = 'long'
+    """index - The index of the window in the back-to-front window ordering. """
+    which = 'pidx'
+    want = 'long'
 class _Prop_miniaturizable(aetools.NProperty):
-	"""miniaturizable - Whether the window can be miniaturized. """
-	which = 'ismn'
-	want = 'bool'
+    """miniaturizable - Whether the window can be miniaturized. """
+    which = 'ismn'
+    want = 'bool'
 class _Prop_miniaturized(aetools.NProperty):
-	"""miniaturized - Whether the window is currently miniaturized. """
-	which = 'pmnd'
-	want = 'bool'
+    """miniaturized - Whether the window is currently miniaturized. """
+    which = 'pmnd'
+    want = 'bool'
 class _Prop_modal(aetools.NProperty):
-	"""modal - Whether the window is the application's current modal window. """
-	which = 'pmod'
-	want = 'bool'
+    """modal - Whether the window is the application's current modal window. """
+    which = 'pmod'
+    want = 'bool'
 class _Prop_resizable(aetools.NProperty):
-	"""resizable - Whether the window can be resized. """
-	which = 'prsz'
-	want = 'bool'
+    """resizable - Whether the window can be resized. """
+    which = 'prsz'
+    want = 'bool'
 class _Prop_titled(aetools.NProperty):
-	"""titled - Whether the window has a title bar. """
-	which = 'ptit'
-	want = 'bool'
+    """titled - Whether the window has a title bar. """
+    which = 'ptit'
+    want = 'bool'
 class _Prop_visible(aetools.NProperty):
-	"""visible - Whether the window is currently visible. """
-	which = 'pvis'
-	want = 'bool'
+    """visible - Whether the window is currently visible. """
+    which = 'pvis'
+    want = 'bool'
 class _Prop_zoomable(aetools.NProperty):
-	"""zoomable - Whether the window can be zoomed. """
-	which = 'iszm'
-	want = 'bool'
+    """zoomable - Whether the window can be zoomed. """
+    which = 'iszm'
+    want = 'bool'
 class _Prop_zoomed(aetools.NProperty):
-	"""zoomed - Whether the window is currently zoomed. """
-	which = 'pzum'
-	want = 'bool'
+    """zoomed - Whether the window is currently zoomed. """
+    which = 'pzum'
+    want = 'bool'
 
 windows = window
 
 class document(aetools.ComponentItem):
-	"""document - A document. """
-	want = 'docu'
+    """document - A document. """
+    want = 'docu'
 class _Prop_modified(aetools.NProperty):
-	"""modified - Has the document been modified since the last save? """
-	which = 'imod'
-	want = 'bool'
+    """modified - Has the document been modified since the last save? """
+    which = 'imod'
+    want = 'bool'
 class _Prop_path(aetools.NProperty):
-	"""path - The document's path. """
-	which = 'ppth'
-	want = 'utxt'
+    """path - The document's path. """
+    which = 'ppth'
+    want = 'utxt'
 
 documents = document
 application._superclassnames = ['item']
 application._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'frontmost' : _Prop_frontmost,
-	'name' : _Prop_name,
-	'version' : _Prop_version,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'frontmost' : _Prop_frontmost,
+    'name' : _Prop_name,
+    'version' : _Prop_version,
 }
 application._privelemdict = {
-	'document' : document,
-	'window' : window,
+    'document' : document,
+    'window' : window,
 }
 item._superclassnames = []
 item._privpropdict = {
-	'class_' : _Prop_class_,
-	'properties' : _Prop_properties,
+    'class_' : _Prop_class_,
+    'properties' : _Prop_properties,
 }
 item._privelemdict = {
 }
 color._superclassnames = ['item']
 color._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 color._privelemdict = {
 }
 window._superclassnames = ['item']
 window._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'bounds' : _Prop_bounds,
-	'closeable' : _Prop_closeable,
-	'document' : _Prop_document,
-	'floating' : _Prop_floating,
-	'id' : _Prop_id,
-	'index' : _Prop_index,
-	'miniaturizable' : _Prop_miniaturizable,
-	'miniaturized' : _Prop_miniaturized,
-	'modal' : _Prop_modal,
-	'name' : _Prop_name,
-	'resizable' : _Prop_resizable,
-	'titled' : _Prop_titled,
-	'visible' : _Prop_visible,
-	'zoomable' : _Prop_zoomable,
-	'zoomed' : _Prop_zoomed,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'bounds' : _Prop_bounds,
+    'closeable' : _Prop_closeable,
+    'document' : _Prop_document,
+    'floating' : _Prop_floating,
+    'id' : _Prop_id,
+    'index' : _Prop_index,
+    'miniaturizable' : _Prop_miniaturizable,
+    'miniaturized' : _Prop_miniaturized,
+    'modal' : _Prop_modal,
+    'name' : _Prop_name,
+    'resizable' : _Prop_resizable,
+    'titled' : _Prop_titled,
+    'visible' : _Prop_visible,
+    'zoomable' : _Prop_zoomable,
+    'zoomed' : _Prop_zoomed,
 }
 window._privelemdict = {
 }
 document._superclassnames = ['item']
 document._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'modified' : _Prop_modified,
-	'name' : _Prop_name,
-	'path' : _Prop_path,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'modified' : _Prop_modified,
+    'name' : _Prop_name,
+    'path' : _Prop_path,
 }
 document._privelemdict = {
 }
 class _3c_(aetools.NComparison):
-	"""< - Less than """
+    """< - Less than """
 class _3d_(aetools.NComparison):
-	"""= - Equal """
+    """= - Equal """
 class _3e_(aetools.NComparison):
-	"""> - Greater than """
+    """> - Greater than """
 class contains(aetools.NComparison):
-	"""contains - Contains """
+    """contains - Contains """
 class ends_with(aetools.NComparison):
-	"""ends with - Ends with """
+    """ends with - Ends with """
 class starts_with(aetools.NComparison):
-	"""starts with - Starts with """
+    """starts with - Starts with """
 class _b2_(aetools.NComparison):
-	"""\xb2 - Less than or equal to """
+    """\xb2 - Less than or equal to """
 class _b3_(aetools.NComparison):
-	"""\xb3 - Greater than or equal to """
+    """\xb3 - Greater than or equal to """
 _Enum_savo = {
-	'ask' : 'ask ',	# Ask the user whether or not to save the file.
-	'yes' : 'yes ',	# Save the file.
-	'no' : 'no  ',	# Do not save the file.
+    'ask' : 'ask ',	# Ask the user whether or not to save the file.
+    'yes' : 'yes ',	# Save the file.
+    'no' : 'no  ',	# Do not save the file.
 }
 
 
@@ -530,9 +530,49 @@ _Enum_savo = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'capp' : application,
-	'cobj' : item,
-	'colr' : color,
-	'cwin' : window,
-	'docu' : document,
+    'capp' : application,
+    'cobj' : item,
+    'colr' : color,
+    'cwin' : window,
+    'docu' : document,
+}
+
+_propdeclarations = {
+    'ID  ' : _Prop_id,
+    'c@#^' : _Prop__3c_Inheritance_3e_,
+    'docu' : _Prop_document,
+    'hclb' : _Prop_closeable,
+    'imod' : _Prop_modified,
+    'isfl' : _Prop_floating,
+    'ismn' : _Prop_miniaturizable,
+    'iszm' : _Prop_zoomable,
+    'pALL' : _Prop_properties,
+    'pbnd' : _Prop_bounds,
+    'pcls' : _Prop_class_,
+    'pidx' : _Prop_index,
+    'pisf' : _Prop_frontmost,
+    'pmnd' : _Prop_miniaturized,
+    'pmod' : _Prop_modal,
+    'pnam' : _Prop_name,
+    'ppth' : _Prop_path,
+    'prsz' : _Prop_resizable,
+    'ptit' : _Prop_titled,
+    'pvis' : _Prop_visible,
+    'pzum' : _Prop_zoomed,
+    'vers' : _Prop_version,
+}
+
+_compdeclarations = {
+    '<   ' : _3c_,
+    '<=  ' : _b2_,
+    '=   ' : _3d_,
+    '>   ' : _3e_,
+    '>=  ' : _b3_,
+    'bgwt' : starts_with,
+    'cont' : contains,
+    'ends' : ends_with,
+}
+
+_enumdeclarations = {
+    'savo' : _Enum_savo,
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/System_Events_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/System_Events_Suite.py
index 1f6af42..5c245da 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/System_Events_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/System_Events_Suite.py
@@ -12,28 +12,28 @@ _code = 'sevs'
 
 class System_Events_Suite_Events:
 
-	pass
+    pass
 
 
 class application(aetools.ComponentItem):
-	"""application - The System Events application """
-	want = 'capp'
+    """application - The System Events application """
+    want = 'capp'
 class _Prop__3c_Inheritance_3e_(aetools.NProperty):
-	"""<Inheritance> - All of the properties of the superclass. """
-	which = 'c@#^'
-	want = 'capp'
+    """<Inheritance> - All of the properties of the superclass. """
+    which = 'c@#^'
+    want = 'capp'
 class _Prop_folder_actions_enabled(aetools.NProperty):
-	"""folder actions enabled - Are Folder Actions currently being processed? """
-	which = 'faen'
-	want = 'bool'
+    """folder actions enabled - Are Folder Actions currently being processed? """
+    which = 'faen'
+    want = 'bool'
 class _Prop_properties(aetools.NProperty):
-	"""properties - every property of the System Events application """
-	which = 'pALL'
-	want = '****'
+    """properties - every property of the System Events application """
+    which = 'pALL'
+    want = '****'
 class _Prop_system_wide_UI_element(aetools.NProperty):
-	"""system wide UI element - the UI element for the entire system """
-	which = 'swui'
-	want = 'uiel'
+    """system wide UI element - the UI element for the entire system """
+    which = 'swui'
+    want = 'uiel'
 #        element 'alis' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'cdis' as ['name', 'indx', 'rele', 'rang', 'test']
 #        element 'cfol' as ['name', 'indx', 'rele', 'rang', 'test']
@@ -56,30 +56,43 @@ import Folder_Actions_Suite
 import Login_Items_Suite
 import Processes_Suite
 application._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'folder_actions_enabled' : _Prop_folder_actions_enabled,
-	'properties' : _Prop_properties,
-	'system_wide_UI_element' : _Prop_system_wide_UI_element,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'folder_actions_enabled' : _Prop_folder_actions_enabled,
+    'properties' : _Prop_properties,
+    'system_wide_UI_element' : _Prop_system_wide_UI_element,
 }
 application._privelemdict = {
-	'UI_element' : Processes_Suite.UI_element,
-	'alias' : Disk_2d_Folder_2d_File_Suite.alias,
-	'application_process' : Processes_Suite.application_process,
-	'desk_accessory_process' : Processes_Suite.desk_accessory_process,
-	'disk' : Disk_2d_Folder_2d_File_Suite.disk,
-	'document' : Standard_Suite.document,
-	'file' : Disk_2d_Folder_2d_File_Suite.file,
-	'folder' : Disk_2d_Folder_2d_File_Suite.folder,
-	'folder_action' : Folder_Actions_Suite.folder_action,
-	'item' : Disk_2d_Folder_2d_File_Suite.item,
-	'login_item' : Login_Items_Suite.login_item,
-	'process' : Processes_Suite.process,
-	'window' : Standard_Suite.window,
+    'UI_element' : Processes_Suite.UI_element,
+    'alias' : Disk_2d_Folder_2d_File_Suite.alias,
+    'application_process' : Processes_Suite.application_process,
+    'desk_accessory_process' : Processes_Suite.desk_accessory_process,
+    'disk' : Disk_2d_Folder_2d_File_Suite.disk,
+    'document' : Standard_Suite.document,
+    'file' : Disk_2d_Folder_2d_File_Suite.file,
+    'folder' : Disk_2d_Folder_2d_File_Suite.folder,
+    'folder_action' : Folder_Actions_Suite.folder_action,
+    'item' : Disk_2d_Folder_2d_File_Suite.item,
+    'login_item' : Login_Items_Suite.login_item,
+    'process' : Processes_Suite.process,
+    'window' : Standard_Suite.window,
 }
 
 #
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'capp' : application,
+    'capp' : application,
+}
+
+_propdeclarations = {
+    'c@#^' : _Prop__3c_Inheritance_3e_,
+    'faen' : _Prop_folder_actions_enabled,
+    'pALL' : _Prop_properties,
+    'swui' : _Prop_system_wide_UI_element,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Text_Suite.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Text_Suite.py
index 7deaec7..9f109e1 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/Text_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/Text_Suite.py
@@ -12,40 +12,40 @@ _code = '????'
 
 class Text_Suite_Events:
 
-	pass
+    pass
 
 
 class attachment(aetools.ComponentItem):
-	"""attachment - Represents an inline text attachment.  This class is used mainly for make commands. """
-	want = 'atts'
+    """attachment - Represents an inline text attachment.  This class is used mainly for make commands. """
+    want = 'atts'
 class _Prop__3c_Inheritance_3e_(aetools.NProperty):
-	"""<Inheritance> - All of the properties of the superclass. """
-	which = 'c@#^'
-	want = 'ctxt'
+    """<Inheritance> - All of the properties of the superclass. """
+    which = 'c@#^'
+    want = 'ctxt'
 class _Prop_file_name(aetools.NProperty):
-	"""file name - The path to the file for the attachment """
-	which = 'atfn'
-	want = 'utxt'
+    """file name - The path to the file for the attachment """
+    which = 'atfn'
+    want = 'utxt'
 #        element 'catr' as ['indx', 'rele', 'rang', 'test']
 #        element 'cha ' as ['indx', 'rele', 'rang', 'test']
 #        element 'cpar' as ['indx', 'rele', 'rang', 'test']
 #        element 'cwor' as ['indx', 'rele', 'rang', 'test']
 
 class attribute_run(aetools.ComponentItem):
-	"""attribute run - This subdivides the text into chunks that all have the same attributes. """
-	want = 'catr'
+    """attribute run - This subdivides the text into chunks that all have the same attributes. """
+    want = 'catr'
 class _Prop_color(aetools.NProperty):
-	"""color - The color of the first character. """
-	which = 'colr'
-	want = 'colr'
+    """color - The color of the first character. """
+    which = 'colr'
+    want = 'colr'
 class _Prop_font(aetools.NProperty):
-	"""font - The name of the font of the first character. """
-	which = 'font'
-	want = 'utxt'
+    """font - The name of the font of the first character. """
+    which = 'font'
+    want = 'utxt'
 class _Prop_size(aetools.NProperty):
-	"""size - The size in points of the first character. """
-	which = 'ptsz'
-	want = 'long'
+    """size - The size in points of the first character. """
+    which = 'ptsz'
+    want = 'long'
 #        element 'catr' as ['indx', 'rele', 'rang', 'test']
 #        element 'cha ' as ['indx', 'rele', 'rang', 'test']
 #        element 'cpar' as ['indx', 'rele', 'rang', 'test']
@@ -54,8 +54,8 @@ class _Prop_size(aetools.NProperty):
 attribute_runs = attribute_run
 
 class character(aetools.ComponentItem):
-	"""character - This subdivides the text into characters. """
-	want = 'cha '
+    """character - This subdivides the text into characters. """
+    want = 'cha '
 #        element 'catr' as ['indx', 'rele', 'rang', 'test']
 #        element 'cha ' as ['indx', 'rele', 'rang', 'test']
 #        element 'cpar' as ['indx', 'rele', 'rang', 'test']
@@ -64,8 +64,8 @@ class character(aetools.ComponentItem):
 characters = character
 
 class paragraph(aetools.ComponentItem):
-	"""paragraph - This subdivides the text into paragraphs. """
-	want = 'cpar'
+    """paragraph - This subdivides the text into paragraphs. """
+    want = 'cpar'
 #        element 'catr' as ['indx', 'rele', 'rang', 'test']
 #        element 'cha ' as ['indx', 'rele', 'rang', 'test']
 #        element 'cpar' as ['indx', 'rele', 'rang', 'test']
@@ -74,16 +74,16 @@ class paragraph(aetools.ComponentItem):
 paragraphs = paragraph
 
 class text(aetools.ComponentItem):
-	"""text - Rich (styled) text """
-	want = 'ctxt'
+    """text - Rich (styled) text """
+    want = 'ctxt'
 #        element 'catr' as ['indx', 'rele', 'rang', 'test']
 #        element 'cha ' as ['indx', 'rele', 'rang', 'test']
 #        element 'cpar' as ['indx', 'rele', 'rang', 'test']
 #        element 'cwor' as ['indx', 'rele', 'rang', 'test']
 
 class word(aetools.ComponentItem):
-	"""word - This subdivides the text into words. """
-	want = 'cwor'
+    """word - This subdivides the text into words. """
+    want = 'cwor'
 #        element 'catr' as ['indx', 'rele', 'rang', 'test']
 #        element 'cha ' as ['indx', 'rele', 'rang', 'test']
 #        element 'cpar' as ['indx', 'rele', 'rang', 'test']
@@ -92,90 +92,104 @@ class word(aetools.ComponentItem):
 words = word
 attachment._superclassnames = ['text']
 attachment._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'file_name' : _Prop_file_name,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'file_name' : _Prop_file_name,
 }
 attachment._privelemdict = {
-	'attribute_run' : attribute_run,
-	'character' : character,
-	'paragraph' : paragraph,
-	'word' : word,
+    'attribute_run' : attribute_run,
+    'character' : character,
+    'paragraph' : paragraph,
+    'word' : word,
 }
 import Standard_Suite
 attribute_run._superclassnames = ['item']
 attribute_run._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'color' : _Prop_color,
-	'font' : _Prop_font,
-	'size' : _Prop_size,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'color' : _Prop_color,
+    'font' : _Prop_font,
+    'size' : _Prop_size,
 }
 attribute_run._privelemdict = {
-	'attribute_run' : attribute_run,
-	'character' : character,
-	'paragraph' : paragraph,
-	'word' : word,
+    'attribute_run' : attribute_run,
+    'character' : character,
+    'paragraph' : paragraph,
+    'word' : word,
 }
 character._superclassnames = ['item']
 character._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'color' : _Prop_color,
-	'font' : _Prop_font,
-	'size' : _Prop_size,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'color' : _Prop_color,
+    'font' : _Prop_font,
+    'size' : _Prop_size,
 }
 character._privelemdict = {
-	'attribute_run' : attribute_run,
-	'character' : character,
-	'paragraph' : paragraph,
-	'word' : word,
+    'attribute_run' : attribute_run,
+    'character' : character,
+    'paragraph' : paragraph,
+    'word' : word,
 }
 paragraph._superclassnames = ['item']
 paragraph._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'color' : _Prop_color,
-	'font' : _Prop_font,
-	'size' : _Prop_size,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'color' : _Prop_color,
+    'font' : _Prop_font,
+    'size' : _Prop_size,
 }
 paragraph._privelemdict = {
-	'attribute_run' : attribute_run,
-	'character' : character,
-	'paragraph' : paragraph,
-	'word' : word,
+    'attribute_run' : attribute_run,
+    'character' : character,
+    'paragraph' : paragraph,
+    'word' : word,
 }
 text._superclassnames = ['item']
 text._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'color' : _Prop_color,
-	'font' : _Prop_font,
-	'size' : _Prop_size,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'color' : _Prop_color,
+    'font' : _Prop_font,
+    'size' : _Prop_size,
 }
 text._privelemdict = {
-	'attribute_run' : attribute_run,
-	'character' : character,
-	'paragraph' : paragraph,
-	'word' : word,
+    'attribute_run' : attribute_run,
+    'character' : character,
+    'paragraph' : paragraph,
+    'word' : word,
 }
 word._superclassnames = ['item']
 word._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'color' : _Prop_color,
-	'font' : _Prop_font,
-	'size' : _Prop_size,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'color' : _Prop_color,
+    'font' : _Prop_font,
+    'size' : _Prop_size,
 }
 word._privelemdict = {
-	'attribute_run' : attribute_run,
-	'character' : character,
-	'paragraph' : paragraph,
-	'word' : word,
+    'attribute_run' : attribute_run,
+    'character' : character,
+    'paragraph' : paragraph,
+    'word' : word,
 }
 
 #
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'atts' : attachment,
-	'catr' : attribute_run,
-	'cha ' : character,
-	'cpar' : paragraph,
-	'ctxt' : text,
-	'cwor' : word,
+    'atts' : attachment,
+    'catr' : attribute_run,
+    'cha ' : character,
+    'cpar' : paragraph,
+    'ctxt' : text,
+    'cwor' : word,
+}
+
+_propdeclarations = {
+    'atfn' : _Prop_file_name,
+    'c@#^' : _Prop__3c_Inheritance_3e_,
+    'colr' : _Prop_color,
+    'font' : _Prop_font,
+    'ptsz' : _Prop_size,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/__init__.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/__init__.py
index de07377..a7330c2 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/__init__.py
@@ -15,29 +15,29 @@ import Hidden_Suite
 
 
 _code_to_module = {
-	'????' : Standard_Suite,
-	'????' : Text_Suite,
-	'cdis' : Disk_2d_Folder_2d_File_Suite,
-	'faco' : Folder_Actions_Suite,
-	'logi' : Login_Items_Suite,
-	'powr' : Power_Suite,
-	'prcs' : Processes_Suite,
-	'sevs' : System_Events_Suite,
-	'tpnm' : Hidden_Suite,
+    '????' : Standard_Suite,
+    '????' : Text_Suite,
+    'cdis' : Disk_2d_Folder_2d_File_Suite,
+    'faco' : Folder_Actions_Suite,
+    'logi' : Login_Items_Suite,
+    'powr' : Power_Suite,
+    'prcs' : Processes_Suite,
+    'sevs' : System_Events_Suite,
+    'tpnm' : Hidden_Suite,
 }
 
 
 
 _code_to_fullname = {
-	'????' : ('SystemEvents.Standard_Suite', 'Standard_Suite'),
-	'????' : ('SystemEvents.Text_Suite', 'Text_Suite'),
-	'cdis' : ('SystemEvents.Disk_2d_Folder_2d_File_Suite', 'Disk_2d_Folder_2d_File_Suite'),
-	'faco' : ('SystemEvents.Folder_Actions_Suite', 'Folder_Actions_Suite'),
-	'logi' : ('SystemEvents.Login_Items_Suite', 'Login_Items_Suite'),
-	'powr' : ('SystemEvents.Power_Suite', 'Power_Suite'),
-	'prcs' : ('SystemEvents.Processes_Suite', 'Processes_Suite'),
-	'sevs' : ('SystemEvents.System_Events_Suite', 'System_Events_Suite'),
-	'tpnm' : ('SystemEvents.Hidden_Suite', 'Hidden_Suite'),
+    '????' : ('SystemEvents.Standard_Suite', 'Standard_Suite'),
+    '????' : ('SystemEvents.Text_Suite', 'Text_Suite'),
+    'cdis' : ('SystemEvents.Disk_2d_Folder_2d_File_Suite', 'Disk_2d_Folder_2d_File_Suite'),
+    'faco' : ('SystemEvents.Folder_Actions_Suite', 'Folder_Actions_Suite'),
+    'logi' : ('SystemEvents.Login_Items_Suite', 'Login_Items_Suite'),
+    'powr' : ('SystemEvents.Power_Suite', 'Power_Suite'),
+    'prcs' : ('SystemEvents.Processes_Suite', 'Processes_Suite'),
+    'sevs' : ('SystemEvents.System_Events_Suite', 'System_Events_Suite'),
+    'tpnm' : ('SystemEvents.Hidden_Suite', 'Hidden_Suite'),
 }
 
 from Standard_Suite import *
@@ -51,40 +51,81 @@ from System_Events_Suite import *
 from Hidden_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', {}))
+    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(color)
+getbaseclasses(window)
+getbaseclasses(application)
+getbaseclasses(item)
+getbaseclasses(document)
 getbaseclasses(character)
 getbaseclasses(attachment)
 getbaseclasses(paragraph)
 getbaseclasses(word)
 getbaseclasses(attribute_run)
 getbaseclasses(text)
+getbaseclasses(login_item)
 getbaseclasses(file)
 getbaseclasses(alias)
 getbaseclasses(item)
 getbaseclasses(folder)
 getbaseclasses(disk)
-getbaseclasses(color)
-getbaseclasses(window)
-getbaseclasses(application)
-getbaseclasses(item)
-getbaseclasses(document)
 getbaseclasses(script)
 getbaseclasses(folder_action)
+getbaseclasses(StdSuites.Type_Names_Suite.double_integer)
+getbaseclasses(StdSuites.Type_Names_Suite.version)
+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.TIFF_picture)
+getbaseclasses(StdSuites.Type_Names_Suite.type_element_info)
+getbaseclasses(StdSuites.Type_Names_Suite.type_event_info)
+getbaseclasses(StdSuites.Type_Names_Suite.machine_location)
+getbaseclasses(StdSuites.Type_Names_Suite.PostScript_picture)
+getbaseclasses(StdSuites.Type_Names_Suite.point)
+getbaseclasses(StdSuites.Type_Names_Suite.long_fixed_point)
+getbaseclasses(StdSuites.Type_Names_Suite.menu_item)
+getbaseclasses(StdSuites.Type_Names_Suite.scrap_styles)
+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.type_property_info)
+getbaseclasses(StdSuites.Type_Names_Suite.long_fixed_rectangle)
+getbaseclasses(StdSuites.Type_Names_Suite.long_fixed)
+getbaseclasses(StdSuites.Type_Names_Suite.type_suite_info)
+getbaseclasses(StdSuites.Type_Names_Suite.rotation)
+getbaseclasses(StdSuites.Type_Names_Suite.small_integer)
+getbaseclasses(StdSuites.Type_Names_Suite.fixed)
+getbaseclasses(StdSuites.Type_Names_Suite.long_point)
+getbaseclasses(StdSuites.Type_Names_Suite.type_class_info)
+getbaseclasses(StdSuites.Type_Names_Suite.RGB96_color)
+getbaseclasses(StdSuites.Type_Names_Suite.target_id)
+getbaseclasses(StdSuites.Type_Names_Suite.pixel_map_record)
+getbaseclasses(StdSuites.Type_Names_Suite.type_parameter_info)
+getbaseclasses(StdSuites.Type_Names_Suite.extended_real)
+getbaseclasses(StdSuites.Type_Names_Suite.long_rectangle)
+getbaseclasses(StdSuites.Type_Names_Suite.dash_style)
+getbaseclasses(StdSuites.Type_Names_Suite.string)
+getbaseclasses(StdSuites.Type_Names_Suite.small_real)
+getbaseclasses(StdSuites.Type_Names_Suite.null)
+getbaseclasses(StdSuites.Type_Names_Suite.location_reference)
+getbaseclasses(StdSuites.Type_Names_Suite.bounding_rectangle)
 getbaseclasses(window)
 getbaseclasses(radio_button)
 getbaseclasses(list)
@@ -129,171 +170,130 @@ getbaseclasses(color_well)
 getbaseclasses(scroll_bar)
 getbaseclasses(combo_box)
 getbaseclasses(browser)
-getbaseclasses(StdSuites.Type_Names_Suite.double_integer)
-getbaseclasses(StdSuites.Type_Names_Suite.version)
-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.TIFF_picture)
-getbaseclasses(StdSuites.Type_Names_Suite.type_element_info)
-getbaseclasses(StdSuites.Type_Names_Suite.type_event_info)
-getbaseclasses(StdSuites.Type_Names_Suite.machine_location)
-getbaseclasses(StdSuites.Type_Names_Suite.PostScript_picture)
-getbaseclasses(StdSuites.Type_Names_Suite.point)
-getbaseclasses(StdSuites.Type_Names_Suite.long_fixed_point)
-getbaseclasses(StdSuites.Type_Names_Suite.menu_item)
-getbaseclasses(StdSuites.Type_Names_Suite.scrap_styles)
-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.type_property_info)
-getbaseclasses(StdSuites.Type_Names_Suite.long_fixed_rectangle)
-getbaseclasses(StdSuites.Type_Names_Suite.long_fixed)
-getbaseclasses(StdSuites.Type_Names_Suite.type_suite_info)
-getbaseclasses(StdSuites.Type_Names_Suite.rotation)
-getbaseclasses(StdSuites.Type_Names_Suite.small_integer)
-getbaseclasses(StdSuites.Type_Names_Suite.fixed)
-getbaseclasses(StdSuites.Type_Names_Suite.long_point)
-getbaseclasses(StdSuites.Type_Names_Suite.type_class_info)
-getbaseclasses(StdSuites.Type_Names_Suite.RGB96_color)
-getbaseclasses(StdSuites.Type_Names_Suite.target_id)
-getbaseclasses(StdSuites.Type_Names_Suite.pixel_map_record)
-getbaseclasses(StdSuites.Type_Names_Suite.type_parameter_info)
-getbaseclasses(StdSuites.Type_Names_Suite.extended_real)
-getbaseclasses(StdSuites.Type_Names_Suite.long_rectangle)
-getbaseclasses(StdSuites.Type_Names_Suite.dash_style)
-getbaseclasses(StdSuites.Type_Names_Suite.string)
-getbaseclasses(StdSuites.Type_Names_Suite.small_real)
-getbaseclasses(StdSuites.Type_Names_Suite.null)
-getbaseclasses(StdSuites.Type_Names_Suite.location_reference)
-getbaseclasses(StdSuites.Type_Names_Suite.bounding_rectangle)
 getbaseclasses(application)
-getbaseclasses(login_item)
 
 #
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'cha ' : character,
-	'atts' : attachment,
-	'cpar' : paragraph,
-	'cwor' : word,
-	'catr' : attribute_run,
-	'ctxt' : text,
-	'file' : file,
-	'alis' : alias,
-	'cobj' : item,
-	'cfol' : folder,
-	'cdis' : disk,
-	'colr' : color,
-	'cwin' : window,
-	'capp' : application,
-	'cobj' : item,
-	'docu' : document,
-	'scpt' : script,
-	'foac' : folder_action,
-	'cwin' : window,
-	'radB' : radio_button,
-	'list' : list,
-	'pcda' : desk_accessory_process,
-	'menI' : menu_item,
-	'proI' : progress_indicator,
-	'menE' : menu,
-	'menB' : menu_button,
-	'popB' : pop_up_button,
-	'incr' : incrementor,
-	'sheE' : sheet,
-	'tbar' : tool_bar,
-	'pcap' : application_process,
-	'txtf' : text_field,
-	'txta' : text_area,
-	'sliI' : slider,
-	'scra' : scroll_area,
-	'reli' : relevance_indicator,
-	'busi' : busy_indicator,
-	'crow' : row,
-	'prcs' : process,
-	'tabB' : table,
-	'outl' : outline,
-	'uiel' : UI_element,
-	'vali' : value_indicator,
-	'sysw' : system_wide_UI_element,
-	'butT' : button,
-	'capp' : application,
-	'rgrp' : radio_group,
-	'imaA' : image,
-	'tab ' : tab_group,
-	'mbar' : menu_bar,
-	'grow' : grow_area,
-	'chbx' : check_box,
-	'ccol' : column,
-	'sttx' : static_text,
-	'splg' : splitter_group,
-	'sgrp' : group,
-	'splr' : splitter,
-	'draA' : drawer,
-	'colW' : color_well,
-	'scrb' : scroll_bar,
-	'comB' : combo_box,
-	'broW' : browser,
-	'comp' : StdSuites.Type_Names_Suite.double_integer,
-	'vers' : StdSuites.Type_Names_Suite.version,
-	'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,
-	'TIFF' : StdSuites.Type_Names_Suite.TIFF_picture,
-	'elin' : StdSuites.Type_Names_Suite.type_element_info,
-	'evin' : StdSuites.Type_Names_Suite.type_event_info,
-	'mLoc' : StdSuites.Type_Names_Suite.machine_location,
-	'EPS ' : StdSuites.Type_Names_Suite.PostScript_picture,
-	'QDpt' : StdSuites.Type_Names_Suite.point,
-	'lfpt' : StdSuites.Type_Names_Suite.long_fixed_point,
-	'cmen' : StdSuites.Type_Names_Suite.menu_item,
-	'styl' : StdSuites.Type_Names_Suite.scrap_styles,
-	'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,
-	'pinf' : StdSuites.Type_Names_Suite.type_property_info,
-	'lfrc' : StdSuites.Type_Names_Suite.long_fixed_rectangle,
-	'lfxd' : StdSuites.Type_Names_Suite.long_fixed,
-	'suin' : StdSuites.Type_Names_Suite.type_suite_info,
-	'trot' : StdSuites.Type_Names_Suite.rotation,
-	'shor' : StdSuites.Type_Names_Suite.small_integer,
-	'fixd' : StdSuites.Type_Names_Suite.fixed,
-	'lpnt' : StdSuites.Type_Names_Suite.long_point,
-	'gcli' : StdSuites.Type_Names_Suite.type_class_info,
-	'tr96' : StdSuites.Type_Names_Suite.RGB96_color,
-	'targ' : StdSuites.Type_Names_Suite.target_id,
-	'tpmm' : StdSuites.Type_Names_Suite.pixel_map_record,
-	'pmin' : StdSuites.Type_Names_Suite.type_parameter_info,
-	'exte' : StdSuites.Type_Names_Suite.extended_real,
-	'lrct' : StdSuites.Type_Names_Suite.long_rectangle,
-	'tdas' : StdSuites.Type_Names_Suite.dash_style,
-	'TEXT' : StdSuites.Type_Names_Suite.string,
-	'sing' : StdSuites.Type_Names_Suite.small_real,
-	'null' : StdSuites.Type_Names_Suite.null,
-	'insl' : StdSuites.Type_Names_Suite.location_reference,
-	'qdrt' : StdSuites.Type_Names_Suite.bounding_rectangle,
-	'capp' : application,
-	'logi' : login_item,
+    'colr' : color,
+    'cwin' : window,
+    'capp' : application,
+    'cobj' : item,
+    'docu' : document,
+    'cha ' : character,
+    'atts' : attachment,
+    'cpar' : paragraph,
+    'cwor' : word,
+    'catr' : attribute_run,
+    'ctxt' : text,
+    'logi' : login_item,
+    'file' : file,
+    'alis' : alias,
+    'cobj' : item,
+    'cfol' : folder,
+    'cdis' : disk,
+    'scpt' : script,
+    'foac' : folder_action,
+    'comp' : StdSuites.Type_Names_Suite.double_integer,
+    'vers' : StdSuites.Type_Names_Suite.version,
+    '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,
+    'TIFF' : StdSuites.Type_Names_Suite.TIFF_picture,
+    'elin' : StdSuites.Type_Names_Suite.type_element_info,
+    'evin' : StdSuites.Type_Names_Suite.type_event_info,
+    'mLoc' : StdSuites.Type_Names_Suite.machine_location,
+    'EPS ' : StdSuites.Type_Names_Suite.PostScript_picture,
+    'QDpt' : StdSuites.Type_Names_Suite.point,
+    'lfpt' : StdSuites.Type_Names_Suite.long_fixed_point,
+    'cmen' : StdSuites.Type_Names_Suite.menu_item,
+    'styl' : StdSuites.Type_Names_Suite.scrap_styles,
+    '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,
+    'pinf' : StdSuites.Type_Names_Suite.type_property_info,
+    'lfrc' : StdSuites.Type_Names_Suite.long_fixed_rectangle,
+    'lfxd' : StdSuites.Type_Names_Suite.long_fixed,
+    'suin' : StdSuites.Type_Names_Suite.type_suite_info,
+    'trot' : StdSuites.Type_Names_Suite.rotation,
+    'shor' : StdSuites.Type_Names_Suite.small_integer,
+    'fixd' : StdSuites.Type_Names_Suite.fixed,
+    'lpnt' : StdSuites.Type_Names_Suite.long_point,
+    'gcli' : StdSuites.Type_Names_Suite.type_class_info,
+    'tr96' : StdSuites.Type_Names_Suite.RGB96_color,
+    'targ' : StdSuites.Type_Names_Suite.target_id,
+    'tpmm' : StdSuites.Type_Names_Suite.pixel_map_record,
+    'pmin' : StdSuites.Type_Names_Suite.type_parameter_info,
+    'exte' : StdSuites.Type_Names_Suite.extended_real,
+    'lrct' : StdSuites.Type_Names_Suite.long_rectangle,
+    'tdas' : StdSuites.Type_Names_Suite.dash_style,
+    'TEXT' : StdSuites.Type_Names_Suite.string,
+    'sing' : StdSuites.Type_Names_Suite.small_real,
+    'null' : StdSuites.Type_Names_Suite.null,
+    'insl' : StdSuites.Type_Names_Suite.location_reference,
+    'qdrt' : StdSuites.Type_Names_Suite.bounding_rectangle,
+    'cwin' : window,
+    'radB' : radio_button,
+    'list' : list,
+    'pcda' : desk_accessory_process,
+    'menI' : menu_item,
+    'proI' : progress_indicator,
+    'menE' : menu,
+    'menB' : menu_button,
+    'popB' : pop_up_button,
+    'incr' : incrementor,
+    'sheE' : sheet,
+    'tbar' : tool_bar,
+    'pcap' : application_process,
+    'txtf' : text_field,
+    'txta' : text_area,
+    'sliI' : slider,
+    'scra' : scroll_area,
+    'reli' : relevance_indicator,
+    'busi' : busy_indicator,
+    'crow' : row,
+    'prcs' : process,
+    'tabB' : table,
+    'outl' : outline,
+    'uiel' : UI_element,
+    'vali' : value_indicator,
+    'sysw' : system_wide_UI_element,
+    'butT' : button,
+    'capp' : application,
+    'rgrp' : radio_group,
+    'imaA' : image,
+    'tab ' : tab_group,
+    'mbar' : menu_bar,
+    'grow' : grow_area,
+    'chbx' : check_box,
+    'ccol' : column,
+    'sttx' : static_text,
+    'splg' : splitter_group,
+    'sgrp' : group,
+    'splr' : splitter,
+    'draA' : drawer,
+    'colW' : color_well,
+    'scrb' : scroll_bar,
+    'comB' : combo_box,
+    'broW' : browser,
+    'capp' : application,
 }
 
 
 class SystemEvents(Standard_Suite_Events,
-		Text_Suite_Events,
-		Disk_2d_Folder_2d_File_Suite_Events,
-		Folder_Actions_Suite_Events,
-		Login_Items_Suite_Events,
-		Power_Suite_Events,
-		Processes_Suite_Events,
-		System_Events_Suite_Events,
-		Hidden_Suite_Events,
-		aetools.TalkTo):
-	_signature = 'sevs'
+        Text_Suite_Events,
+        Disk_2d_Folder_2d_File_Suite_Events,
+        Folder_Actions_Suite_Events,
+        Login_Items_Suite_Events,
+        Power_Suite_Events,
+        Processes_Suite_Events,
+        System_Events_Suite_Events,
+        Hidden_Suite_Events,
+        aetools.TalkTo):
+    _signature = 'sevs'
 
-	_moduleName = 'SystemEvents'
+    _moduleName = 'SystemEvents'
 
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/Standard_Suite.py b/Lib/plat-mac/lib-scriptpackages/Terminal/Standard_Suite.py
index 92c1e1f..8796efc 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/Standard_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/Standard_Suite.py
@@ -12,517 +12,517 @@ _code = '????'
 
 class Standard_Suite_Events:
 
-	_argmap_close = {
-		'saving_in' : 'kfil',
-		'saving' : 'savo',
-	}
-
-	def close(self, _object, _attributes={}, **_arguments):
-		"""close: Close an object.
-		Required argument: the object for the command
-		Keyword argument saving_in: The file in which to save the object.
-		Keyword argument saving: Specifies whether changes should be saved before closing.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'core'
-		_subcode = 'clos'
-
-		aetools.keysubst(_arguments, self._argmap_close)
-		_arguments['----'] = _object
-
-		aetools.enumsubst(_arguments, 'savo', _Enum_savo)
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_count = {
-		'each' : 'kocl',
-	}
-
-	def count(self, _object, _attributes={}, **_arguments):
-		"""count: Return the number of elements of a particular class within an object.
-		Required argument: the object for the command
-		Keyword argument each: The class of objects to be counted.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the reply for the command
-		"""
-		_code = 'core'
-		_subcode = 'cnte'
-
-		aetools.keysubst(_arguments, self._argmap_count)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def delete(self, _object, _attributes={}, **_arguments):
-		"""delete: Delete an object.
-		Required argument: the object for the command
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'core'
-		_subcode = 'delo'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_duplicate = {
-		'to' : 'insh',
-		'with_properties' : 'prdt',
-	}
-
-	def duplicate(self, _object, _attributes={}, **_arguments):
-		"""duplicate: Copy object(s) and put the copies at a new location.
-		Required argument: the object for the command
-		Keyword argument to: The location for the new object(s).
-		Keyword argument with_properties: Properties to be set in the new duplicated object(s).
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'core'
-		_subcode = 'clon'
-
-		aetools.keysubst(_arguments, self._argmap_duplicate)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def exists(self, _object, _attributes={}, **_arguments):
-		"""exists: Verify if an object exists.
-		Required argument: the object for the command
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the reply for the command
-		"""
-		_code = 'core'
-		_subcode = 'doex'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def get(self, _object, _attributes={}, **_arguments):
-		"""get: Get the data for an object.
-		Required argument: the object for the command
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the reply for the command
-		"""
-		_code = 'core'
-		_subcode = 'getd'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_make = {
-		'at' : 'insh',
-		'new' : 'kocl',
-		'with_data' : 'data',
-		'with_properties' : 'prdt',
-	}
-
-	def make(self, _no_object=None, _attributes={}, **_arguments):
-		"""make: Make a new object.
-		Keyword argument at: The location at which to insert the object.
-		Keyword argument new: The class of the new object.
-		Keyword argument with_data: The initial data for the object.
-		Keyword argument with_properties: The initial values for properties of the object.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the reply for the command
-		"""
-		_code = 'core'
-		_subcode = 'crel'
-
-		aetools.keysubst(_arguments, self._argmap_make)
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_move = {
-		'to' : 'insh',
-	}
-
-	def move(self, _object, _attributes={}, **_arguments):
-		"""move: Move object(s) to a new location.
-		Required argument: the object for the command
-		Keyword argument to: The new location for the object(s).
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'core'
-		_subcode = 'move'
-
-		aetools.keysubst(_arguments, self._argmap_move)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def open(self, _object=None, _attributes={}, **_arguments):
-		"""open: Open an object.
-		Required argument: list of objects
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'odoc'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def print_(self, _object=None, _attributes={}, **_arguments):
-		"""print: Print an object.
-		Required argument: list of objects
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'pdoc'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_quit = {
-		'saving' : 'savo',
-	}
-
-	def quit(self, _object, _attributes={}, **_arguments):
-		"""quit: Quit an application.
-		Required argument: the object for the command
-		Keyword argument saving: Specifies whether changes should be saved before quitting.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'aevt'
-		_subcode = 'quit'
-
-		aetools.keysubst(_arguments, self._argmap_quit)
-		_arguments['----'] = _object
-
-		aetools.enumsubst(_arguments, 'savo', _Enum_savo)
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_save = {
-		'in_' : 'kfil',
-		'as' : 'fltp',
-	}
-
-	def save(self, _object, _attributes={}, **_arguments):
-		"""save: Save an object.
-		Required argument: the object for the command
-		Keyword argument in_: The file in which to save the object.
-		Keyword argument as: The file type in which to save the data.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'core'
-		_subcode = 'save'
-
-		aetools.keysubst(_arguments, self._argmap_save)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_set = {
-		'to' : 'data',
-	}
-
-	def set(self, _object, _attributes={}, **_arguments):
-		"""set: Set an object's data.
-		Required argument: the object for the command
-		Keyword argument to: The new value.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'core'
-		_subcode = 'setd'
-
-		aetools.keysubst(_arguments, self._argmap_set)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    _argmap_close = {
+        'saving_in' : 'kfil',
+        'saving' : 'savo',
+    }
+
+    def close(self, _object, _attributes={}, **_arguments):
+        """close: Close an object.
+        Required argument: the object for the command
+        Keyword argument saving_in: The file in which to save the object.
+        Keyword argument saving: Specifies whether changes should be saved before closing.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'core'
+        _subcode = 'clos'
+
+        aetools.keysubst(_arguments, self._argmap_close)
+        _arguments['----'] = _object
+
+        aetools.enumsubst(_arguments, 'savo', _Enum_savo)
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_count = {
+        'each' : 'kocl',
+    }
+
+    def count(self, _object, _attributes={}, **_arguments):
+        """count: Return the number of elements of a particular class within an object.
+        Required argument: the object for the command
+        Keyword argument each: The class of objects to be counted.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the reply for the command
+        """
+        _code = 'core'
+        _subcode = 'cnte'
+
+        aetools.keysubst(_arguments, self._argmap_count)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def delete(self, _object, _attributes={}, **_arguments):
+        """delete: Delete an object.
+        Required argument: the object for the command
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'core'
+        _subcode = 'delo'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_duplicate = {
+        'to' : 'insh',
+        'with_properties' : 'prdt',
+    }
+
+    def duplicate(self, _object, _attributes={}, **_arguments):
+        """duplicate: Copy object(s) and put the copies at a new location.
+        Required argument: the object for the command
+        Keyword argument to: The location for the new object(s).
+        Keyword argument with_properties: Properties to be set in the new duplicated object(s).
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'core'
+        _subcode = 'clon'
+
+        aetools.keysubst(_arguments, self._argmap_duplicate)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def exists(self, _object, _attributes={}, **_arguments):
+        """exists: Verify if an object exists.
+        Required argument: the object for the command
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the reply for the command
+        """
+        _code = 'core'
+        _subcode = 'doex'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def get(self, _object, _attributes={}, **_arguments):
+        """get: Get the data for an object.
+        Required argument: the object for the command
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the reply for the command
+        """
+        _code = 'core'
+        _subcode = 'getd'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_make = {
+        'at' : 'insh',
+        'new' : 'kocl',
+        'with_data' : 'data',
+        'with_properties' : 'prdt',
+    }
+
+    def make(self, _no_object=None, _attributes={}, **_arguments):
+        """make: Make a new object.
+        Keyword argument at: The location at which to insert the object.
+        Keyword argument new: The class of the new object.
+        Keyword argument with_data: The initial data for the object.
+        Keyword argument with_properties: The initial values for properties of the object.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the reply for the command
+        """
+        _code = 'core'
+        _subcode = 'crel'
+
+        aetools.keysubst(_arguments, self._argmap_make)
+        if _no_object != None: raise TypeError, 'No direct arg expected'
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_move = {
+        'to' : 'insh',
+    }
+
+    def move(self, _object, _attributes={}, **_arguments):
+        """move: Move object(s) to a new location.
+        Required argument: the object for the command
+        Keyword argument to: The new location for the object(s).
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'core'
+        _subcode = 'move'
+
+        aetools.keysubst(_arguments, self._argmap_move)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def open(self, _object=None, _attributes={}, **_arguments):
+        """open: Open an object.
+        Required argument: list of objects
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'odoc'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    def print_(self, _object=None, _attributes={}, **_arguments):
+        """print: Print an object.
+        Required argument: list of objects
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'pdoc'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_quit = {
+        'saving' : 'savo',
+    }
+
+    def quit(self, _object, _attributes={}, **_arguments):
+        """quit: Quit an application.
+        Required argument: the object for the command
+        Keyword argument saving: Specifies whether changes should be saved before quitting.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'aevt'
+        _subcode = 'quit'
+
+        aetools.keysubst(_arguments, self._argmap_quit)
+        _arguments['----'] = _object
+
+        aetools.enumsubst(_arguments, 'savo', _Enum_savo)
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_save = {
+        'in_' : 'kfil',
+        'as' : 'fltp',
+    }
+
+    def save(self, _object, _attributes={}, **_arguments):
+        """save: Save an object.
+        Required argument: the object for the command
+        Keyword argument in_: The file in which to save the object.
+        Keyword argument as: The file type in which to save the data.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'core'
+        _subcode = 'save'
+
+        aetools.keysubst(_arguments, self._argmap_save)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_set = {
+        'to' : 'data',
+    }
+
+    def set(self, _object, _attributes={}, **_arguments):
+        """set: Set an object's data.
+        Required argument: the object for the command
+        Keyword argument to: The new value.
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'core'
+        _subcode = 'setd'
+
+        aetools.keysubst(_arguments, self._argmap_set)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 class application(aetools.ComponentItem):
-	"""application - An application's top level scripting object. """
-	want = 'capp'
+    """application - An application's top level scripting object. """
+    want = 'capp'
 class _Prop__3c_Inheritance_3e_(aetools.NProperty):
-	"""<Inheritance> - All of the properties of the superclass. """
-	which = 'c@#^'
-	want = 'cobj'
+    """<Inheritance> - All of the properties of the superclass. """
+    which = 'c@#^'
+    want = 'cobj'
 class _Prop_frontmost(aetools.NProperty):
-	"""frontmost - Is this the frontmost (active) application? """
-	which = 'pisf'
-	want = 'bool'
+    """frontmost - Is this the frontmost (active) application? """
+    which = 'pisf'
+    want = 'bool'
 class _Prop_name(aetools.NProperty):
-	"""name - The name of the application. """
-	which = 'pnam'
-	want = 'utxt'
+    """name - The name of the application. """
+    which = 'pnam'
+    want = 'utxt'
 class _Prop_version(aetools.NProperty):
-	"""version - The version of the application. """
-	which = 'vers'
-	want = 'utxt'
+    """version - The version of the application. """
+    which = 'vers'
+    want = 'utxt'
 #        element 'cwin' as ['name', 'indx', 'rele', 'rang', 'test', 'ID  ']
 #        element 'docu' as ['name', 'indx', 'rele', 'rang', 'test']
 
 applications = application
 
 class item(aetools.ComponentItem):
-	"""item - A scriptable object. """
-	want = 'cobj'
+    """item - A scriptable object. """
+    want = 'cobj'
 class _Prop_class_(aetools.NProperty):
-	"""class - The class of the object. """
-	which = 'pcls'
-	want = 'type'
+    """class - The class of the object. """
+    which = 'pcls'
+    want = 'type'
 class _Prop_properties(aetools.NProperty):
-	"""properties - All of the object's properties. """
-	which = 'pALL'
-	want = 'reco'
+    """properties - All of the object's properties. """
+    which = 'pALL'
+    want = 'reco'
 
 items = item
 
 class color(aetools.ComponentItem):
-	"""color - A color. """
-	want = 'colr'
+    """color - A color. """
+    want = 'colr'
 
 colors = color
 
 class window(aetools.ComponentItem):
-	"""window - A window. """
-	want = 'cwin'
+    """window - A window. """
+    want = 'cwin'
 class _Prop_bounds(aetools.NProperty):
-	"""bounds - The bounding rectangle of the window. """
-	which = 'pbnd'
-	want = 'qdrt'
+    """bounds - The bounding rectangle of the window. """
+    which = 'pbnd'
+    want = 'qdrt'
 class _Prop_closeable(aetools.NProperty):
-	"""closeable - Whether the window has a close box. """
-	which = 'hclb'
-	want = 'bool'
+    """closeable - Whether the window has a close box. """
+    which = 'hclb'
+    want = 'bool'
 class _Prop_document(aetools.NProperty):
-	"""document - The document whose contents are being displayed in the window. """
-	which = 'docu'
-	want = 'docu'
+    """document - The document whose contents are being displayed in the window. """
+    which = 'docu'
+    want = 'docu'
 class _Prop_floating(aetools.NProperty):
-	"""floating - Whether the window floats. """
-	which = 'isfl'
-	want = 'bool'
+    """floating - Whether the window floats. """
+    which = 'isfl'
+    want = 'bool'
 class _Prop_id(aetools.NProperty):
-	"""id - The unique identifier of the window. """
-	which = 'ID  '
-	want = 'long'
+    """id - The unique identifier of the window. """
+    which = 'ID  '
+    want = 'long'
 class _Prop_index(aetools.NProperty):
-	"""index - The index of the window in the back-to-front window ordering. """
-	which = 'pidx'
-	want = 'long'
+    """index - The index of the window in the back-to-front window ordering. """
+    which = 'pidx'
+    want = 'long'
 class _Prop_miniaturizable(aetools.NProperty):
-	"""miniaturizable - Whether the window can be miniaturized. """
-	which = 'ismn'
-	want = 'bool'
+    """miniaturizable - Whether the window can be miniaturized. """
+    which = 'ismn'
+    want = 'bool'
 class _Prop_miniaturized(aetools.NProperty):
-	"""miniaturized - Whether the window is currently miniaturized. """
-	which = 'pmnd'
-	want = 'bool'
+    """miniaturized - Whether the window is currently miniaturized. """
+    which = 'pmnd'
+    want = 'bool'
 class _Prop_modal(aetools.NProperty):
-	"""modal - Whether the window is the application's current modal window. """
-	which = 'pmod'
-	want = 'bool'
+    """modal - Whether the window is the application's current modal window. """
+    which = 'pmod'
+    want = 'bool'
 class _Prop_resizable(aetools.NProperty):
-	"""resizable - Whether the window can be resized. """
-	which = 'prsz'
-	want = 'bool'
+    """resizable - Whether the window can be resized. """
+    which = 'prsz'
+    want = 'bool'
 class _Prop_titled(aetools.NProperty):
-	"""titled - Whether the window has a title bar. """
-	which = 'ptit'
-	want = 'bool'
+    """titled - Whether the window has a title bar. """
+    which = 'ptit'
+    want = 'bool'
 class _Prop_visible(aetools.NProperty):
-	"""visible - Whether the window is currently visible. """
-	which = 'pvis'
-	want = 'bool'
+    """visible - Whether the window is currently visible. """
+    which = 'pvis'
+    want = 'bool'
 class _Prop_zoomable(aetools.NProperty):
-	"""zoomable - Whether the window can be zoomed. """
-	which = 'iszm'
-	want = 'bool'
+    """zoomable - Whether the window can be zoomed. """
+    which = 'iszm'
+    want = 'bool'
 class _Prop_zoomed(aetools.NProperty):
-	"""zoomed - Whether the window is currently zoomed. """
-	which = 'pzum'
-	want = 'bool'
+    """zoomed - Whether the window is currently zoomed. """
+    which = 'pzum'
+    want = 'bool'
 
 windows = window
 
 class document(aetools.ComponentItem):
-	"""document - A document. """
-	want = 'docu'
+    """document - A document. """
+    want = 'docu'
 class _Prop_modified(aetools.NProperty):
-	"""modified - Has the document been modified since the last save? """
-	which = 'imod'
-	want = 'bool'
+    """modified - Has the document been modified since the last save? """
+    which = 'imod'
+    want = 'bool'
 class _Prop_path(aetools.NProperty):
-	"""path - The document's path. """
-	which = 'ppth'
-	want = 'utxt'
+    """path - The document's path. """
+    which = 'ppth'
+    want = 'utxt'
 
 documents = document
 application._superclassnames = ['item']
 application._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'frontmost' : _Prop_frontmost,
-	'name' : _Prop_name,
-	'version' : _Prop_version,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'frontmost' : _Prop_frontmost,
+    'name' : _Prop_name,
+    'version' : _Prop_version,
 }
 application._privelemdict = {
-	'document' : document,
-	'window' : window,
+    'document' : document,
+    'window' : window,
 }
 item._superclassnames = []
 item._privpropdict = {
-	'class_' : _Prop_class_,
-	'properties' : _Prop_properties,
+    'class_' : _Prop_class_,
+    'properties' : _Prop_properties,
 }
 item._privelemdict = {
 }
 color._superclassnames = ['item']
 color._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
 }
 color._privelemdict = {
 }
 window._superclassnames = ['item']
 window._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'bounds' : _Prop_bounds,
-	'closeable' : _Prop_closeable,
-	'document' : _Prop_document,
-	'floating' : _Prop_floating,
-	'id' : _Prop_id,
-	'index' : _Prop_index,
-	'miniaturizable' : _Prop_miniaturizable,
-	'miniaturized' : _Prop_miniaturized,
-	'modal' : _Prop_modal,
-	'name' : _Prop_name,
-	'resizable' : _Prop_resizable,
-	'titled' : _Prop_titled,
-	'visible' : _Prop_visible,
-	'zoomable' : _Prop_zoomable,
-	'zoomed' : _Prop_zoomed,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'bounds' : _Prop_bounds,
+    'closeable' : _Prop_closeable,
+    'document' : _Prop_document,
+    'floating' : _Prop_floating,
+    'id' : _Prop_id,
+    'index' : _Prop_index,
+    'miniaturizable' : _Prop_miniaturizable,
+    'miniaturized' : _Prop_miniaturized,
+    'modal' : _Prop_modal,
+    'name' : _Prop_name,
+    'resizable' : _Prop_resizable,
+    'titled' : _Prop_titled,
+    'visible' : _Prop_visible,
+    'zoomable' : _Prop_zoomable,
+    'zoomed' : _Prop_zoomed,
 }
 window._privelemdict = {
 }
 document._superclassnames = ['item']
 document._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'modified' : _Prop_modified,
-	'name' : _Prop_name,
-	'path' : _Prop_path,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'modified' : _Prop_modified,
+    'name' : _Prop_name,
+    'path' : _Prop_path,
 }
 document._privelemdict = {
 }
 class _3c_(aetools.NComparison):
-	"""< - Less than """
+    """< - Less than """
 class _3d_(aetools.NComparison):
-	"""= - Equal """
+    """= - Equal """
 class _3e_(aetools.NComparison):
-	"""> - Greater than """
+    """> - Greater than """
 class contains(aetools.NComparison):
-	"""contains - Contains """
+    """contains - Contains """
 class ends_with(aetools.NComparison):
-	"""ends with - Ends with """
+    """ends with - Ends with """
 class starts_with(aetools.NComparison):
-	"""starts with - Starts with """
+    """starts with - Starts with """
 class _b2_(aetools.NComparison):
-	"""\xb2 - Less than or equal to """
+    """\xb2 - Less than or equal to """
 class _b3_(aetools.NComparison):
-	"""\xb3 - Greater than or equal to """
+    """\xb3 - Greater than or equal to """
 _Enum_savo = {
-	'ask' : 'ask ',	# Ask the user whether or not to save the file.
-	'yes' : 'yes ',	# Save the file.
-	'no' : 'no  ',	# Do not save the file.
+    'ask' : 'ask ',	# Ask the user whether or not to save the file.
+    'yes' : 'yes ',	# Save the file.
+    'no' : 'no  ',	# Do not save the file.
 }
 
 
@@ -530,9 +530,49 @@ _Enum_savo = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'capp' : application,
-	'cobj' : item,
-	'colr' : color,
-	'cwin' : window,
-	'docu' : document,
+    'capp' : application,
+    'cobj' : item,
+    'colr' : color,
+    'cwin' : window,
+    'docu' : document,
+}
+
+_propdeclarations = {
+    'ID  ' : _Prop_id,
+    'c@#^' : _Prop__3c_Inheritance_3e_,
+    'docu' : _Prop_document,
+    'hclb' : _Prop_closeable,
+    'imod' : _Prop_modified,
+    'isfl' : _Prop_floating,
+    'ismn' : _Prop_miniaturizable,
+    'iszm' : _Prop_zoomable,
+    'pALL' : _Prop_properties,
+    'pbnd' : _Prop_bounds,
+    'pcls' : _Prop_class_,
+    'pidx' : _Prop_index,
+    'pisf' : _Prop_frontmost,
+    'pmnd' : _Prop_miniaturized,
+    'pmod' : _Prop_modal,
+    'pnam' : _Prop_name,
+    'ppth' : _Prop_path,
+    'prsz' : _Prop_resizable,
+    'ptit' : _Prop_titled,
+    'pvis' : _Prop_visible,
+    'pzum' : _Prop_zoomed,
+    'vers' : _Prop_version,
+}
+
+_compdeclarations = {
+    '<   ' : _3c_,
+    '<=  ' : _b2_,
+    '=   ' : _3d_,
+    '>   ' : _3e_,
+    '>=  ' : _b3_,
+    'bgwt' : starts_with,
+    'cont' : contains,
+    'ends' : ends_with,
+}
+
+_enumdeclarations = {
+    'savo' : _Enum_savo,
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py b/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py
index 29a95db..0a6e7d1 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/Terminal_Suite.py
@@ -12,200 +12,200 @@ _code = 'trmx'
 
 class Terminal_Suite_Events:
 
-	def GetURL(self, _object, _attributes={}, **_arguments):
-		"""GetURL: Opens a telnet: URL
-		Required argument: the object for the command
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'GURL'
-		_subcode = 'GURL'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_do_script = {
-		'in_' : 'kfil',
-		'with_command' : 'cmnd',
-	}
-
-	def do_script(self, _object, _attributes={}, **_arguments):
-		"""do script: Run a UNIX shell script or command
-		Required argument: the object for the command
-		Keyword argument in_: the window in which to execute the command
-		Keyword argument with_command: data to be passed to the Terminal application as the command line, deprecated, use direct parameter
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: the reply for the command
-		"""
-		_code = 'core'
-		_subcode = 'dosc'
-
-		aetools.keysubst(_arguments, self._argmap_do_script)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.get('errn', 0):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
+    def GetURL(self, _object, _attributes={}, **_arguments):
+        """GetURL: Opens a telnet: URL
+        Required argument: the object for the command
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        """
+        _code = 'GURL'
+        _subcode = 'GURL'
+
+        if _arguments: raise TypeError, 'No optional args expected'
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
+
+    _argmap_do_script = {
+        'in_' : 'kfil',
+        'with_command' : 'cmnd',
+    }
+
+    def do_script(self, _object, _attributes={}, **_arguments):
+        """do script: Run a UNIX shell script or command
+        Required argument: the object for the command
+        Keyword argument in_: the window in which to execute the command
+        Keyword argument with_command: data to be passed to the Terminal application as the command line, deprecated, use direct parameter
+        Keyword argument _attributes: AppleEvent attribute dictionary
+        Returns: the reply for the command
+        """
+        _code = 'core'
+        _subcode = 'dosc'
+
+        aetools.keysubst(_arguments, self._argmap_do_script)
+        _arguments['----'] = _object
+
+
+        _reply, _arguments, _attributes = self.send(_code, _subcode,
+                _arguments, _attributes)
+        if _arguments.get('errn', 0):
+            raise aetools.Error, aetools.decodeerror(_arguments)
+        # XXXX Optionally decode result
+        if _arguments.has_key('----'):
+            return _arguments['----']
 
 
 class application(aetools.ComponentItem):
-	"""application - The Terminal program """
-	want = 'capp'
+    """application - The Terminal program """
+    want = 'capp'
 class _Prop__3c_Inheritance_3e_(aetools.NProperty):
-	"""<Inheritance> - All of the properties of the superclass. """
-	which = 'c@#^'
-	want = 'capp'
+    """<Inheritance> - All of the properties of the superclass. """
+    which = 'c@#^'
+    want = 'capp'
 class _Prop_properties(aetools.NProperty):
-	"""properties - every property of the Terminal program """
-	which = 'pALL'
-	want = '****'
+    """properties - every property of the Terminal program """
+    which = 'pALL'
+    want = '****'
 #        element 'cwin' as ['name', 'indx', 'rele', 'rang', 'test', 'ID  ']
 #        element 'docu' as ['name', 'indx', 'rele', 'rang', 'test']
 
 applications = application
 
 class window(aetools.ComponentItem):
-	"""window - A Terminal window """
-	want = 'cwin'
+    """window - A Terminal window """
+    want = 'cwin'
 class _Prop_background_color(aetools.NProperty):
-	"""background color - the background color for the window """
-	which = 'pbcl'
-	want = '****'
+    """background color - the background color for the window """
+    which = 'pbcl'
+    want = '****'
 class _Prop_bold_text_color(aetools.NProperty):
-	"""bold text color - the bold text color for the window """
-	which = 'pbtc'
-	want = '****'
+    """bold text color - the bold text color for the window """
+    which = 'pbtc'
+    want = '****'
 class _Prop_bounds(aetools.NProperty):
-	"""bounds - the boundary rectangle for the window, relative to the upper left corner of the screen """
-	which = 'pbnd'
-	want = '****'
+    """bounds - the boundary rectangle for the window, relative to the upper left corner of the screen """
+    which = 'pbnd'
+    want = '****'
 class _Prop_busy(aetools.NProperty):
-	"""busy - Is the window busy running a process? """
-	which = 'busy'
-	want = 'bool'
+    """busy - Is the window busy running a process? """
+    which = 'busy'
+    want = 'bool'
 class _Prop_contents(aetools.NProperty):
-	"""contents - the currently visible contents of the window """
-	which = 'pcnt'
-	want = 'utxt'
+    """contents - the currently visible contents of the window """
+    which = 'pcnt'
+    want = 'utxt'
 class _Prop_cursor_color(aetools.NProperty):
-	"""cursor color - the cursor color for the window """
-	which = 'pcuc'
-	want = '****'
+    """cursor color - the cursor color for the window """
+    which = 'pcuc'
+    want = '****'
 class _Prop_custom_title(aetools.NProperty):
-	"""custom title - the custom title for the window """
-	which = 'titl'
-	want = 'utxt'
+    """custom title - the custom title for the window """
+    which = 'titl'
+    want = 'utxt'
 class _Prop_frame(aetools.NProperty):
-	"""frame - the origin and size of the window """
-	which = 'pfra'
-	want = '****'
+    """frame - the origin and size of the window """
+    which = 'pfra'
+    want = '****'
 class _Prop_frontmost(aetools.NProperty):
-	"""frontmost - Is the window in front of the other Terminal windows? """
-	which = 'pisf'
-	want = 'bool'
+    """frontmost - Is the window in front of the other Terminal windows? """
+    which = 'pisf'
+    want = 'bool'
 class _Prop_history(aetools.NProperty):
-	"""history - the contents of the entire scrolling buffer of the window """
-	which = 'hist'
-	want = 'utxt'
+    """history - the contents of the entire scrolling buffer of the window """
+    which = 'hist'
+    want = 'utxt'
 class _Prop_normal_text_color(aetools.NProperty):
-	"""normal text color - the normal text color for the window """
-	which = 'ptxc'
-	want = '****'
+    """normal text color - the normal text color for the window """
+    which = 'ptxc'
+    want = '****'
 class _Prop_number_of_columns(aetools.NProperty):
-	"""number of columns - the number of columns in the window """
-	which = 'ccol'
-	want = 'long'
+    """number of columns - the number of columns in the window """
+    which = 'ccol'
+    want = 'long'
 class _Prop_number_of_rows(aetools.NProperty):
-	"""number of rows - the number of rows in the window """
-	which = 'crow'
-	want = 'long'
+    """number of rows - the number of rows in the window """
+    which = 'crow'
+    want = 'long'
 class _Prop_origin(aetools.NProperty):
-	"""origin - the lower left coordinates of the window, relative to the lower left corner of the screen """
-	which = 'pori'
-	want = '****'
+    """origin - the lower left coordinates of the window, relative to the lower left corner of the screen """
+    which = 'pori'
+    want = '****'
 class _Prop_position(aetools.NProperty):
-	"""position - the upper left coordinates of the window, relative to the upper left corner of the screen """
-	which = 'ppos'
-	want = '****'
+    """position - the upper left coordinates of the window, relative to the upper left corner of the screen """
+    which = 'ppos'
+    want = '****'
 class _Prop_processes(aetools.NProperty):
-	"""processes - a list of the currently running processes """
-	which = 'prcs'
-	want = 'utxt'
+    """processes - a list of the currently running processes """
+    which = 'prcs'
+    want = 'utxt'
 class _Prop_size(aetools.NProperty):
-	"""size - the width and height of the window """
-	which = 'psiz'
-	want = '****'
+    """size - the width and height of the window """
+    which = 'psiz'
+    want = '****'
 class _Prop_title_displays_custom_title(aetools.NProperty):
-	"""title displays custom title - Does the title for the window contain a custom title? """
-	which = 'tdct'
-	want = 'bool'
+    """title displays custom title - Does the title for the window contain a custom title? """
+    which = 'tdct'
+    want = 'bool'
 class _Prop_title_displays_device_name(aetools.NProperty):
-	"""title displays device name - Does the title for the window contain the device name? """
-	which = 'tddn'
-	want = 'bool'
+    """title displays device name - Does the title for the window contain the device name? """
+    which = 'tddn'
+    want = 'bool'
 class _Prop_title_displays_file_name(aetools.NProperty):
-	"""title displays file name - Does the title for the window contain the file name? """
-	which = 'tdfn'
-	want = 'bool'
+    """title displays file name - Does the title for the window contain the file name? """
+    which = 'tdfn'
+    want = 'bool'
 class _Prop_title_displays_shell_path(aetools.NProperty):
-	"""title displays shell path - Does the title for the window contain the shell path? """
-	which = 'tdsp'
-	want = 'bool'
+    """title displays shell path - Does the title for the window contain the shell path? """
+    which = 'tdsp'
+    want = 'bool'
 class _Prop_title_displays_window_size(aetools.NProperty):
-	"""title displays window size - Does the title for the window contain the window size? """
-	which = 'tdws'
-	want = 'bool'
+    """title displays window size - Does the title for the window contain the window size? """
+    which = 'tdws'
+    want = 'bool'
 
 windows = window
 application._superclassnames = []
 import Standard_Suite
 application._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'properties' : _Prop_properties,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'properties' : _Prop_properties,
 }
 application._privelemdict = {
-	'document' : Standard_Suite.document,
-	'window' : window,
+    'document' : Standard_Suite.document,
+    'window' : window,
 }
 window._superclassnames = []
 window._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'background_color' : _Prop_background_color,
-	'bold_text_color' : _Prop_bold_text_color,
-	'bounds' : _Prop_bounds,
-	'busy' : _Prop_busy,
-	'contents' : _Prop_contents,
-	'cursor_color' : _Prop_cursor_color,
-	'custom_title' : _Prop_custom_title,
-	'frame' : _Prop_frame,
-	'frontmost' : _Prop_frontmost,
-	'history' : _Prop_history,
-	'normal_text_color' : _Prop_normal_text_color,
-	'number_of_columns' : _Prop_number_of_columns,
-	'number_of_rows' : _Prop_number_of_rows,
-	'origin' : _Prop_origin,
-	'position' : _Prop_position,
-	'processes' : _Prop_processes,
-	'properties' : _Prop_properties,
-	'size' : _Prop_size,
-	'title_displays_custom_title' : _Prop_title_displays_custom_title,
-	'title_displays_device_name' : _Prop_title_displays_device_name,
-	'title_displays_file_name' : _Prop_title_displays_file_name,
-	'title_displays_shell_path' : _Prop_title_displays_shell_path,
-	'title_displays_window_size' : _Prop_title_displays_window_size,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'background_color' : _Prop_background_color,
+    'bold_text_color' : _Prop_bold_text_color,
+    'bounds' : _Prop_bounds,
+    'busy' : _Prop_busy,
+    'contents' : _Prop_contents,
+    'cursor_color' : _Prop_cursor_color,
+    'custom_title' : _Prop_custom_title,
+    'frame' : _Prop_frame,
+    'frontmost' : _Prop_frontmost,
+    'history' : _Prop_history,
+    'normal_text_color' : _Prop_normal_text_color,
+    'number_of_columns' : _Prop_number_of_columns,
+    'number_of_rows' : _Prop_number_of_rows,
+    'origin' : _Prop_origin,
+    'position' : _Prop_position,
+    'processes' : _Prop_processes,
+    'properties' : _Prop_properties,
+    'size' : _Prop_size,
+    'title_displays_custom_title' : _Prop_title_displays_custom_title,
+    'title_displays_device_name' : _Prop_title_displays_device_name,
+    'title_displays_file_name' : _Prop_title_displays_file_name,
+    'title_displays_shell_path' : _Prop_title_displays_shell_path,
+    'title_displays_window_size' : _Prop_title_displays_window_size,
 }
 window._privelemdict = {
 }
@@ -214,6 +214,39 @@ window._privelemdict = {
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'capp' : application,
-	'cwin' : window,
+    'capp' : application,
+    'cwin' : window,
+}
+
+_propdeclarations = {
+    'busy' : _Prop_busy,
+    'c@#^' : _Prop__3c_Inheritance_3e_,
+    'ccol' : _Prop_number_of_columns,
+    'crow' : _Prop_number_of_rows,
+    'hist' : _Prop_history,
+    'pALL' : _Prop_properties,
+    'pbcl' : _Prop_background_color,
+    'pbnd' : _Prop_bounds,
+    'pbtc' : _Prop_bold_text_color,
+    'pcnt' : _Prop_contents,
+    'pcuc' : _Prop_cursor_color,
+    'pfra' : _Prop_frame,
+    'pisf' : _Prop_frontmost,
+    'pori' : _Prop_origin,
+    'ppos' : _Prop_position,
+    'prcs' : _Prop_processes,
+    'psiz' : _Prop_size,
+    'ptxc' : _Prop_normal_text_color,
+    'tdct' : _Prop_title_displays_custom_title,
+    'tddn' : _Prop_title_displays_device_name,
+    'tdfn' : _Prop_title_displays_file_name,
+    'tdsp' : _Prop_title_displays_shell_path,
+    'tdws' : _Prop_title_displays_window_size,
+    'titl' : _Prop_custom_title,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/Text_Suite.py b/Lib/plat-mac/lib-scriptpackages/Terminal/Text_Suite.py
index 3ab6c6d..62f4744 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/Text_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/Text_Suite.py
@@ -12,40 +12,40 @@ _code = '????'
 
 class Text_Suite_Events:
 
-	pass
+    pass
 
 
 class attachment(aetools.ComponentItem):
-	"""attachment - Represents an inline text attachment.  This class is used mainly for make commands. """
-	want = 'atts'
+    """attachment - Represents an inline text attachment.  This class is used mainly for make commands. """
+    want = 'atts'
 class _Prop__3c_Inheritance_3e_(aetools.NProperty):
-	"""<Inheritance> - All of the properties of the superclass. """
-	which = 'c@#^'
-	want = 'ctxt'
+    """<Inheritance> - All of the properties of the superclass. """
+    which = 'c@#^'
+    want = 'ctxt'
 class _Prop_file_name(aetools.NProperty):
-	"""file name - The path to the file for the attachment """
-	which = 'atfn'
-	want = 'utxt'
+    """file name - The path to the file for the attachment """
+    which = 'atfn'
+    want = 'utxt'
 #        element 'catr' as ['indx', 'rele', 'rang', 'test']
 #        element 'cha ' as ['indx', 'rele', 'rang', 'test']
 #        element 'cpar' as ['indx', 'rele', 'rang', 'test']
 #        element 'cwor' as ['indx', 'rele', 'rang', 'test']
 
 class attribute_run(aetools.ComponentItem):
-	"""attribute run - This subdivides the text into chunks that all have the same attributes. """
-	want = 'catr'
+    """attribute run - This subdivides the text into chunks that all have the same attributes. """
+    want = 'catr'
 class _Prop_color(aetools.NProperty):
-	"""color - The color of the first character. """
-	which = 'colr'
-	want = 'colr'
+    """color - The color of the first character. """
+    which = 'colr'
+    want = 'colr'
 class _Prop_font(aetools.NProperty):
-	"""font - The name of the font of the first character. """
-	which = 'font'
-	want = 'utxt'
+    """font - The name of the font of the first character. """
+    which = 'font'
+    want = 'utxt'
 class _Prop_size(aetools.NProperty):
-	"""size - The size in points of the first character. """
-	which = 'ptsz'
-	want = 'long'
+    """size - The size in points of the first character. """
+    which = 'ptsz'
+    want = 'long'
 #        element 'catr' as ['indx', 'rele', 'rang', 'test']
 #        element 'cha ' as ['indx', 'rele', 'rang', 'test']
 #        element 'cpar' as ['indx', 'rele', 'rang', 'test']
@@ -54,8 +54,8 @@ class _Prop_size(aetools.NProperty):
 attribute_runs = attribute_run
 
 class character(aetools.ComponentItem):
-	"""character - This subdivides the text into characters. """
-	want = 'cha '
+    """character - This subdivides the text into characters. """
+    want = 'cha '
 #        element 'catr' as ['indx', 'rele', 'rang', 'test']
 #        element 'cha ' as ['indx', 'rele', 'rang', 'test']
 #        element 'cpar' as ['indx', 'rele', 'rang', 'test']
@@ -64,8 +64,8 @@ class character(aetools.ComponentItem):
 characters = character
 
 class paragraph(aetools.ComponentItem):
-	"""paragraph - This subdivides the text into paragraphs. """
-	want = 'cpar'
+    """paragraph - This subdivides the text into paragraphs. """
+    want = 'cpar'
 #        element 'catr' as ['indx', 'rele', 'rang', 'test']
 #        element 'cha ' as ['indx', 'rele', 'rang', 'test']
 #        element 'cpar' as ['indx', 'rele', 'rang', 'test']
@@ -74,16 +74,16 @@ class paragraph(aetools.ComponentItem):
 paragraphs = paragraph
 
 class text(aetools.ComponentItem):
-	"""text - Rich (styled) text """
-	want = 'ctxt'
+    """text - Rich (styled) text """
+    want = 'ctxt'
 #        element 'catr' as ['indx', 'rele', 'rang', 'test']
 #        element 'cha ' as ['indx', 'rele', 'rang', 'test']
 #        element 'cpar' as ['indx', 'rele', 'rang', 'test']
 #        element 'cwor' as ['indx', 'rele', 'rang', 'test']
 
 class word(aetools.ComponentItem):
-	"""word - This subdivides the text into words. """
-	want = 'cwor'
+    """word - This subdivides the text into words. """
+    want = 'cwor'
 #        element 'catr' as ['indx', 'rele', 'rang', 'test']
 #        element 'cha ' as ['indx', 'rele', 'rang', 'test']
 #        element 'cpar' as ['indx', 'rele', 'rang', 'test']
@@ -92,90 +92,104 @@ class word(aetools.ComponentItem):
 words = word
 attachment._superclassnames = ['text']
 attachment._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'file_name' : _Prop_file_name,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'file_name' : _Prop_file_name,
 }
 attachment._privelemdict = {
-	'attribute_run' : attribute_run,
-	'character' : character,
-	'paragraph' : paragraph,
-	'word' : word,
+    'attribute_run' : attribute_run,
+    'character' : character,
+    'paragraph' : paragraph,
+    'word' : word,
 }
 import Standard_Suite
 attribute_run._superclassnames = ['item']
 attribute_run._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'color' : _Prop_color,
-	'font' : _Prop_font,
-	'size' : _Prop_size,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'color' : _Prop_color,
+    'font' : _Prop_font,
+    'size' : _Prop_size,
 }
 attribute_run._privelemdict = {
-	'attribute_run' : attribute_run,
-	'character' : character,
-	'paragraph' : paragraph,
-	'word' : word,
+    'attribute_run' : attribute_run,
+    'character' : character,
+    'paragraph' : paragraph,
+    'word' : word,
 }
 character._superclassnames = ['item']
 character._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'color' : _Prop_color,
-	'font' : _Prop_font,
-	'size' : _Prop_size,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'color' : _Prop_color,
+    'font' : _Prop_font,
+    'size' : _Prop_size,
 }
 character._privelemdict = {
-	'attribute_run' : attribute_run,
-	'character' : character,
-	'paragraph' : paragraph,
-	'word' : word,
+    'attribute_run' : attribute_run,
+    'character' : character,
+    'paragraph' : paragraph,
+    'word' : word,
 }
 paragraph._superclassnames = ['item']
 paragraph._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'color' : _Prop_color,
-	'font' : _Prop_font,
-	'size' : _Prop_size,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'color' : _Prop_color,
+    'font' : _Prop_font,
+    'size' : _Prop_size,
 }
 paragraph._privelemdict = {
-	'attribute_run' : attribute_run,
-	'character' : character,
-	'paragraph' : paragraph,
-	'word' : word,
+    'attribute_run' : attribute_run,
+    'character' : character,
+    'paragraph' : paragraph,
+    'word' : word,
 }
 text._superclassnames = ['item']
 text._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'color' : _Prop_color,
-	'font' : _Prop_font,
-	'size' : _Prop_size,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'color' : _Prop_color,
+    'font' : _Prop_font,
+    'size' : _Prop_size,
 }
 text._privelemdict = {
-	'attribute_run' : attribute_run,
-	'character' : character,
-	'paragraph' : paragraph,
-	'word' : word,
+    'attribute_run' : attribute_run,
+    'character' : character,
+    'paragraph' : paragraph,
+    'word' : word,
 }
 word._superclassnames = ['item']
 word._privpropdict = {
-	'_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
-	'color' : _Prop_color,
-	'font' : _Prop_font,
-	'size' : _Prop_size,
+    '_3c_Inheritance_3e_' : _Prop__3c_Inheritance_3e_,
+    'color' : _Prop_color,
+    'font' : _Prop_font,
+    'size' : _Prop_size,
 }
 word._privelemdict = {
-	'attribute_run' : attribute_run,
-	'character' : character,
-	'paragraph' : paragraph,
-	'word' : word,
+    'attribute_run' : attribute_run,
+    'character' : character,
+    'paragraph' : paragraph,
+    'word' : word,
 }
 
 #
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'atts' : attachment,
-	'catr' : attribute_run,
-	'cha ' : character,
-	'cpar' : paragraph,
-	'ctxt' : text,
-	'cwor' : word,
+    'atts' : attachment,
+    'catr' : attribute_run,
+    'cha ' : character,
+    'cpar' : paragraph,
+    'ctxt' : text,
+    'cwor' : word,
+}
+
+_propdeclarations = {
+    'atfn' : _Prop_file_name,
+    'c@#^' : _Prop__3c_Inheritance_3e_,
+    'colr' : _Prop_color,
+    'font' : _Prop_font,
+    'ptsz' : _Prop_size,
+}
+
+_compdeclarations = {
+}
+
+_enumdeclarations = {
 }
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py b/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
index 1aaf3d8..8ed692d 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
@@ -9,17 +9,17 @@ import Terminal_Suite
 
 
 _code_to_module = {
-	'????' : Standard_Suite,
-	'????' : Text_Suite,
-	'trmx' : Terminal_Suite,
+    '????' : Standard_Suite,
+    '????' : Text_Suite,
+    'trmx' : Terminal_Suite,
 }
 
 
 
 _code_to_fullname = {
-	'????' : ('Terminal.Standard_Suite', 'Standard_Suite'),
-	'????' : ('Terminal.Text_Suite', 'Text_Suite'),
-	'trmx' : ('Terminal.Terminal_Suite', 'Terminal_Suite'),
+    '????' : ('Terminal.Standard_Suite', 'Standard_Suite'),
+    '????' : ('Terminal.Text_Suite', 'Text_Suite'),
+    'trmx' : ('Terminal.Terminal_Suite', 'Terminal_Suite'),
 }
 
 from Standard_Suite import *
@@ -27,22 +27,27 @@ from Text_Suite import *
 from Terminal_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', {}))
+    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(color)
+getbaseclasses(window)
+getbaseclasses(application)
+getbaseclasses(item)
+getbaseclasses(document)
 getbaseclasses(character)
 getbaseclasses(attachment)
 getbaseclasses(paragraph)
@@ -51,37 +56,32 @@ getbaseclasses(attribute_run)
 getbaseclasses(text)
 getbaseclasses(window)
 getbaseclasses(application)
-getbaseclasses(color)
-getbaseclasses(window)
-getbaseclasses(application)
-getbaseclasses(item)
-getbaseclasses(document)
 
 #
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'cha ' : character,
-	'atts' : attachment,
-	'cpar' : paragraph,
-	'cwor' : word,
-	'catr' : attribute_run,
-	'ctxt' : text,
-	'cwin' : window,
-	'capp' : application,
-	'colr' : color,
-	'cwin' : window,
-	'capp' : application,
-	'cobj' : item,
-	'docu' : document,
+    'colr' : color,
+    'cwin' : window,
+    'capp' : application,
+    'cobj' : item,
+    'docu' : document,
+    'cha ' : character,
+    'atts' : attachment,
+    'cpar' : paragraph,
+    'cwor' : word,
+    'catr' : attribute_run,
+    'ctxt' : text,
+    'cwin' : window,
+    'capp' : application,
 }
 
 
 class Terminal(Standard_Suite_Events,
-		Text_Suite_Events,
-		Terminal_Suite_Events,
-		aetools.TalkTo):
-	_signature = 'trmx'
+        Text_Suite_Events,
+        Terminal_Suite_Events,
+        aetools.TalkTo):
+    _signature = 'trmx'
 
-	_moduleName = 'Terminal'
+    _moduleName = 'Terminal'