1 files changed, 95 insertions, 95 deletions

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 bf78ea1..6705d6b 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/QuickDraw_Graphics_Suite.py
@@ -119,45 +119,17 @@ class writing_code(aetools.NProperty):
 
 drawing_areas = drawing_area
 
-class graphic_group(aetools.ComponentItem):
-	"""graphic group - Group of graphics """
-	want = 'cpic'
-
-graphic_groups = graphic_group
-
-class graphic_line(aetools.ComponentItem):
-	"""graphic line - A graphic line """
-	want = 'glin'
-class arrow_style(aetools.NProperty):
-	"""arrow style - the arrow style """
-	which = 'arro'
-	want = 'arro'
-class dash_style(aetools.NProperty):
-	"""dash style - the dash style """
-	which = 'pdst'
-	want = 'tdas'
-class end_point(aetools.NProperty):
-	"""end point - the ending point of the line """
-	which = 'pend'
-	want = 'QDpt'
-class start_point(aetools.NProperty):
-	"""start point - the starting point of the line """
-	which = 'pstp'
-	want = 'QDpt'
-
-graphic_lines = graphic_line
-
-class graphic_object(aetools.ComponentItem):
-	"""graphic object - A graphic object """
+class graphic_objects(aetools.ComponentItem):
+	"""graphic objects -  """
 	want = 'cgob'
 
-graphic_objects = graphic_object
+graphic_object = graphic_objects
 
-class graphic_shape(aetools.ComponentItem):
-	"""graphic shape - A graphic shape """
+class graphic_shapes(aetools.ComponentItem):
+	"""graphic shapes -  """
 	want = 'cgsh'
 
-graphic_shapes = graphic_shape
+graphic_shape = graphic_shapes
 
 class graphic_text(aetools.ComponentItem):
 	"""graphic text - A series of characters within a drawing area """
@@ -179,23 +151,11 @@ class uniform_styles(aetools.NProperty):
 	which = 'ustl'
 	want = 'tsty'
 
-class oval(aetools.ComponentItem):
-	"""oval - An oval """
+class ovals(aetools.ComponentItem):
+	"""ovals -  """
 	want = 'covl'
 
-ovals = oval
-
-class pixel(aetools.ComponentItem):
-	"""pixel - A pixel """
-	want = 'cpxl'
-
-class pixel_map(aetools.ComponentItem):
-	"""pixel map - A pixel map """
-	want = 'cpix'
-
-pixel_maps = pixel_map
-
-pixels = pixel
+oval = ovals
 
 class polygon(aetools.ComponentItem):
 	"""polygon - A polygon """
@@ -207,11 +167,29 @@ class point_list(aetools.NProperty):
 
 polygons = polygon
 
-class rectangle(aetools.ComponentItem):
-	"""rectangle - A rectangle """
+class graphic_groups(aetools.ComponentItem):
+	"""graphic groups -  """
+	want = 'cpic'
+
+graphic_group = graphic_groups
+
+class pixel_maps(aetools.ComponentItem):
+	"""pixel maps -  """
+	want = 'cpix'
+
+pixel_map = pixel_maps
+
+class pixel(aetools.ComponentItem):
+	"""pixel - A pixel """
+	want = 'cpxl'
+
+pixels = pixel
+
+class rectangles(aetools.ComponentItem):
+	"""rectangles -  """
 	want = 'crec'
 
-rectangles = rectangle
+rectangle = rectangles
 
 class rounded_rectangle(aetools.ComponentItem):
 	"""rounded rectangle - A rounded rectangle """
@@ -226,6 +204,28 @@ class corner_curve_width(aetools.NProperty):
 	want = 'shor'
 
 rounded_rectangles = rounded_rectangle
+
+class graphic_line(aetools.ComponentItem):
+	"""graphic line - A graphic line """
+	want = 'glin'
+class arrow_style(aetools.NProperty):
+	"""arrow style - the arrow style """
+	which = 'arro'
+	want = 'arro'
+class dash_style(aetools.NProperty):
+	"""dash style - the dash style """
+	which = 'pdst'
+	want = 'tdas'
+class end_point(aetools.NProperty):
+	"""end point - the ending point of the line """
+	which = 'pend'
+	want = 'QDpt'
+class start_point(aetools.NProperty):
+	"""start point - the starting point of the line """
+	which = 'pstp'
+	want = 'QDpt'
+
+graphic_lines = graphic_line
 arc._superclassnames = []
 arc._privpropdict = {
 	'arc_angle' : arc_angle,
@@ -259,29 +259,15 @@ drawing_area._privpropdict = {
 }
 drawing_area._privelemdict = {
 }
-graphic_group._superclassnames = []
-graphic_group._privpropdict = {
+graphic_objects._superclassnames = []
+graphic_objects._privpropdict = {
 }
-graphic_group._privelemdict = {
+graphic_objects._privelemdict = {
 }
-graphic_line._superclassnames = []
-graphic_line._privpropdict = {
-	'arrow_style' : arrow_style,
-	'dash_style' : dash_style,
-	'end_point' : end_point,
-	'start_point' : start_point,
+graphic_shapes._superclassnames = []
+graphic_shapes._privpropdict = {
 }
-graphic_line._privelemdict = {
-}
-graphic_object._superclassnames = []
-graphic_object._privpropdict = {
-}
-graphic_object._privelemdict = {
-}
-graphic_shape._superclassnames = []
-graphic_shape._privpropdict = {
-}
-graphic_shape._privelemdict = {
+graphic_shapes._privelemdict = {
 }
 graphic_text._superclassnames = []
 graphic_text._privpropdict = {
@@ -292,21 +278,10 @@ graphic_text._privpropdict = {
 }
 graphic_text._privelemdict = {
 }
-oval._superclassnames = []
-oval._privpropdict = {
+ovals._superclassnames = []
+ovals._privpropdict = {
 }
-oval._privelemdict = {
-}
-pixel._superclassnames = []
-pixel._privpropdict = {
-	'color' : color,
-}
-pixel._privelemdict = {
-}
-pixel_map._superclassnames = []
-pixel_map._privpropdict = {
-}
-pixel_map._privelemdict = {
+ovals._privelemdict = {
 }
 polygon._superclassnames = []
 polygon._privpropdict = {
@@ -314,10 +289,26 @@ polygon._privpropdict = {
 }
 polygon._privelemdict = {
 }
-rectangle._superclassnames = []
-rectangle._privpropdict = {
+graphic_groups._superclassnames = []
+graphic_groups._privpropdict = {
+}
+graphic_groups._privelemdict = {
+}
+pixel_maps._superclassnames = []
+pixel_maps._privpropdict = {
+}
+pixel_maps._privelemdict = {
+}
+pixel._superclassnames = []
+pixel._privpropdict = {
+	'color' : color,
+}
+pixel._privelemdict = {
+}
+rectangles._superclassnames = []
+rectangles._privpropdict = {
 }
-rectangle._privelemdict = {
+rectangles._privelemdict = {
 }
 rounded_rectangle._superclassnames = []
 rounded_rectangle._privpropdict = {
@@ -326,6 +317,15 @@ rounded_rectangle._privpropdict = {
 }
 rounded_rectangle._privelemdict = {
 }
+graphic_line._superclassnames = []
+graphic_line._privpropdict = {
+	'arrow_style' : arrow_style,
+	'dash_style' : dash_style,
+	'end_point' : end_point,
+	'start_point' : start_point,
+}
+graphic_line._privelemdict = {
+}
 _Enum_arro = {
 	'no_arrow' : 'arno',	# No arrow on line
 	'arrow_at_start' : 'arst',	# Arrow at start of line
@@ -358,15 +358,15 @@ _Enum_tran = {
 _classdeclarations = {
 	'carc' : arc,
 	'cdrw' : drawing_area,
-	'cgob' : graphic_object,
-	'cgsh' : graphic_shape,
+	'cgob' : graphic_objects,
+	'cgsh' : graphic_shapes,
 	'cgtx' : graphic_text,
-	'covl' : oval,
+	'covl' : ovals,
 	'cpgn' : polygon,
-	'cpic' : graphic_group,
-	'cpix' : pixel_map,
+	'cpic' : graphic_groups,
+	'cpix' : pixel_maps,
 	'cpxl' : pixel,
-	'crec' : rectangle,
+	'crec' : rectangles,
 	'crrc' : rounded_rectangle,
 	'glin' : graphic_line,
 }