diff --git a/src/calibre/ebooks/rtf2xml/copy.py b/src/calibre/ebooks/rtf2xml/copy.py
index a4cc3e0bf2..26ca300696 100755
--- a/src/calibre/ebooks/rtf2xml/copy.py
+++ b/src/calibre/ebooks/rtf2xml/copy.py
@@ -15,7 +15,8 @@
 #                                                                       #
 #                                                                       #
 #########################################################################
-import sys, os
+import sys, os, shutil
+
 class Copy:
     """Copy each changed file to a directory for debugging purposes"""
     __dir = ""
@@ -64,25 +65,7 @@ class Copy:
         of cp. Otherwise, use a safe python method.
         """
         write_file = os.path.join(Copy.__dir,new_file)
-        platform = sys.platform
-        if platform[:5] == 'linux':
-            command = 'cp %(file)s %(write_file)s' % vars()
-            os.system(command)
-        else:
-            read_obj = open(file,'r')
-            write_obj = open(write_file, 'w')
-            line = "dummy"
-            while line:
-                    line = read_obj.read(1000)
-                    write_obj.write(line )
-            read_obj.close()
-            write_obj.close()
+        shutil.copyfile(file, write_file)
+    
     def rename(self, source, dest):
-        read_obj = open(source, 'r')
-        write_obj = open(dest, 'w')
-        line = 1
-        while line:
-            line = read_obj.readline()
-            write_obj.write(line)
-        read_obj.close()
-        write_obj.close()
+        shutil.copyfile(source, dest)
\ No newline at end of file
diff --git a/src/odf/grammar.py b/src/odf/grammar.py
index 1c74463bea..c4a70ad29e 100644
--- a/src/odf/grammar.py
+++ b/src/odf/grammar.py
@@ -96,70 +96,70 @@ allowed_children = {
 	(ANIMNS,u'audio') : (
 	),
 	(ANIMNS,u'command') : (
-		(ANIMNS,u'param'), 
+		(ANIMNS,u'param'),
 	),
 # allowed_children
 	(ANIMNS,u'iterate') : (
-		(ANIMNS,u'animate'), 
-		(ANIMNS,u'animateColor'), 
-		(ANIMNS,u'animateMotion'), 
-		(ANIMNS,u'animateTransform'), 
-		(ANIMNS,u'audio'), 
-		(ANIMNS,u'command'), 
-		(ANIMNS,u'iterate'), 
-		(ANIMNS,u'par'), 
-		(ANIMNS,u'seq'), 
-		(ANIMNS,u'set'), 
-		(ANIMNS,u'transitionFilter'), 
+		(ANIMNS,u'animate'),
+		(ANIMNS,u'animateColor'),
+		(ANIMNS,u'animateMotion'),
+		(ANIMNS,u'animateTransform'),
+		(ANIMNS,u'audio'),
+		(ANIMNS,u'command'),
+		(ANIMNS,u'iterate'),
+		(ANIMNS,u'par'),
+		(ANIMNS,u'seq'),
+		(ANIMNS,u'set'),
+		(ANIMNS,u'transitionFilter'),
 	),
 	(ANIMNS,u'par') : (
-		(ANIMNS,u'animate'), 
-		(ANIMNS,u'animateColor'), 
-		(ANIMNS,u'animateMotion'), 
-		(ANIMNS,u'animateTransform'), 
-		(ANIMNS,u'audio'), 
-		(ANIMNS,u'command'), 
-		(ANIMNS,u'iterate'), 
-		(ANIMNS,u'par'), 
-		(ANIMNS,u'seq'), 
-		(ANIMNS,u'set'), 
-		(ANIMNS,u'transitionFilter'), 
+		(ANIMNS,u'animate'),
+		(ANIMNS,u'animateColor'),
+		(ANIMNS,u'animateMotion'),
+		(ANIMNS,u'animateTransform'),
+		(ANIMNS,u'audio'),
+		(ANIMNS,u'command'),
+		(ANIMNS,u'iterate'),
+		(ANIMNS,u'par'),
+		(ANIMNS,u'seq'),
+		(ANIMNS,u'set'),
+		(ANIMNS,u'transitionFilter'),
 	),
 # allowed_children
 	(ANIMNS,u'param') : (
 	),
 	(ANIMNS,u'seq') : (
-		(ANIMNS,u'animate'), 
-		(ANIMNS,u'animateColor'), 
-		(ANIMNS,u'animateMotion'), 
-		(ANIMNS,u'animateTransform'), 
-		(ANIMNS,u'audio'), 
-		(ANIMNS,u'command'), 
-		(ANIMNS,u'iterate'), 
-		(ANIMNS,u'par'), 
-		(ANIMNS,u'seq'), 
-		(ANIMNS,u'set'), 
-		(ANIMNS,u'transitionFilter'), 
+		(ANIMNS,u'animate'),
+		(ANIMNS,u'animateColor'),
+		(ANIMNS,u'animateMotion'),
+		(ANIMNS,u'animateTransform'),
+		(ANIMNS,u'audio'),
+		(ANIMNS,u'command'),
+		(ANIMNS,u'iterate'),
+		(ANIMNS,u'par'),
+		(ANIMNS,u'seq'),
+		(ANIMNS,u'set'),
+		(ANIMNS,u'transitionFilter'),
 	),
 	(ANIMNS,u'set') : (
 	),
 	(ANIMNS,u'transitionFilter') : (
 	),
 	(CHARTNS,u'axis') : (
-		(CHARTNS,u'categories'), 
-		(CHARTNS,u'grid'), 
-		(CHARTNS,u'title'), 
+		(CHARTNS,u'categories'),
+		(CHARTNS,u'grid'),
+		(CHARTNS,u'title'),
 	),
 # allowed_children
 	(CHARTNS,u'categories') : (
 	),
 	(CHARTNS,u'chart') : (
-		(CHARTNS,u'footer'), 
-		(CHARTNS,u'legend'), 
-		(CHARTNS,u'plot-area'), 
-		(CHARTNS,u'subtitle'), 
-		(CHARTNS,u'title'), 
-		(TABLENS,u'table'), 
+		(CHARTNS,u'footer'),
+		(CHARTNS,u'legend'),
+		(CHARTNS,u'plot-area'),
+		(CHARTNS,u'subtitle'),
+		(CHARTNS,u'title'),
+		(TABLENS,u'table'),
 	),
 	(CHARTNS,u'data-point') : (
 	),
@@ -170,7 +170,7 @@ allowed_children = {
 	(CHARTNS,u'floor') : (
 	),
 	(CHARTNS,u'footer') : (
-		(TEXTNS,u'p'), 
+		(TEXTNS,u'p'),
 	),
 	(CHARTNS,u'grid') : (
 	),
@@ -180,23 +180,23 @@ allowed_children = {
 	(CHARTNS,u'mean-value') : (
 	),
 	(CHARTNS,u'plot-area') : (
-		(CHARTNS,u'axis'), 
-		(CHARTNS,u'floor'), 
-		(CHARTNS,u'series'), 
-		(CHARTNS,u'stock-gain-marker'), 
-		(CHARTNS,u'stock-loss-marker'), 
-		(CHARTNS,u'stock-range-line'), 
-		(CHARTNS,u'wall'), 
-		(DR3DNS,u'light'), 
+		(CHARTNS,u'axis'),
+		(CHARTNS,u'floor'),
+		(CHARTNS,u'series'),
+		(CHARTNS,u'stock-gain-marker'),
+		(CHARTNS,u'stock-loss-marker'),
+		(CHARTNS,u'stock-range-line'),
+		(CHARTNS,u'wall'),
+		(DR3DNS,u'light'),
 	),
 	(CHARTNS,u'regression-curve') : (
 	),
 	(CHARTNS,u'series') : (
-		(CHARTNS,u'data-point'), 
-		(CHARTNS,u'domain'), 
-		(CHARTNS,u'error-indicator'), 
-		(CHARTNS,u'mean-value'), 
-		(CHARTNS,u'regression-curve'), 
+		(CHARTNS,u'data-point'),
+		(CHARTNS,u'domain'),
+		(CHARTNS,u'error-indicator'),
+		(CHARTNS,u'mean-value'),
+		(CHARTNS,u'regression-curve'),
 	),
 	(CHARTNS,u'stock-gain-marker') : (
 	),
@@ -206,35 +206,35 @@ allowed_children = {
 	(CHARTNS,u'stock-range-line') : (
 	),
 	(CHARTNS,u'subtitle') : (
-		(TEXTNS,u'p'), 
+		(TEXTNS,u'p'),
 	),
 	(CHARTNS,u'symbol-image') : (
 	),
 	(CHARTNS,u'title') : (
-		(TEXTNS,u'p'), 
+		(TEXTNS,u'p'),
 	),
 	(CHARTNS,u'wall') : (
 	),
 	(CONFIGNS,u'config-item') : (
 	),
 	(CONFIGNS,u'config-item-map-entry') : (
-		(CONFIGNS,u'config-item'), 
-		(CONFIGNS,u'config-item-map-indexed'), 
-		(CONFIGNS,u'config-item-map-named'), 
-		(CONFIGNS,u'config-item-set'), 
+		(CONFIGNS,u'config-item'),
+		(CONFIGNS,u'config-item-map-indexed'),
+		(CONFIGNS,u'config-item-map-named'),
+		(CONFIGNS,u'config-item-set'),
 	),
 	(CONFIGNS,u'config-item-map-indexed') : (
-		(CONFIGNS,u'config-item-map-entry'), 
+		(CONFIGNS,u'config-item-map-entry'),
 	),
 	(CONFIGNS,u'config-item-map-named') : (
-		(CONFIGNS,u'config-item-map-entry'), 
+		(CONFIGNS,u'config-item-map-entry'),
 	),
 # allowed_children
 	(CONFIGNS,u'config-item-set') : (
-		(CONFIGNS,u'config-item'), 
-		(CONFIGNS,u'config-item-map-indexed'), 
-		(CONFIGNS,u'config-item-map-named'), 
-		(CONFIGNS,u'config-item-set'), 
+		(CONFIGNS,u'config-item'),
+		(CONFIGNS,u'config-item-map-indexed'),
+		(CONFIGNS,u'config-item-map-named'),
+		(CONFIGNS,u'config-item-set'),
 	),
 	(MANIFESTNS,u'algorithm') : (
 	),
@@ -256,35 +256,35 @@ allowed_children = {
 	),
 # allowed_children
 	(NUMBERNS,u'boolean-style') : (
-		(NUMBERNS,u'boolean'), 
-		(NUMBERNS,u'text'), 
-		(STYLENS,u'map'), 
-		(STYLENS,u'text-properties'), 
+		(NUMBERNS,u'boolean'),
+		(NUMBERNS,u'text'),
+		(STYLENS,u'map'),
+		(STYLENS,u'text-properties'),
 	),
 	(NUMBERNS,u'currency-style') : (
-		(NUMBERNS,u'currency-symbol'), 
-		(NUMBERNS,u'number'), 
-		(NUMBERNS,u'text'), 
-		(STYLENS,u'map'), 
-		(STYLENS,u'text-properties'), 
+		(NUMBERNS,u'currency-symbol'),
+		(NUMBERNS,u'number'),
+		(NUMBERNS,u'text'),
+		(STYLENS,u'map'),
+		(STYLENS,u'text-properties'),
 	),
 	(NUMBERNS,u'currency-symbol') : (
 	),
 	(NUMBERNS,u'date-style') : (
-		(NUMBERNS,u'am-pm'), 
-		(NUMBERNS,u'day'), 
-		(NUMBERNS,u'day-of-week'), 
-		(NUMBERNS,u'era'), 
-		(NUMBERNS,u'hours'), 
-		(NUMBERNS,u'minutes'), 
-		(NUMBERNS,u'month'), 
-		(NUMBERNS,u'quarter'), 
-		(NUMBERNS,u'seconds'), 
-		(NUMBERNS,u'text'), 
-		(NUMBERNS,u'week-of-year'), 
-		(NUMBERNS,u'year'), 
-		(STYLENS,u'map'), 
-		(STYLENS,u'text-properties'), 
+		(NUMBERNS,u'am-pm'),
+		(NUMBERNS,u'day'),
+		(NUMBERNS,u'day-of-week'),
+		(NUMBERNS,u'era'),
+		(NUMBERNS,u'hours'),
+		(NUMBERNS,u'minutes'),
+		(NUMBERNS,u'month'),
+		(NUMBERNS,u'quarter'),
+		(NUMBERNS,u'seconds'),
+		(NUMBERNS,u'text'),
+		(NUMBERNS,u'week-of-year'),
+		(NUMBERNS,u'year'),
+		(STYLENS,u'map'),
+		(STYLENS,u'text-properties'),
 	),
 # allowed_children
 	(NUMBERNS,u'day') : (
@@ -304,22 +304,22 @@ allowed_children = {
 	(NUMBERNS,u'month') : (
 	),
 	(NUMBERNS,u'number') : (
-		(NUMBERNS,u'embedded-text'), 
+		(NUMBERNS,u'embedded-text'),
 	),
 	(NUMBERNS,u'number-style') : (
-		(NUMBERNS,u'fraction'), 
-		(NUMBERNS,u'number'), 
-		(NUMBERNS,u'scientific-number'), 
-		(NUMBERNS,u'text'), 
-		(STYLENS,u'map'), 
-		(STYLENS,u'text-properties'), 
+		(NUMBERNS,u'fraction'),
+		(NUMBERNS,u'number'),
+		(NUMBERNS,u'scientific-number'),
+		(NUMBERNS,u'text'),
+		(STYLENS,u'map'),
+		(STYLENS,u'text-properties'),
 	),
 # allowed_children
 	(NUMBERNS,u'percentage-style') : (
-		(NUMBERNS,u'number'), 
-		(NUMBERNS,u'text'), 
-		(STYLENS,u'map'), 
-		(STYLENS,u'text-properties'), 
+		(NUMBERNS,u'number'),
+		(NUMBERNS,u'text'),
+		(STYLENS,u'map'),
+		(STYLENS,u'text-properties'),
 	),
 	(NUMBERNS,u'quarter') : (
 	),
@@ -332,19 +332,19 @@ allowed_children = {
 	(NUMBERNS,u'text-content') : (
 	),
 	(NUMBERNS,u'text-style') : (
-		(NUMBERNS,u'text'), 
-		(NUMBERNS,u'text-content'), 
-		(STYLENS,u'map'), 
-		(STYLENS,u'text-properties'), 
+		(NUMBERNS,u'text'),
+		(NUMBERNS,u'text-content'),
+		(STYLENS,u'map'),
+		(STYLENS,u'text-properties'),
 	),
 	(NUMBERNS,u'time-style') : (
-		(NUMBERNS,u'am-pm'), 
-		(NUMBERNS,u'hours'), 
-		(NUMBERNS,u'minutes'), 
-		(NUMBERNS,u'seconds'), 
-		(NUMBERNS,u'text'), 
-		(STYLENS,u'map'), 
-		(STYLENS,u'text-properties'), 
+		(NUMBERNS,u'am-pm'),
+		(NUMBERNS,u'hours'),
+		(NUMBERNS,u'minutes'),
+		(NUMBERNS,u'seconds'),
+		(NUMBERNS,u'text'),
+		(STYLENS,u'map'),
+		(STYLENS,u'text-properties'),
 	),
 # allowed_children
 	(NUMBERNS,u'week-of-year') : (
@@ -360,76 +360,76 @@ allowed_children = {
 	(DR3DNS,u'rotate') : (
 	),
 	(DR3DNS,u'scene') : (
-		(DR3DNS,u'cube'), 
-		(DR3DNS,u'extrude'), 
-		(DR3DNS,u'light'), 
-		(DR3DNS,u'rotate'), 
-		(DR3DNS,u'scene'), 
-		(DR3DNS,u'sphere'), 
+		(DR3DNS,u'cube'),
+		(DR3DNS,u'extrude'),
+		(DR3DNS,u'light'),
+		(DR3DNS,u'rotate'),
+		(DR3DNS,u'scene'),
+		(DR3DNS,u'sphere'),
 	),
 	(DR3DNS,u'sphere') : (
 	),
 	(DRAWNS,u'a') : (
-		(DRAWNS,u'frame'), 
+		(DRAWNS,u'frame'),
 	),
 # allowed_children
 	(DRAWNS,u'applet') : (
-		(DRAWNS,u'param'), 
+		(DRAWNS,u'param'),
 	),
 	(DRAWNS,u'area-circle') : (
-		(OFFICENS,u'event-listeners'), 
-		(SVGNS,u'desc'), 
+		(OFFICENS,u'event-listeners'),
+		(SVGNS,u'desc'),
 	),
 	(DRAWNS,u'area-polygon') : (
-		(OFFICENS,u'event-listeners'), 
-		(SVGNS,u'desc'), 
+		(OFFICENS,u'event-listeners'),
+		(SVGNS,u'desc'),
 	),
 	(DRAWNS,u'area-rectangle') : (
-		(OFFICENS,u'event-listeners'), 
-		(SVGNS,u'desc'), 
+		(OFFICENS,u'event-listeners'),
+		(SVGNS,u'desc'),
 	),
 	(DRAWNS,u'caption') : (
-		(DRAWNS,u'glue-point'), 
-		(OFFICENS,u'event-listeners'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'p'), 
+		(DRAWNS,u'glue-point'),
+		(OFFICENS,u'event-listeners'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'p'),
 	),
 	(DRAWNS,u'circle') : (
-		(DRAWNS,u'glue-point'), 
-		(OFFICENS,u'event-listeners'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'p'), 
+		(DRAWNS,u'glue-point'),
+		(OFFICENS,u'event-listeners'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'p'),
 	),
 # allowed_children
 	(DRAWNS,u'connector') : (
-		(DRAWNS,u'glue-point'), 
-		(OFFICENS,u'event-listeners'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'p'), 
+		(DRAWNS,u'glue-point'),
+		(OFFICENS,u'event-listeners'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'p'),
 	),
 	(DRAWNS,u'contour-path') : (
 	),
 	(DRAWNS,u'contour-polygon') : (
 	),
 	(DRAWNS,u'control') : (
-		(DRAWNS,u'glue-point'), 
+		(DRAWNS,u'glue-point'),
 	),
 	(DRAWNS,u'custom-shape') : (
-		(DRAWNS,u'enhanced-geometry'), 
-		(DRAWNS,u'glue-point'), 
-		(OFFICENS,u'event-listeners'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'p'), 
+		(DRAWNS,u'enhanced-geometry'),
+		(DRAWNS,u'glue-point'),
+		(OFFICENS,u'event-listeners'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'p'),
 	),
 	(DRAWNS,u'ellipse') : (
-		(DRAWNS,u'glue-point'), 
-		(OFFICENS,u'event-listeners'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'p'), 
+		(DRAWNS,u'glue-point'),
+		(OFFICENS,u'event-listeners'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'p'),
 	),
 	(DRAWNS,u'enhanced-geometry') : (
-		(DRAWNS,u'equation'), 
-		(DRAWNS,u'handle'), 
+		(DRAWNS,u'equation'),
+		(DRAWNS,u'handle'),
 	),
 	(DRAWNS,u'equation') : (
 	),
@@ -438,40 +438,40 @@ allowed_children = {
 	(DRAWNS,u'floating-frame') : (
 	),
 	(DRAWNS,u'frame') : (
-		(DRAWNS,u'applet'), 
-		(DRAWNS,u'contour-path'), 
-		(DRAWNS,u'contour-polygon'), 
-		(DRAWNS,u'floating-frame'), 
-		(DRAWNS,u'glue-point'), 
-		(DRAWNS,u'image'), 
-		(DRAWNS,u'image-map'), 
-		(DRAWNS,u'object'), 
-		(DRAWNS,u'object-ole'), 
-		(DRAWNS,u'plugin'), 
-		(DRAWNS,u'text-box'), 
-		(OFFICENS,u'event-listeners'), 
-		(SVGNS,u'desc'), 
+		(DRAWNS,u'applet'),
+		(DRAWNS,u'contour-path'),
+		(DRAWNS,u'contour-polygon'),
+		(DRAWNS,u'floating-frame'),
+		(DRAWNS,u'glue-point'),
+		(DRAWNS,u'image'),
+		(DRAWNS,u'image-map'),
+		(DRAWNS,u'object'),
+		(DRAWNS,u'object-ole'),
+		(DRAWNS,u'plugin'),
+		(DRAWNS,u'text-box'),
+		(OFFICENS,u'event-listeners'),
+		(SVGNS,u'desc'),
 	),
 	(DRAWNS,u'g') : (
-		(DR3DNS,u'scene'), 
-		(DRAWNS,u'caption'), 
-		(DRAWNS,u'circle'), 
-		(DRAWNS,u'connector'), 
-		(DRAWNS,u'control'), 
-		(DRAWNS,u'custom-shape'), 
-		(DRAWNS,u'ellipse'), 
-		(DRAWNS,u'frame'), 
-		(DRAWNS,u'g'), 
-		(DRAWNS,u'glue-point'), 
-		(DRAWNS,u'line'), 
-		(DRAWNS,u'measure'), 
-		(DRAWNS,u'page-thumbnail'), 
-		(DRAWNS,u'path'), 
-		(DRAWNS,u'polygon'), 
-		(DRAWNS,u'polyline'), 
-		(DRAWNS,u'rect'), 
-		(DRAWNS,u'regular-polygon'), 
-		(OFFICENS,u'event-listeners'), 
+		(DR3DNS,u'scene'),
+		(DRAWNS,u'caption'),
+		(DRAWNS,u'circle'),
+		(DRAWNS,u'connector'),
+		(DRAWNS,u'control'),
+		(DRAWNS,u'custom-shape'),
+		(DRAWNS,u'ellipse'),
+		(DRAWNS,u'frame'),
+		(DRAWNS,u'g'),
+		(DRAWNS,u'glue-point'),
+		(DRAWNS,u'line'),
+		(DRAWNS,u'measure'),
+		(DRAWNS,u'page-thumbnail'),
+		(DRAWNS,u'path'),
+		(DRAWNS,u'polygon'),
+		(DRAWNS,u'polyline'),
+		(DRAWNS,u'rect'),
+		(DRAWNS,u'regular-polygon'),
+		(OFFICENS,u'event-listeners'),
 	),
 	(DRAWNS,u'glue-point') : (
 	),
@@ -483,300 +483,300 @@ allowed_children = {
 	),
 # allowed_children
 	(DRAWNS,u'image') : (
-		(OFFICENS,u'binary-data'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'p'), 
+		(OFFICENS,u'binary-data'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'p'),
 	),
 	(DRAWNS,u'image-map') : (
-		(DRAWNS,u'area-circle'), 
-		(DRAWNS,u'area-polygon'), 
-		(DRAWNS,u'area-rectangle'), 
+		(DRAWNS,u'area-circle'),
+		(DRAWNS,u'area-polygon'),
+		(DRAWNS,u'area-rectangle'),
 	),
 	(DRAWNS,u'layer') : (
 	),
 	(DRAWNS,u'layer-set') : (
-		(DRAWNS,u'layer'), 
+		(DRAWNS,u'layer'),
 	),
 	(DRAWNS,u'line') : (
-		(DRAWNS,u'glue-point'), 
-		(OFFICENS,u'event-listeners'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'p'), 
+		(DRAWNS,u'glue-point'),
+		(OFFICENS,u'event-listeners'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'p'),
 	),
 	(DRAWNS,u'marker') : (
 	),
 	(DRAWNS,u'measure') : (
-		(DRAWNS,u'glue-point'), 
-		(OFFICENS,u'event-listeners'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'p'), 
+		(DRAWNS,u'glue-point'),
+		(OFFICENS,u'event-listeners'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'p'),
 	),
 	(DRAWNS,u'object') : (
-		(MATHNS,u'math'), 
-		(OFFICENS,u'document'), 
+		(MATHNS,u'math'),
+		(OFFICENS,u'document'),
 	),
 	(DRAWNS,u'object-ole') : (
-		(OFFICENS,u'binary-data'), 
+		(OFFICENS,u'binary-data'),
 	),
 	(DRAWNS,u'opacity') : (
 	),
 	(DRAWNS,u'page') : (
-		(ANIMNS,u'animate'), 
-		(ANIMNS,u'animateColor'), 
-		(ANIMNS,u'animateMotion'), 
-		(ANIMNS,u'animateTransform'), 
-		(ANIMNS,u'audio'), 
-		(ANIMNS,u'command'), 
-		(ANIMNS,u'iterate'), 
-		(ANIMNS,u'par'), 
-		(ANIMNS,u'seq'), 
-		(ANIMNS,u'set'), 
-		(ANIMNS,u'transitionFilter'), 
-		(DR3DNS,u'scene'), 
-		(DRAWNS,u'caption'), 
-		(DRAWNS,u'circle'), 
-		(DRAWNS,u'connector'), 
-		(DRAWNS,u'control'), 
-		(DRAWNS,u'custom-shape'), 
-		(DRAWNS,u'ellipse'), 
-		(DRAWNS,u'frame'), 
-		(DRAWNS,u'g'), 
-		(DRAWNS,u'line'), 
-		(DRAWNS,u'measure'), 
-		(DRAWNS,u'page-thumbnail'), 
-		(DRAWNS,u'path'), 
-		(DRAWNS,u'polygon'), 
-		(DRAWNS,u'polyline'), 
-		(DRAWNS,u'rect'), 
-		(DRAWNS,u'regular-polygon'), 
-		(OFFICENS,u'forms'), 
-		(PRESENTATIONNS,u'animations'), 
-		(PRESENTATIONNS,u'notes'), 
+		(ANIMNS,u'animate'),
+		(ANIMNS,u'animateColor'),
+		(ANIMNS,u'animateMotion'),
+		(ANIMNS,u'animateTransform'),
+		(ANIMNS,u'audio'),
+		(ANIMNS,u'command'),
+		(ANIMNS,u'iterate'),
+		(ANIMNS,u'par'),
+		(ANIMNS,u'seq'),
+		(ANIMNS,u'set'),
+		(ANIMNS,u'transitionFilter'),
+		(DR3DNS,u'scene'),
+		(DRAWNS,u'caption'),
+		(DRAWNS,u'circle'),
+		(DRAWNS,u'connector'),
+		(DRAWNS,u'control'),
+		(DRAWNS,u'custom-shape'),
+		(DRAWNS,u'ellipse'),
+		(DRAWNS,u'frame'),
+		(DRAWNS,u'g'),
+		(DRAWNS,u'line'),
+		(DRAWNS,u'measure'),
+		(DRAWNS,u'page-thumbnail'),
+		(DRAWNS,u'path'),
+		(DRAWNS,u'polygon'),
+		(DRAWNS,u'polyline'),
+		(DRAWNS,u'rect'),
+		(DRAWNS,u'regular-polygon'),
+		(OFFICENS,u'forms'),
+		(PRESENTATIONNS,u'animations'),
+		(PRESENTATIONNS,u'notes'),
 	),
 	(DRAWNS,u'page-thumbnail') : (
 	),
 	(DRAWNS,u'param') : (
 	),
 	(DRAWNS,u'path') : (
-		(DRAWNS,u'glue-point'), 
-		(OFFICENS,u'event-listeners'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'p'), 
+		(DRAWNS,u'glue-point'),
+		(OFFICENS,u'event-listeners'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'p'),
 	),
 	(DRAWNS,u'plugin') : (
-		(DRAWNS,u'param'), 
+		(DRAWNS,u'param'),
 	),
 	(DRAWNS,u'polygon') : (
-		(DRAWNS,u'glue-point'), 
-		(OFFICENS,u'event-listeners'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'p'), 
+		(DRAWNS,u'glue-point'),
+		(OFFICENS,u'event-listeners'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'p'),
 	),
 	(DRAWNS,u'polyline') : (
-		(DRAWNS,u'glue-point'), 
-		(OFFICENS,u'event-listeners'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'p'), 
+		(DRAWNS,u'glue-point'),
+		(OFFICENS,u'event-listeners'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'p'),
 	),
 	(DRAWNS,u'rect') : (
-		(DRAWNS,u'glue-point'), 
-		(OFFICENS,u'event-listeners'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'p'), 
+		(DRAWNS,u'glue-point'),
+		(OFFICENS,u'event-listeners'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'p'),
 	),
 	(DRAWNS,u'regular-polygon') : (
-		(DRAWNS,u'glue-point'), 
-		(OFFICENS,u'event-listeners'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'p'), 
+		(DRAWNS,u'glue-point'),
+		(OFFICENS,u'event-listeners'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'p'),
 	),
 	(DRAWNS,u'stroke-dash') : (
 	),
 	(DRAWNS,u'text-box') : (
-		(DR3DNS,u'scene'), 
-		(DRAWNS,u'a'), 
-		(DRAWNS,u'caption'), 
-		(DRAWNS,u'circle'), 
-		(DRAWNS,u'connector'), 
-		(DRAWNS,u'control'), 
-		(DRAWNS,u'custom-shape'), 
-		(DRAWNS,u'ellipse'), 
-		(DRAWNS,u'frame'), 
-		(DRAWNS,u'g'), 
-		(DRAWNS,u'line'), 
-		(DRAWNS,u'measure'), 
-		(DRAWNS,u'page-thumbnail'), 
-		(DRAWNS,u'path'), 
-		(DRAWNS,u'polygon'), 
-		(DRAWNS,u'polyline'), 
-		(DRAWNS,u'rect'), 
-		(DRAWNS,u'regular-polygon'), 
-		(TABLENS,u'table'), 
-		(TEXTNS,u'alphabetical-index'), 
-		(TEXTNS,u'bibliography'), 
-		(TEXTNS,u'change'), 
-		(TEXTNS,u'change-end'), 
-		(TEXTNS,u'change-start'), 
-		(TEXTNS,u'h'), 
-		(TEXTNS,u'illustration-index'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'numbered-paragraph'), 
-		(TEXTNS,u'object-index'), 
-		(TEXTNS,u'p'), 
-		(TEXTNS,u'section'), 
-                (TEXTNS,u'soft-page-break'),
-		(TEXTNS,u'table-index'), 
-		(TEXTNS,u'table-of-content'), 
-		(TEXTNS,u'user-index'), 
+		(DR3DNS,u'scene'),
+		(DRAWNS,u'a'),
+		(DRAWNS,u'caption'),
+		(DRAWNS,u'circle'),
+		(DRAWNS,u'connector'),
+		(DRAWNS,u'control'),
+		(DRAWNS,u'custom-shape'),
+		(DRAWNS,u'ellipse'),
+		(DRAWNS,u'frame'),
+		(DRAWNS,u'g'),
+		(DRAWNS,u'line'),
+		(DRAWNS,u'measure'),
+		(DRAWNS,u'page-thumbnail'),
+		(DRAWNS,u'path'),
+		(DRAWNS,u'polygon'),
+		(DRAWNS,u'polyline'),
+		(DRAWNS,u'rect'),
+		(DRAWNS,u'regular-polygon'),
+		(TABLENS,u'table'),
+		(TEXTNS,u'alphabetical-index'),
+		(TEXTNS,u'bibliography'),
+		(TEXTNS,u'change'),
+		(TEXTNS,u'change-end'),
+		(TEXTNS,u'change-start'),
+		(TEXTNS,u'h'),
+		(TEXTNS,u'illustration-index'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'numbered-paragraph'),
+		(TEXTNS,u'object-index'),
+		(TEXTNS,u'p'),
+		(TEXTNS,u'section'),
+		(TEXTNS,u'soft-page-break'),
+		(TEXTNS,u'table-index'),
+		(TEXTNS,u'table-of-content'),
+		(TEXTNS,u'user-index'),
 	),
 	(FORMNS,u'button') : (
-		(FORMNS,u'properties'), 
-		(OFFICENS,u'event-listeners'), 
+		(FORMNS,u'properties'),
+		(OFFICENS,u'event-listeners'),
 	),
 	(FORMNS,u'checkbox') : (
-		(FORMNS,u'properties'), 
-		(OFFICENS,u'event-listeners'), 
+		(FORMNS,u'properties'),
+		(OFFICENS,u'event-listeners'),
 	),
 	(FORMNS,u'column') : (
-		(FORMNS,u'checkbox'), 
-		(FORMNS,u'combobox'), 
-		(FORMNS,u'date'), 
-		(FORMNS,u'formatted-text'), 
-		(FORMNS,u'listbox'), 
-		(FORMNS,u'number'), 
-		(FORMNS,u'text'), 
-		(FORMNS,u'textarea'), 
+		(FORMNS,u'checkbox'),
+		(FORMNS,u'combobox'),
+		(FORMNS,u'date'),
+		(FORMNS,u'formatted-text'),
+		(FORMNS,u'listbox'),
+		(FORMNS,u'number'),
+		(FORMNS,u'text'),
+		(FORMNS,u'textarea'),
 	),
 	(FORMNS,u'combobox') : (
-		(FORMNS,u'item'), 
-		(FORMNS,u'properties'), 
-		(OFFICENS,u'event-listeners'), 
+		(FORMNS,u'item'),
+		(FORMNS,u'properties'),
+		(OFFICENS,u'event-listeners'),
 	),
 	(FORMNS,u'connection-resource') : (
 	),
 	(FORMNS,u'date') : (
-		(FORMNS,u'properties'), 
-		(OFFICENS,u'event-listeners'), 
+		(FORMNS,u'properties'),
+		(OFFICENS,u'event-listeners'),
 	),
 	(FORMNS,u'file') : (
-		(FORMNS,u'properties'), 
-		(OFFICENS,u'event-listeners'), 
+		(FORMNS,u'properties'),
+		(OFFICENS,u'event-listeners'),
 	),
 	(FORMNS,u'fixed-text') : (
-		(FORMNS,u'properties'), 
-		(OFFICENS,u'event-listeners'), 
+		(FORMNS,u'properties'),
+		(OFFICENS,u'event-listeners'),
 	),
 # allowed_children
 	(FORMNS,u'form') : (
-		(FORMNS,u'button'), 
-		(FORMNS,u'checkbox'), 
-		(FORMNS,u'combobox'), 
-		(FORMNS,u'connection-resource'), 
-		(FORMNS,u'date'), 
-		(FORMNS,u'file'), 
-		(FORMNS,u'fixed-text'), 
-		(FORMNS,u'form'), 
-		(FORMNS,u'formatted-text'), 
-		(FORMNS,u'frame'), 
-		(FORMNS,u'generic-control'), 
-		(FORMNS,u'grid'), 
-		(FORMNS,u'hidden'), 
-		(FORMNS,u'image'), 
-		(FORMNS,u'image-frame'), 
-		(FORMNS,u'listbox'), 
-		(FORMNS,u'number'), 
-		(FORMNS,u'password'), 
-		(FORMNS,u'properties'), 
-		(FORMNS,u'radio'), 
-		(FORMNS,u'text'), 
-		(FORMNS,u'textarea'), 
-		(FORMNS,u'time'), 
-		(FORMNS,u'value-range'), 
-		(OFFICENS,u'event-listeners'), 
+		(FORMNS,u'button'),
+		(FORMNS,u'checkbox'),
+		(FORMNS,u'combobox'),
+		(FORMNS,u'connection-resource'),
+		(FORMNS,u'date'),
+		(FORMNS,u'file'),
+		(FORMNS,u'fixed-text'),
+		(FORMNS,u'form'),
+		(FORMNS,u'formatted-text'),
+		(FORMNS,u'frame'),
+		(FORMNS,u'generic-control'),
+		(FORMNS,u'grid'),
+		(FORMNS,u'hidden'),
+		(FORMNS,u'image'),
+		(FORMNS,u'image-frame'),
+		(FORMNS,u'listbox'),
+		(FORMNS,u'number'),
+		(FORMNS,u'password'),
+		(FORMNS,u'properties'),
+		(FORMNS,u'radio'),
+		(FORMNS,u'text'),
+		(FORMNS,u'textarea'),
+		(FORMNS,u'time'),
+		(FORMNS,u'value-range'),
+		(OFFICENS,u'event-listeners'),
 	),
 	(FORMNS,u'formatted-text') : (
-		(FORMNS,u'properties'), 
-		(OFFICENS,u'event-listeners'), 
+		(FORMNS,u'properties'),
+		(OFFICENS,u'event-listeners'),
 	),
 	(FORMNS,u'frame') : (
-		(FORMNS,u'properties'), 
-		(OFFICENS,u'event-listeners'), 
+		(FORMNS,u'properties'),
+		(OFFICENS,u'event-listeners'),
 	),
 	(FORMNS,u'generic-control') : (
-		(FORMNS,u'properties'), 
-		(OFFICENS,u'event-listeners'), 
+		(FORMNS,u'properties'),
+		(OFFICENS,u'event-listeners'),
 	),
 	(FORMNS,u'grid') : (
-		(FORMNS,u'column'), 
-		(FORMNS,u'properties'), 
-		(OFFICENS,u'event-listeners'), 
+		(FORMNS,u'column'),
+		(FORMNS,u'properties'),
+		(OFFICENS,u'event-listeners'),
 	),
 	(FORMNS,u'hidden') : (
-		(FORMNS,u'properties'), 
-		(OFFICENS,u'event-listeners'), 
+		(FORMNS,u'properties'),
+		(OFFICENS,u'event-listeners'),
 	),
 	(FORMNS,u'image') : (
-		(FORMNS,u'properties'), 
-		(OFFICENS,u'event-listeners'), 
+		(FORMNS,u'properties'),
+		(OFFICENS,u'event-listeners'),
 	),
 	(FORMNS,u'image-frame') : (
-		(FORMNS,u'properties'), 
-		(OFFICENS,u'event-listeners'), 
+		(FORMNS,u'properties'),
+		(OFFICENS,u'event-listeners'),
 	),
 	(FORMNS,u'item') : (
 	),
 	(FORMNS,u'list-property') : (
-		(FORMNS,u'list-value'), 
-		(FORMNS,u'list-value'), 
-		(FORMNS,u'list-value'), 
-		(FORMNS,u'list-value'), 
-		(FORMNS,u'list-value'), 
-		(FORMNS,u'list-value'), 
-		(FORMNS,u'list-value'), 
+		(FORMNS,u'list-value'),
+		(FORMNS,u'list-value'),
+		(FORMNS,u'list-value'),
+		(FORMNS,u'list-value'),
+		(FORMNS,u'list-value'),
+		(FORMNS,u'list-value'),
+		(FORMNS,u'list-value'),
 	),
 	(FORMNS,u'list-value') : (
 	),
 	(FORMNS,u'listbox') : (
-		(FORMNS,u'option'), 
-		(FORMNS,u'properties'), 
-		(OFFICENS,u'event-listeners'), 
+		(FORMNS,u'option'),
+		(FORMNS,u'properties'),
+		(OFFICENS,u'event-listeners'),
 	),
 	(FORMNS,u'number') : (
-		(FORMNS,u'properties'), 
-		(OFFICENS,u'event-listeners'), 
+		(FORMNS,u'properties'),
+		(OFFICENS,u'event-listeners'),
 	),
 	(FORMNS,u'option') : (
 	),
 	(FORMNS,u'password') : (
-		(FORMNS,u'properties'), 
-		(OFFICENS,u'event-listeners'), 
+		(FORMNS,u'properties'),
+		(OFFICENS,u'event-listeners'),
 	),
 	(FORMNS,u'properties') : (
-		(FORMNS,u'list-property'), 
-		(FORMNS,u'property'), 
+		(FORMNS,u'list-property'),
+		(FORMNS,u'property'),
 	),
 	(FORMNS,u'property') : (
 	),
 	(FORMNS,u'radio') : (
-		(FORMNS,u'properties'), 
-		(OFFICENS,u'event-listeners'), 
+		(FORMNS,u'properties'),
+		(OFFICENS,u'event-listeners'),
 	),
 	(FORMNS,u'text') : (
-		(FORMNS,u'properties'), 
-		(OFFICENS,u'event-listeners'), 
+		(FORMNS,u'properties'),
+		(OFFICENS,u'event-listeners'),
 	),
 	(FORMNS,u'textarea') : (
-		(FORMNS,u'properties'), 
-		(OFFICENS,u'event-listeners'), 
-		(TEXTNS,u'p'), 
+		(FORMNS,u'properties'),
+		(OFFICENS,u'event-listeners'),
+		(TEXTNS,u'p'),
 	),
 	(FORMNS,u'time') : (
-		(FORMNS,u'properties'), 
-		(OFFICENS,u'event-listeners'), 
+		(FORMNS,u'properties'),
+		(OFFICENS,u'event-listeners'),
 	),
 	(FORMNS,u'value-range') : (
-		(FORMNS,u'properties'), 
-		(OFFICENS,u'event-listeners'), 
+		(FORMNS,u'properties'),
+		(OFFICENS,u'event-listeners'),
 	),
 	(METANS,u'auto-reload') : (
 	),
@@ -808,129 +808,129 @@ allowed_children = {
 	),
 # allowed_children
 	(OFFICENS,u'annotation') : (
-		(DCNS,u'creator'), 
-		(DCNS,u'date'), 
-		(METANS,u'date-string'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'p'), 
+		(DCNS,u'creator'),
+		(DCNS,u'date'),
+		(METANS,u'date-string'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'p'),
 	),
 	(OFFICENS,u'automatic-styles') : (
-		(NUMBERNS,u'boolean-style'), 
-		(NUMBERNS,u'currency-style'), 
-		(NUMBERNS,u'date-style'), 
-		(NUMBERNS,u'number-style'), 
-		(NUMBERNS,u'percentage-style'), 
-		(NUMBERNS,u'text-style'), 
-		(NUMBERNS,u'time-style'), 
-		(STYLENS,u'page-layout'), 
-		(STYLENS,u'style'), 
-		(TEXTNS,u'list-style'), 
+		(NUMBERNS,u'boolean-style'),
+		(NUMBERNS,u'currency-style'),
+		(NUMBERNS,u'date-style'),
+		(NUMBERNS,u'number-style'),
+		(NUMBERNS,u'percentage-style'),
+		(NUMBERNS,u'text-style'),
+		(NUMBERNS,u'time-style'),
+		(STYLENS,u'page-layout'),
+		(STYLENS,u'style'),
+		(TEXTNS,u'list-style'),
 	),
 	(OFFICENS,u'binary-data') : (
 	),
 	(OFFICENS,u'body') : (
-		(OFFICENS,u'chart'), 
-		(OFFICENS,u'drawing'), 
-		(OFFICENS,u'image'), 
-		(OFFICENS,u'presentation'), 
-		(OFFICENS,u'spreadsheet'), 
-		(OFFICENS,u'text'), 
+		(OFFICENS,u'chart'),
+		(OFFICENS,u'drawing'),
+		(OFFICENS,u'image'),
+		(OFFICENS,u'presentation'),
+		(OFFICENS,u'spreadsheet'),
+		(OFFICENS,u'text'),
 	),
 	(OFFICENS,u'change-info') : (
-		(DCNS,u'creator'), 
-		(DCNS,u'date'), 
-		(TEXTNS,u'p'), 
+		(DCNS,u'creator'),
+		(DCNS,u'date'),
+		(TEXTNS,u'p'),
 	),
 	(OFFICENS,u'chart') : (
-		(CHARTNS,u'chart'), 
-		(TABLENS,u'calculation-settings'), 
-		(TABLENS,u'consolidation'), 
-		(TABLENS,u'content-validations'), 
-		(TABLENS,u'data-pilot-tables'), 
-		(TABLENS,u'database-ranges'), 
-		(TABLENS,u'dde-links'), 
-		(TABLENS,u'label-ranges'), 
-		(TABLENS,u'named-expressions'), 
-		(TEXTNS,u'alphabetical-index-auto-mark-file'), 
-		(TEXTNS,u'dde-connection-decls'), 
-		(TEXTNS,u'sequence-decls'), 
-		(TEXTNS,u'user-field-decls'), 
-		(TEXTNS,u'variable-decls'), 
+		(CHARTNS,u'chart'),
+		(TABLENS,u'calculation-settings'),
+		(TABLENS,u'consolidation'),
+		(TABLENS,u'content-validations'),
+		(TABLENS,u'data-pilot-tables'),
+		(TABLENS,u'database-ranges'),
+		(TABLENS,u'dde-links'),
+		(TABLENS,u'label-ranges'),
+		(TABLENS,u'named-expressions'),
+		(TEXTNS,u'alphabetical-index-auto-mark-file'),
+		(TEXTNS,u'dde-connection-decls'),
+		(TEXTNS,u'sequence-decls'),
+		(TEXTNS,u'user-field-decls'),
+		(TEXTNS,u'variable-decls'),
 	),
 	(OFFICENS,u'dde-source') : (
 	),
 	(OFFICENS,u'document') : (
-		(OFFICENS,u'automatic-styles'), 
-		(OFFICENS,u'body'), 
-		(OFFICENS,u'font-face-decls'), 
-		(OFFICENS,u'master-styles'), 
-		(OFFICENS,u'meta'), 
-		(OFFICENS,u'scripts'), 
-		(OFFICENS,u'settings'), 
-		(OFFICENS,u'styles'), 
+		(OFFICENS,u'automatic-styles'),
+		(OFFICENS,u'body'),
+		(OFFICENS,u'font-face-decls'),
+		(OFFICENS,u'master-styles'),
+		(OFFICENS,u'meta'),
+		(OFFICENS,u'scripts'),
+		(OFFICENS,u'settings'),
+		(OFFICENS,u'styles'),
 	),
 	(OFFICENS,u'document-content') : (
-		(OFFICENS,u'automatic-styles'), 
-		(OFFICENS,u'body'), 
-		(OFFICENS,u'font-face-decls'), 
-		(OFFICENS,u'scripts'), 
+		(OFFICENS,u'automatic-styles'),
+		(OFFICENS,u'body'),
+		(OFFICENS,u'font-face-decls'),
+		(OFFICENS,u'scripts'),
 	),
 	(OFFICENS,u'document-meta') : (
-		(OFFICENS,u'meta'), 
+		(OFFICENS,u'meta'),
 	),
 	(OFFICENS,u'document-settings') : (
-		(OFFICENS,u'settings'), 
+		(OFFICENS,u'settings'),
 	),
 	(OFFICENS,u'document-styles') : (
-		(OFFICENS,u'automatic-styles'), 
-		(OFFICENS,u'font-face-decls'), 
-		(OFFICENS,u'master-styles'), 
-		(OFFICENS,u'styles'), 
+		(OFFICENS,u'automatic-styles'),
+		(OFFICENS,u'font-face-decls'),
+		(OFFICENS,u'master-styles'),
+		(OFFICENS,u'styles'),
 	),
 	(OFFICENS,u'drawing') : (
-		(DRAWNS,u'page'), 
-		(TABLENS,u'calculation-settings'), 
-		(TABLENS,u'consolidation'), 
-		(TABLENS,u'content-validations'), 
-		(TABLENS,u'data-pilot-tables'), 
-		(TABLENS,u'database-ranges'), 
-		(TABLENS,u'dde-links'), 
-		(TABLENS,u'label-ranges'), 
-		(TABLENS,u'named-expressions'), 
-		(TEXTNS,u'alphabetical-index-auto-mark-file'), 
-		(TEXTNS,u'dde-connection-decls'), 
-		(TEXTNS,u'sequence-decls'), 
-		(TEXTNS,u'user-field-decls'), 
-		(TEXTNS,u'variable-decls'), 
+		(DRAWNS,u'page'),
+		(TABLENS,u'calculation-settings'),
+		(TABLENS,u'consolidation'),
+		(TABLENS,u'content-validations'),
+		(TABLENS,u'data-pilot-tables'),
+		(TABLENS,u'database-ranges'),
+		(TABLENS,u'dde-links'),
+		(TABLENS,u'label-ranges'),
+		(TABLENS,u'named-expressions'),
+		(TEXTNS,u'alphabetical-index-auto-mark-file'),
+		(TEXTNS,u'dde-connection-decls'),
+		(TEXTNS,u'sequence-decls'),
+		(TEXTNS,u'user-field-decls'),
+		(TEXTNS,u'variable-decls'),
 	),
 	(OFFICENS,u'event-listeners') : (
-		(PRESENTATIONNS,u'event-listener'), 
-		(SCRIPTNS,u'event-listener'), 
+		(PRESENTATIONNS,u'event-listener'),
+		(SCRIPTNS,u'event-listener'),
 	),
 	(OFFICENS,u'font-face-decls') : (
-		(STYLENS,u'font-face'), 
+		(STYLENS,u'font-face'),
 	),
 # allowed_children
 	(OFFICENS,u'forms') : (
-		(XFORMSNS,u'model'), 
-		(FORMNS,u'form'), 
+		(XFORMSNS,u'model'),
+		(FORMNS,u'form'),
 	),
 	(OFFICENS,u'image') : (
-		(DRAWNS,u'frame'), 
+		(DRAWNS,u'frame'),
 	),
 	(OFFICENS,u'master-styles') : (
-		(DRAWNS,u'layer-set'), 
-		(STYLENS,u'handout-master'), 
-		(STYLENS,u'master-page'), 
+		(DRAWNS,u'layer-set'),
+		(STYLENS,u'handout-master'),
+		(STYLENS,u'master-page'),
 		(TABLENS,u'table-template'),
 	),
 	(OFFICENS,u'meta') : (
-		(DCNS,u'creator'), 
-		(DCNS,u'date'), 
-		(DCNS,u'description'), 
-		(DCNS,u'language'), 
-		(DCNS,u'subject'), 
-		(DCNS,u'title'), 
+		(DCNS,u'creator'),
+		(DCNS,u'date'),
+		(DCNS,u'description'),
+		(DCNS,u'language'),
+		(DCNS,u'subject'),
+		(DCNS,u'title'),
 # Completes Dublin Core start
 #		(DCNS,'contributor'),
 #		(DCNS,'coverage'),
@@ -942,171 +942,171 @@ allowed_children = {
 #		(DCNS,'source'),
 #		(DCNS,'type'),
 # Completes Dublin Core end
-		(METANS,u'auto-reload'), 
-		(METANS,u'creation-date'), 
-		(METANS,u'document-statistic'), 
-		(METANS,u'editing-cycles'), 
-		(METANS,u'editing-duration'), 
-		(METANS,u'generator'), 
-		(METANS,u'hyperlink-behaviour'), 
-		(METANS,u'initial-creator'), 
-		(METANS,u'keyword'), 
-		(METANS,u'print-date'), 
-		(METANS,u'printed-by'), 
-		(METANS,u'template'), 
-		(METANS,u'user-defined'), 
+		(METANS,u'auto-reload'),
+		(METANS,u'creation-date'),
+		(METANS,u'document-statistic'),
+		(METANS,u'editing-cycles'),
+		(METANS,u'editing-duration'),
+		(METANS,u'generator'),
+		(METANS,u'hyperlink-behaviour'),
+		(METANS,u'initial-creator'),
+		(METANS,u'keyword'),
+		(METANS,u'print-date'),
+		(METANS,u'printed-by'),
+		(METANS,u'template'),
+		(METANS,u'user-defined'),
 	),
 	(OFFICENS,u'presentation') : (
-		(DRAWNS,u'page'), 
-		(PRESENTATIONNS,u'date-time-decl'), 
-		(PRESENTATIONNS,u'footer-decl'), 
-		(PRESENTATIONNS,u'header-decl'), 
-		(PRESENTATIONNS,u'settings'), 
-		(TABLENS,u'calculation-settings'), 
-		(TABLENS,u'consolidation'), 
-		(TABLENS,u'content-validations'), 
-		(TABLENS,u'data-pilot-tables'), 
-		(TABLENS,u'database-ranges'), 
-		(TABLENS,u'dde-links'), 
-		(TABLENS,u'label-ranges'), 
-		(TABLENS,u'named-expressions'), 
-		(TEXTNS,u'alphabetical-index-auto-mark-file'), 
-		(TEXTNS,u'dde-connection-decls'), 
-		(TEXTNS,u'sequence-decls'), 
-		(TEXTNS,u'user-field-decls'), 
-		(TEXTNS,u'variable-decls'), 
+		(DRAWNS,u'page'),
+		(PRESENTATIONNS,u'date-time-decl'),
+		(PRESENTATIONNS,u'footer-decl'),
+		(PRESENTATIONNS,u'header-decl'),
+		(PRESENTATIONNS,u'settings'),
+		(TABLENS,u'calculation-settings'),
+		(TABLENS,u'consolidation'),
+		(TABLENS,u'content-validations'),
+		(TABLENS,u'data-pilot-tables'),
+		(TABLENS,u'database-ranges'),
+		(TABLENS,u'dde-links'),
+		(TABLENS,u'label-ranges'),
+		(TABLENS,u'named-expressions'),
+		(TEXTNS,u'alphabetical-index-auto-mark-file'),
+		(TEXTNS,u'dde-connection-decls'),
+		(TEXTNS,u'sequence-decls'),
+		(TEXTNS,u'user-field-decls'),
+		(TEXTNS,u'variable-decls'),
 	),
 # allowed_children
 	(OFFICENS,u'script') : None,
 
 	(OFFICENS,u'scripts') : (
-		(OFFICENS,u'event-listeners'), 
-		(OFFICENS,u'script'), 
+		(OFFICENS,u'event-listeners'),
+		(OFFICENS,u'script'),
 	),
 	(OFFICENS,u'settings') : (
-		(CONFIGNS,u'config-item-set'), 
+		(CONFIGNS,u'config-item-set'),
 	),
 	(OFFICENS,u'spreadsheet') : (
-		(TABLENS,u'calculation-settings'), 
-		(TABLENS,u'consolidation'), 
-		(TABLENS,u'content-validations'), 
-		(TABLENS,u'data-pilot-tables'), 
-		(TABLENS,u'database-ranges'), 
-		(TABLENS,u'dde-links'), 
-		(TABLENS,u'label-ranges'), 
-		(TABLENS,u'named-expressions'), 
-		(TABLENS,u'table'), 
-		(TABLENS,u'tracked-changes'), 
-		(TEXTNS,u'alphabetical-index-auto-mark-file'), 
-		(TEXTNS,u'dde-connection-decls'), 
-		(TEXTNS,u'sequence-decls'), 
-		(TEXTNS,u'user-field-decls'), 
-		(TEXTNS,u'variable-decls'), 
+		(TABLENS,u'calculation-settings'),
+		(TABLENS,u'consolidation'),
+		(TABLENS,u'content-validations'),
+		(TABLENS,u'data-pilot-tables'),
+		(TABLENS,u'database-ranges'),
+		(TABLENS,u'dde-links'),
+		(TABLENS,u'label-ranges'),
+		(TABLENS,u'named-expressions'),
+		(TABLENS,u'table'),
+		(TABLENS,u'tracked-changes'),
+		(TEXTNS,u'alphabetical-index-auto-mark-file'),
+		(TEXTNS,u'dde-connection-decls'),
+		(TEXTNS,u'sequence-decls'),
+		(TEXTNS,u'user-field-decls'),
+		(TEXTNS,u'variable-decls'),
 	),
 	(OFFICENS,u'styles') : (
-		(NUMBERNS,u'boolean-style'), 
-		(NUMBERNS,u'currency-style'), 
-		(NUMBERNS,u'date-style'), 
-		(NUMBERNS,u'number-style'), 
-		(NUMBERNS,u'percentage-style'), 
-		(NUMBERNS,u'text-style'), 
-		(NUMBERNS,u'time-style'), 
-		(DRAWNS,u'fill-image'), 
-		(DRAWNS,u'gradient'), 
-		(DRAWNS,u'hatch'), 
-		(DRAWNS,u'marker'), 
-		(DRAWNS,u'opacity'), 
-		(DRAWNS,u'stroke-dash'), 
-		(STYLENS,u'default-style'), 
-		(STYLENS,u'presentation-page-layout'), 
-		(STYLENS,u'style'), 
-		(SVGNS,u'linearGradient'), 
-		(SVGNS,u'radialGradient'), 
-		(TEXTNS,u'bibliography-configuration'), 
-		(TEXTNS,u'linenumbering-configuration'), 
-		(TEXTNS,u'list-style'), 
-		(TEXTNS,u'notes-configuration'), 
-		(TEXTNS,u'outline-style'), 
+		(NUMBERNS,u'boolean-style'),
+		(NUMBERNS,u'currency-style'),
+		(NUMBERNS,u'date-style'),
+		(NUMBERNS,u'number-style'),
+		(NUMBERNS,u'percentage-style'),
+		(NUMBERNS,u'text-style'),
+		(NUMBERNS,u'time-style'),
+		(DRAWNS,u'fill-image'),
+		(DRAWNS,u'gradient'),
+		(DRAWNS,u'hatch'),
+		(DRAWNS,u'marker'),
+		(DRAWNS,u'opacity'),
+		(DRAWNS,u'stroke-dash'),
+		(STYLENS,u'default-style'),
+		(STYLENS,u'presentation-page-layout'),
+		(STYLENS,u'style'),
+		(SVGNS,u'linearGradient'),
+		(SVGNS,u'radialGradient'),
+		(TEXTNS,u'bibliography-configuration'),
+		(TEXTNS,u'linenumbering-configuration'),
+		(TEXTNS,u'list-style'),
+		(TEXTNS,u'notes-configuration'),
+		(TEXTNS,u'outline-style'),
 	),
 	(OFFICENS,u'text') : (
-		(DR3DNS,u'scene'), 
-		(DRAWNS,u'a'), 
-		(DRAWNS,u'caption'), 
-		(DRAWNS,u'circle'), 
-		(DRAWNS,u'connector'), 
-		(DRAWNS,u'control'), 
-		(DRAWNS,u'custom-shape'), 
-		(DRAWNS,u'ellipse'), 
-		(DRAWNS,u'frame'), 
-		(DRAWNS,u'g'), 
-		(DRAWNS,u'line'), 
-		(DRAWNS,u'measure'), 
-		(DRAWNS,u'page-thumbnail'), 
-		(DRAWNS,u'path'), 
-		(DRAWNS,u'polygon'), 
-		(DRAWNS,u'polyline'), 
-		(DRAWNS,u'rect'), 
-		(DRAWNS,u'regular-polygon'), 
-		(OFFICENS,u'forms'), 
-		(TABLENS,u'calculation-settings'), 
-		(TABLENS,u'consolidation'), 
-		(TABLENS,u'content-validations'), 
-		(TABLENS,u'data-pilot-tables'), 
-		(TABLENS,u'database-ranges'), 
-		(TABLENS,u'dde-links'), 
-		(TABLENS,u'label-ranges'), 
-		(TABLENS,u'named-expressions'), 
-		(TABLENS,u'table'), 
-		(TEXTNS,u'alphabetical-index'), 
-		(TEXTNS,u'alphabetical-index-auto-mark-file'), 
-		(TEXTNS,u'bibliography'), 
-		(TEXTNS,u'change'), 
-		(TEXTNS,u'change-end'), 
-		(TEXTNS,u'change-start'), 
-		(TEXTNS,u'dde-connection-decls'), 
-		(TEXTNS,u'h'), 
-		(TEXTNS,u'illustration-index'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'numbered-paragraph'), 
-		(TEXTNS,u'object-index'), 
-		(TEXTNS,u'p'), 
-		(TEXTNS,u'page-sequence'), 
-		(TEXTNS,u'section'), 
-		(TEXTNS,u'sequence-decls'), 
-                (TEXTNS,u'soft-page-break'),
-		(TEXTNS,u'table-index'), 
-		(TEXTNS,u'table-of-content'), 
-		(TEXTNS,u'tracked-changes'), 
-		(TEXTNS,u'user-field-decls'), 
-		(TEXTNS,u'user-index'), 
-		(TEXTNS,u'variable-decls'), 
+		(DR3DNS,u'scene'),
+		(DRAWNS,u'a'),
+		(DRAWNS,u'caption'),
+		(DRAWNS,u'circle'),
+		(DRAWNS,u'connector'),
+		(DRAWNS,u'control'),
+		(DRAWNS,u'custom-shape'),
+		(DRAWNS,u'ellipse'),
+		(DRAWNS,u'frame'),
+		(DRAWNS,u'g'),
+		(DRAWNS,u'line'),
+		(DRAWNS,u'measure'),
+		(DRAWNS,u'page-thumbnail'),
+		(DRAWNS,u'path'),
+		(DRAWNS,u'polygon'),
+		(DRAWNS,u'polyline'),
+		(DRAWNS,u'rect'),
+		(DRAWNS,u'regular-polygon'),
+		(OFFICENS,u'forms'),
+		(TABLENS,u'calculation-settings'),
+		(TABLENS,u'consolidation'),
+		(TABLENS,u'content-validations'),
+		(TABLENS,u'data-pilot-tables'),
+		(TABLENS,u'database-ranges'),
+		(TABLENS,u'dde-links'),
+		(TABLENS,u'label-ranges'),
+		(TABLENS,u'named-expressions'),
+		(TABLENS,u'table'),
+		(TEXTNS,u'alphabetical-index'),
+		(TEXTNS,u'alphabetical-index-auto-mark-file'),
+		(TEXTNS,u'bibliography'),
+		(TEXTNS,u'change'),
+		(TEXTNS,u'change-end'),
+		(TEXTNS,u'change-start'),
+		(TEXTNS,u'dde-connection-decls'),
+		(TEXTNS,u'h'),
+		(TEXTNS,u'illustration-index'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'numbered-paragraph'),
+		(TEXTNS,u'object-index'),
+		(TEXTNS,u'p'),
+		(TEXTNS,u'page-sequence'),
+		(TEXTNS,u'section'),
+		(TEXTNS,u'sequence-decls'),
+		(TEXTNS,u'soft-page-break'),
+		(TEXTNS,u'table-index'),
+		(TEXTNS,u'table-of-content'),
+		(TEXTNS,u'tracked-changes'),
+		(TEXTNS,u'user-field-decls'),
+		(TEXTNS,u'user-index'),
+		(TEXTNS,u'variable-decls'),
 	),
 	(PRESENTATIONNS,u'animation-group') : (
-		(PRESENTATIONNS,u'dim'), 
-		(PRESENTATIONNS,u'hide-shape'), 
-		(PRESENTATIONNS,u'hide-text'), 
-		(PRESENTATIONNS,u'play'), 
-		(PRESENTATIONNS,u'show-shape'), 
-		(PRESENTATIONNS,u'show-text'), 
+		(PRESENTATIONNS,u'dim'),
+		(PRESENTATIONNS,u'hide-shape'),
+		(PRESENTATIONNS,u'hide-text'),
+		(PRESENTATIONNS,u'play'),
+		(PRESENTATIONNS,u'show-shape'),
+		(PRESENTATIONNS,u'show-text'),
 	),
 	(PRESENTATIONNS,u'animations') : (
-		(PRESENTATIONNS,u'animation-group'), 
-		(PRESENTATIONNS,u'dim'), 
-		(PRESENTATIONNS,u'hide-shape'), 
-		(PRESENTATIONNS,u'hide-text'), 
-		(PRESENTATIONNS,u'play'), 
-		(PRESENTATIONNS,u'show-shape'), 
-		(PRESENTATIONNS,u'show-text'), 
+		(PRESENTATIONNS,u'animation-group'),
+		(PRESENTATIONNS,u'dim'),
+		(PRESENTATIONNS,u'hide-shape'),
+		(PRESENTATIONNS,u'hide-text'),
+		(PRESENTATIONNS,u'play'),
+		(PRESENTATIONNS,u'show-shape'),
+		(PRESENTATIONNS,u'show-text'),
 	),
 	(PRESENTATIONNS,u'date-time') : (
 	),
 	(PRESENTATIONNS,u'date-time-decl') : (
 	),
 	(PRESENTATIONNS,u'dim') : (
-		(PRESENTATIONNS,u'sound'), 
+		(PRESENTATIONNS,u'sound'),
 	),
 	(PRESENTATIONNS,u'event-listener') : (
-		(PRESENTATIONNS,u'sound'), 
+		(PRESENTATIONNS,u'sound'),
 	),
 	(PRESENTATIONNS,u'footer') : (
 	),
@@ -1117,52 +1117,52 @@ allowed_children = {
 	(PRESENTATIONNS,u'header-decl') : (
 	),
 	(PRESENTATIONNS,u'hide-shape') : (
-		(PRESENTATIONNS,u'sound'), 
+		(PRESENTATIONNS,u'sound'),
 	),
 	(PRESENTATIONNS,u'hide-text') : (
-		(PRESENTATIONNS,u'sound'), 
+		(PRESENTATIONNS,u'sound'),
 	),
 # allowed_children
 	(PRESENTATIONNS,u'notes') : (
-		(DR3DNS,u'scene'), 
-		(DRAWNS,u'caption'), 
-		(DRAWNS,u'circle'), 
-		(DRAWNS,u'connector'), 
-		(DRAWNS,u'control'), 
-		(DRAWNS,u'custom-shape'), 
-		(DRAWNS,u'ellipse'), 
-		(DRAWNS,u'frame'), 
-		(DRAWNS,u'g'), 
-		(DRAWNS,u'line'), 
-		(DRAWNS,u'measure'), 
-		(DRAWNS,u'page-thumbnail'), 
-		(DRAWNS,u'path'), 
-		(DRAWNS,u'polygon'), 
-		(DRAWNS,u'polyline'), 
-		(DRAWNS,u'rect'), 
-		(DRAWNS,u'regular-polygon'), 
+		(DR3DNS,u'scene'),
+		(DRAWNS,u'caption'),
+		(DRAWNS,u'circle'),
+		(DRAWNS,u'connector'),
+		(DRAWNS,u'control'),
+		(DRAWNS,u'custom-shape'),
+		(DRAWNS,u'ellipse'),
+		(DRAWNS,u'frame'),
+		(DRAWNS,u'g'),
+		(DRAWNS,u'line'),
+		(DRAWNS,u'measure'),
+		(DRAWNS,u'page-thumbnail'),
+		(DRAWNS,u'path'),
+		(DRAWNS,u'polygon'),
+		(DRAWNS,u'polyline'),
+		(DRAWNS,u'rect'),
+		(DRAWNS,u'regular-polygon'),
 	),
 	(PRESENTATIONNS,u'placeholder') : (
 	),
 	(PRESENTATIONNS,u'play') : (
 	),
 	(PRESENTATIONNS,u'settings') : (
-		(PRESENTATIONNS,u'show'), 
+		(PRESENTATIONNS,u'show'),
 	),
 	(PRESENTATIONNS,u'show') : (
 	),
 	(PRESENTATIONNS,u'show-shape') : (
-		(PRESENTATIONNS,u'sound'), 
+		(PRESENTATIONNS,u'sound'),
 	),
 	(PRESENTATIONNS,u'show-text') : (
-		(PRESENTATIONNS,u'sound'), 
+		(PRESENTATIONNS,u'sound'),
 	),
 	(PRESENTATIONNS,u'sound') : (
 	),
 	(SCRIPTNS,u'event-listener') : (
 	),
 	(STYLENS,u'background-image') : (
-		(OFFICENS,u'binary-data'), 
+		(OFFICENS,u'binary-data'),
 	),
 	(STYLENS,u'chart-properties') : (
 		(CHARTNS,u'symbol-image'),
@@ -1172,264 +1172,264 @@ allowed_children = {
 	(STYLENS,u'column-sep') : (
 	),
 	(STYLENS,u'columns') : (
-		(STYLENS,u'column'), 
-		(STYLENS,u'column-sep'), 
+		(STYLENS,u'column'),
+		(STYLENS,u'column-sep'),
 	),
 	(STYLENS,u'default-style') : (
-		(STYLENS,u'chart-properties'), 
-		(STYLENS,u'drawing-page-properties'), 
-		(STYLENS,u'graphic-properties'), 
-		(STYLENS,u'paragraph-properties'), 
-		(STYLENS,u'ruby-properties'), 
-		(STYLENS,u'section-properties'), 
-		(STYLENS,u'table-cell-properties'), 
-		(STYLENS,u'table-column-properties'), 
-		(STYLENS,u'table-properties'), 
-		(STYLENS,u'table-row-properties'), 
-		(STYLENS,u'text-properties'), 
+		(STYLENS,u'chart-properties'),
+		(STYLENS,u'drawing-page-properties'),
+		(STYLENS,u'graphic-properties'),
+		(STYLENS,u'paragraph-properties'),
+		(STYLENS,u'ruby-properties'),
+		(STYLENS,u'section-properties'),
+		(STYLENS,u'table-cell-properties'),
+		(STYLENS,u'table-column-properties'),
+		(STYLENS,u'table-properties'),
+		(STYLENS,u'table-row-properties'),
+		(STYLENS,u'text-properties'),
 	),
 	(STYLENS,u'drawing-page-properties') : (
-		(PRESENTATIONNS,u'sound'), 
+		(PRESENTATIONNS,u'sound'),
 	),
 	(STYLENS,u'drop-cap') : (
 	),
 	(STYLENS,u'font-face') : (
-		(SVGNS,u'definition-src'), 
-		(SVGNS,u'font-face-src'), 
+		(SVGNS,u'definition-src'),
+		(SVGNS,u'font-face-src'),
 	),
 	(STYLENS,u'footer') : (
-		(STYLENS,u'region-center'), 
-		(STYLENS,u'region-left'), 
-		(STYLENS,u'region-right'), 
-		(TABLENS,u'table'), 
-		(TEXTNS,u'alphabetical-index'), 
-		(TEXTNS,u'alphabetical-index-auto-mark-file'), 
-		(TEXTNS,u'bibliography'), 
-		(TEXTNS,u'change'), 
-		(TEXTNS,u'change-end'), 
-		(TEXTNS,u'change-start'), 
-		(TEXTNS,u'dde-connection-decls'), 
-		(TEXTNS,u'h'), 
-		(TEXTNS,u'illustration-index'), 
-		(TEXTNS,u'index-title'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'object-index'), 
-		(TEXTNS,u'p'), 
-		(TEXTNS,u'section'), 
-		(TEXTNS,u'sequence-decls'), 
-		(TEXTNS,u'table-index'), 
-		(TEXTNS,u'table-of-content'), 
-		(TEXTNS,u'user-field-decls'), 
-		(TEXTNS,u'user-index'), 
-		(TEXTNS,u'variable-decls'), 
+		(STYLENS,u'region-center'),
+		(STYLENS,u'region-left'),
+		(STYLENS,u'region-right'),
+		(TABLENS,u'table'),
+		(TEXTNS,u'alphabetical-index'),
+		(TEXTNS,u'alphabetical-index-auto-mark-file'),
+		(TEXTNS,u'bibliography'),
+		(TEXTNS,u'change'),
+		(TEXTNS,u'change-end'),
+		(TEXTNS,u'change-start'),
+		(TEXTNS,u'dde-connection-decls'),
+		(TEXTNS,u'h'),
+		(TEXTNS,u'illustration-index'),
+		(TEXTNS,u'index-title'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'object-index'),
+		(TEXTNS,u'p'),
+		(TEXTNS,u'section'),
+		(TEXTNS,u'sequence-decls'),
+		(TEXTNS,u'table-index'),
+		(TEXTNS,u'table-of-content'),
+		(TEXTNS,u'user-field-decls'),
+		(TEXTNS,u'user-index'),
+		(TEXTNS,u'variable-decls'),
 	),
 	(STYLENS,u'footer-left') : (
-		(STYLENS,u'region-center'), 
-		(STYLENS,u'region-left'), 
-		(STYLENS,u'region-right'), 
-		(TABLENS,u'table'), 
-		(TEXTNS,u'alphabetical-index'), 
-		(TEXTNS,u'alphabetical-index-auto-mark-file'), 
-		(TEXTNS,u'bibliography'), 
-		(TEXTNS,u'change'), 
-		(TEXTNS,u'change-end'), 
-		(TEXTNS,u'change-start'), 
-		(TEXTNS,u'dde-connection-decls'), 
-		(TEXTNS,u'h'), 
-		(TEXTNS,u'illustration-index'), 
-		(TEXTNS,u'index-title'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'object-index'), 
-		(TEXTNS,u'p'), 
-		(TEXTNS,u'section'), 
-		(TEXTNS,u'sequence-decls'), 
-		(TEXTNS,u'table-index'), 
-		(TEXTNS,u'table-of-content'), 
-		(TEXTNS,u'user-field-decls'), 
-		(TEXTNS,u'user-index'), 
-		(TEXTNS,u'variable-decls'), 
+		(STYLENS,u'region-center'),
+		(STYLENS,u'region-left'),
+		(STYLENS,u'region-right'),
+		(TABLENS,u'table'),
+		(TEXTNS,u'alphabetical-index'),
+		(TEXTNS,u'alphabetical-index-auto-mark-file'),
+		(TEXTNS,u'bibliography'),
+		(TEXTNS,u'change'),
+		(TEXTNS,u'change-end'),
+		(TEXTNS,u'change-start'),
+		(TEXTNS,u'dde-connection-decls'),
+		(TEXTNS,u'h'),
+		(TEXTNS,u'illustration-index'),
+		(TEXTNS,u'index-title'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'object-index'),
+		(TEXTNS,u'p'),
+		(TEXTNS,u'section'),
+		(TEXTNS,u'sequence-decls'),
+		(TEXTNS,u'table-index'),
+		(TEXTNS,u'table-of-content'),
+		(TEXTNS,u'user-field-decls'),
+		(TEXTNS,u'user-index'),
+		(TEXTNS,u'variable-decls'),
 	),
 	(STYLENS,u'footer-style') : (
-		(STYLENS,u'header-footer-properties'), 
+		(STYLENS,u'header-footer-properties'),
 	),
 	(STYLENS,u'footnote-sep') : (
 	),
 	(STYLENS,u'graphic-properties') : (
-		(STYLENS,u'background-image'), 
-		(STYLENS,u'columns'), 
-		(TEXTNS,u'list-style'), 
+		(STYLENS,u'background-image'),
+		(STYLENS,u'columns'),
+		(TEXTNS,u'list-style'),
 	),
 	(STYLENS,u'handout-master') : (
-		(DR3DNS,u'scene'), 
-		(DRAWNS,u'caption'), 
-		(DRAWNS,u'circle'), 
-		(DRAWNS,u'connector'), 
-		(DRAWNS,u'control'), 
-		(DRAWNS,u'custom-shape'), 
-		(DRAWNS,u'ellipse'), 
-		(DRAWNS,u'frame'), 
-		(DRAWNS,u'g'), 
-		(DRAWNS,u'line'), 
-		(DRAWNS,u'measure'), 
-		(DRAWNS,u'page-thumbnail'), 
-		(DRAWNS,u'path'), 
-		(DRAWNS,u'polygon'), 
-		(DRAWNS,u'polyline'), 
-		(DRAWNS,u'rect'), 
-		(DRAWNS,u'regular-polygon'), 
+		(DR3DNS,u'scene'),
+		(DRAWNS,u'caption'),
+		(DRAWNS,u'circle'),
+		(DRAWNS,u'connector'),
+		(DRAWNS,u'control'),
+		(DRAWNS,u'custom-shape'),
+		(DRAWNS,u'ellipse'),
+		(DRAWNS,u'frame'),
+		(DRAWNS,u'g'),
+		(DRAWNS,u'line'),
+		(DRAWNS,u'measure'),
+		(DRAWNS,u'page-thumbnail'),
+		(DRAWNS,u'path'),
+		(DRAWNS,u'polygon'),
+		(DRAWNS,u'polyline'),
+		(DRAWNS,u'rect'),
+		(DRAWNS,u'regular-polygon'),
 	),
 	(STYLENS,u'header') : (
-		(STYLENS,u'region-center'), 
-		(STYLENS,u'region-left'), 
-		(STYLENS,u'region-right'), 
-		(TABLENS,u'table'), 
-		(TEXTNS,u'alphabetical-index'), 
-		(TEXTNS,u'alphabetical-index-auto-mark-file'), 
-		(TEXTNS,u'bibliography'), 
-		(TEXTNS,u'change'), 
-		(TEXTNS,u'change-end'), 
-		(TEXTNS,u'change-start'), 
-		(TEXTNS,u'dde-connection-decls'), 
-		(TEXTNS,u'h'), 
-		(TEXTNS,u'illustration-index'), 
-		(TEXTNS,u'index-title'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'object-index'), 
-		(TEXTNS,u'p'), 
-		(TEXTNS,u'section'), 
-		(TEXTNS,u'sequence-decls'), 
-		(TEXTNS,u'table-index'), 
-		(TEXTNS,u'table-of-content'), 
-		(TEXTNS,u'user-field-decls'), 
-		(TEXTNS,u'user-index'), 
-		(TEXTNS,u'variable-decls'), 
+		(STYLENS,u'region-center'),
+		(STYLENS,u'region-left'),
+		(STYLENS,u'region-right'),
+		(TABLENS,u'table'),
+		(TEXTNS,u'alphabetical-index'),
+		(TEXTNS,u'alphabetical-index-auto-mark-file'),
+		(TEXTNS,u'bibliography'),
+		(TEXTNS,u'change'),
+		(TEXTNS,u'change-end'),
+		(TEXTNS,u'change-start'),
+		(TEXTNS,u'dde-connection-decls'),
+		(TEXTNS,u'h'),
+		(TEXTNS,u'illustration-index'),
+		(TEXTNS,u'index-title'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'object-index'),
+		(TEXTNS,u'p'),
+		(TEXTNS,u'section'),
+		(TEXTNS,u'sequence-decls'),
+		(TEXTNS,u'table-index'),
+		(TEXTNS,u'table-of-content'),
+		(TEXTNS,u'user-field-decls'),
+		(TEXTNS,u'user-index'),
+		(TEXTNS,u'variable-decls'),
 	),
 # allowed_children
 	(STYLENS,u'header-footer-properties') : (
-		(STYLENS,u'background-image'), 
+		(STYLENS,u'background-image'),
 	),
 	(STYLENS,u'header-left') : (
-		(STYLENS,u'region-center'), 
-		(STYLENS,u'region-left'), 
-		(STYLENS,u'region-right'), 
-		(TABLENS,u'table'), 
-		(TEXTNS,u'alphabetical-index'), 
-		(TEXTNS,u'alphabetical-index-auto-mark-file'), 
-		(TEXTNS,u'bibliography'), 
-		(TEXTNS,u'change'), 
-		(TEXTNS,u'change-end'), 
-		(TEXTNS,u'change-start'), 
-		(TEXTNS,u'dde-connection-decls'), 
-		(TEXTNS,u'h'), 
-		(TEXTNS,u'illustration-index'), 
-		(TEXTNS,u'index-title'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'object-index'), 
-		(TEXTNS,u'p'), 
-		(TEXTNS,u'section'), 
-		(TEXTNS,u'sequence-decls'), 
-		(TEXTNS,u'table-index'), 
-		(TEXTNS,u'table-of-content'), 
-		(TEXTNS,u'user-field-decls'), 
-		(TEXTNS,u'user-index'), 
-		(TEXTNS,u'variable-decls'), 
+		(STYLENS,u'region-center'),
+		(STYLENS,u'region-left'),
+		(STYLENS,u'region-right'),
+		(TABLENS,u'table'),
+		(TEXTNS,u'alphabetical-index'),
+		(TEXTNS,u'alphabetical-index-auto-mark-file'),
+		(TEXTNS,u'bibliography'),
+		(TEXTNS,u'change'),
+		(TEXTNS,u'change-end'),
+		(TEXTNS,u'change-start'),
+		(TEXTNS,u'dde-connection-decls'),
+		(TEXTNS,u'h'),
+		(TEXTNS,u'illustration-index'),
+		(TEXTNS,u'index-title'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'object-index'),
+		(TEXTNS,u'p'),
+		(TEXTNS,u'section'),
+		(TEXTNS,u'sequence-decls'),
+		(TEXTNS,u'table-index'),
+		(TEXTNS,u'table-of-content'),
+		(TEXTNS,u'user-field-decls'),
+		(TEXTNS,u'user-index'),
+		(TEXTNS,u'variable-decls'),
 	),
 	(STYLENS,u'header-style') : (
-		(STYLENS,u'header-footer-properties'), 
+		(STYLENS,u'header-footer-properties'),
 	),
 	(STYLENS,u'list-level-properties') : (
 	),
 	(STYLENS,u'map') : (
 	),
 	(STYLENS,u'master-page') : (
-		(DR3DNS,u'scene'), 
-		(DRAWNS,u'caption'), 
-		(DRAWNS,u'circle'), 
-		(DRAWNS,u'connector'), 
-		(DRAWNS,u'control'), 
-		(DRAWNS,u'custom-shape'), 
-		(DRAWNS,u'ellipse'), 
-		(DRAWNS,u'frame'), 
-		(DRAWNS,u'g'), 
-		(DRAWNS,u'line'), 
-		(DRAWNS,u'measure'), 
-		(DRAWNS,u'page-thumbnail'), 
-		(DRAWNS,u'path'), 
-		(DRAWNS,u'polygon'), 
-		(DRAWNS,u'polyline'), 
-		(DRAWNS,u'rect'), 
-		(DRAWNS,u'regular-polygon'), 
-		(OFFICENS,u'forms'), 
-		(PRESENTATIONNS,u'notes'), 
-		(STYLENS,u'footer'), 
-		(STYLENS,u'footer-left'), 
-		(STYLENS,u'header'), 
-		(STYLENS,u'header-left'), 
-		(STYLENS,u'style'), 
+		(DR3DNS,u'scene'),
+		(DRAWNS,u'caption'),
+		(DRAWNS,u'circle'),
+		(DRAWNS,u'connector'),
+		(DRAWNS,u'control'),
+		(DRAWNS,u'custom-shape'),
+		(DRAWNS,u'ellipse'),
+		(DRAWNS,u'frame'),
+		(DRAWNS,u'g'),
+		(DRAWNS,u'line'),
+		(DRAWNS,u'measure'),
+		(DRAWNS,u'page-thumbnail'),
+		(DRAWNS,u'path'),
+		(DRAWNS,u'polygon'),
+		(DRAWNS,u'polyline'),
+		(DRAWNS,u'rect'),
+		(DRAWNS,u'regular-polygon'),
+		(OFFICENS,u'forms'),
+		(PRESENTATIONNS,u'notes'),
+		(STYLENS,u'footer'),
+		(STYLENS,u'footer-left'),
+		(STYLENS,u'header'),
+		(STYLENS,u'header-left'),
+		(STYLENS,u'style'),
 	),
 	(STYLENS,u'page-layout') : (
-		(STYLENS,u'footer-style'), 
-		(STYLENS,u'header-style'), 
-		(STYLENS,u'page-layout-properties'), 
+		(STYLENS,u'footer-style'),
+		(STYLENS,u'header-style'),
+		(STYLENS,u'page-layout-properties'),
 	),
 	(STYLENS,u'page-layout-properties') : (
-		(STYLENS,u'background-image'), 
-		(STYLENS,u'columns'), 
-		(STYLENS,u'footnote-sep'), 
+		(STYLENS,u'background-image'),
+		(STYLENS,u'columns'),
+		(STYLENS,u'footnote-sep'),
 	),
 	(STYLENS,u'paragraph-properties') : (
-		(STYLENS,u'background-image'), 
-		(STYLENS,u'drop-cap'), 
-		(STYLENS,u'tab-stops'), 
+		(STYLENS,u'background-image'),
+		(STYLENS,u'drop-cap'),
+		(STYLENS,u'tab-stops'),
 	),
 	(STYLENS,u'presentation-page-layout') : (
-		(PRESENTATIONNS,u'placeholder'), 
+		(PRESENTATIONNS,u'placeholder'),
 	),
 	(STYLENS,u'region-center') : (
-		(TEXTNS,u'p'), 
+		(TEXTNS,u'p'),
 	),
 	(STYLENS,u'region-left') : (
-		(TEXTNS,u'p'), 
+		(TEXTNS,u'p'),
 	),
 	(STYLENS,u'region-right') : (
-		(TEXTNS,u'p'), 
+		(TEXTNS,u'p'),
 	),
 	(STYLENS,u'ruby-properties') : (
 	),
 	(STYLENS,u'section-properties') : (
-		(STYLENS,u'background-image'), 
-		(STYLENS,u'columns'), 
-		(TEXTNS,u'notes-configuration'), 
+		(STYLENS,u'background-image'),
+		(STYLENS,u'columns'),
+		(TEXTNS,u'notes-configuration'),
 	),
 	(STYLENS,u'style') : (
-		(STYLENS,u'chart-properties'), 
-		(STYLENS,u'drawing-page-properties'), 
-		(STYLENS,u'graphic-properties'), 
-		(STYLENS,u'map'), 
-		(STYLENS,u'paragraph-properties'), 
-		(STYLENS,u'ruby-properties'), 
-		(STYLENS,u'section-properties'), 
-		(STYLENS,u'table-cell-properties'), 
-		(STYLENS,u'table-column-properties'), 
-		(STYLENS,u'table-properties'), 
-		(STYLENS,u'table-row-properties'), 
-		(STYLENS,u'text-properties'), 
+		(STYLENS,u'chart-properties'),
+		(STYLENS,u'drawing-page-properties'),
+		(STYLENS,u'graphic-properties'),
+		(STYLENS,u'map'),
+		(STYLENS,u'paragraph-properties'),
+		(STYLENS,u'ruby-properties'),
+		(STYLENS,u'section-properties'),
+		(STYLENS,u'table-cell-properties'),
+		(STYLENS,u'table-column-properties'),
+		(STYLENS,u'table-properties'),
+		(STYLENS,u'table-row-properties'),
+		(STYLENS,u'text-properties'),
 	),
 	(STYLENS,u'tab-stop') : (
 	),
 	(STYLENS,u'tab-stops') : (
-		(STYLENS,u'tab-stop'), 
+		(STYLENS,u'tab-stop'),
 	),
 	(STYLENS,u'table-cell-properties') : (
-		(STYLENS,u'background-image'), 
+		(STYLENS,u'background-image'),
 	),
 	(STYLENS,u'table-column-properties') : (
 	),
 	(STYLENS,u'table-properties') : (
-		(STYLENS,u'background-image'), 
+		(STYLENS,u'background-image'),
 	),
 	(STYLENS,u'table-row-properties') : (
-		(STYLENS,u'background-image'), 
+		(STYLENS,u'background-image'),
 	),
 	(STYLENS,u'text-properties') : (
 	),
@@ -1442,162 +1442,162 @@ allowed_children = {
 	(SVGNS,u'font-face-name') : (
 	),
 	(SVGNS,u'font-face-src') : (
-		(SVGNS,u'font-face-name'), 
-		(SVGNS,u'font-face-uri'), 
+		(SVGNS,u'font-face-name'),
+		(SVGNS,u'font-face-uri'),
 	),
 	(SVGNS,u'font-face-uri') : (
-		(SVGNS,u'font-face-format'), 
+		(SVGNS,u'font-face-format'),
 	),
 	(SVGNS,u'linearGradient') : (
-		(SVGNS,u'stop'), 
+		(SVGNS,u'stop'),
 	),
 	(SVGNS,u'radialGradient') : (
-		(SVGNS,u'stop'), 
+		(SVGNS,u'stop'),
 	),
 	(SVGNS,u'stop') : (
 	),
 	(TABLENS,u'body') : (
 	),
 	(TABLENS,u'calculation-settings') : (
-		(TABLENS,u'iteration'), 
-		(TABLENS,u'null-date'), 
+		(TABLENS,u'iteration'),
+		(TABLENS,u'null-date'),
 	),
 # allowed_children
 	(TABLENS,u'cell-address') : (
 	),
 	(TABLENS,u'cell-content-change') : (
-		(OFFICENS,u'change-info'), 
-		(TABLENS,u'cell-address'), 
-		(TABLENS,u'deletions'), 
-		(TABLENS,u'dependencies'), 
-		(TABLENS,u'previous'), 
+		(OFFICENS,u'change-info'),
+		(TABLENS,u'cell-address'),
+		(TABLENS,u'deletions'),
+		(TABLENS,u'dependencies'),
+		(TABLENS,u'previous'),
 	),
 	(TABLENS,u'cell-content-deletion') : (
-		(TABLENS,u'cell-address'), 
-		(TABLENS,u'change-track-table-cell'), 
+		(TABLENS,u'cell-address'),
+		(TABLENS,u'change-track-table-cell'),
 	),
 	(TABLENS,u'cell-range-source') : (
 	),
 	(TABLENS,u'change-deletion') : (
 	),
 	(TABLENS,u'change-track-table-cell') : (
-		(TEXTNS,u'p'), 
+		(TEXTNS,u'p'),
 	),
 	(TABLENS,u'consolidation') : (
 	),
 	(TABLENS,u'content-validation') : (
-		(OFFICENS,u'event-listeners'), 
-		(TABLENS,u'error-macro'), 
-		(TABLENS,u'error-message'), 
-		(TABLENS,u'help-message'), 
+		(OFFICENS,u'event-listeners'),
+		(TABLENS,u'error-macro'),
+		(TABLENS,u'error-message'),
+		(TABLENS,u'help-message'),
 	),
 	(TABLENS,u'content-validations') : (
-		(TABLENS,u'content-validation'), 
+		(TABLENS,u'content-validation'),
 	),
 	(TABLENS,u'covered-table-cell') : (
-		(DR3DNS,u'scene'), 
-		(DRAWNS,u'a'), 
-		(DRAWNS,u'caption'), 
-		(DRAWNS,u'circle'), 
-		(DRAWNS,u'connector'), 
-		(DRAWNS,u'control'), 
-		(DRAWNS,u'custom-shape'), 
-		(DRAWNS,u'ellipse'), 
-		(DRAWNS,u'frame'), 
-		(DRAWNS,u'g'), 
-		(DRAWNS,u'line'), 
-		(DRAWNS,u'measure'), 
-		(DRAWNS,u'page-thumbnail'), 
-		(DRAWNS,u'path'), 
-		(DRAWNS,u'polygon'), 
-		(DRAWNS,u'polyline'), 
-		(DRAWNS,u'rect'), 
-		(DRAWNS,u'regular-polygon'), 
-		(OFFICENS,u'annotation'), 
-		(TABLENS,u'cell-range-source'), 
-		(TABLENS,u'detective'), 
-		(TABLENS,u'table'), 
-		(TEXTNS,u'alphabetical-index'), 
-		(TEXTNS,u'bibliography'), 
-		(TEXTNS,u'change'), 
-		(TEXTNS,u'change-end'), 
-		(TEXTNS,u'change-start'), 
-		(TEXTNS,u'h'), 
-		(TEXTNS,u'illustration-index'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'numbered-paragraph'), 
-		(TEXTNS,u'object-index'), 
-		(TEXTNS,u'p'), 
-		(TEXTNS,u'section'), 
-                (TEXTNS,u'soft-page-break'),
-		(TEXTNS,u'table-index'), 
-		(TEXTNS,u'table-of-content'), 
-		(TEXTNS,u'user-index'), 
+		(DR3DNS,u'scene'),
+		(DRAWNS,u'a'),
+		(DRAWNS,u'caption'),
+		(DRAWNS,u'circle'),
+		(DRAWNS,u'connector'),
+		(DRAWNS,u'control'),
+		(DRAWNS,u'custom-shape'),
+		(DRAWNS,u'ellipse'),
+		(DRAWNS,u'frame'),
+		(DRAWNS,u'g'),
+		(DRAWNS,u'line'),
+		(DRAWNS,u'measure'),
+		(DRAWNS,u'page-thumbnail'),
+		(DRAWNS,u'path'),
+		(DRAWNS,u'polygon'),
+		(DRAWNS,u'polyline'),
+		(DRAWNS,u'rect'),
+		(DRAWNS,u'regular-polygon'),
+		(OFFICENS,u'annotation'),
+		(TABLENS,u'cell-range-source'),
+		(TABLENS,u'detective'),
+		(TABLENS,u'table'),
+		(TEXTNS,u'alphabetical-index'),
+		(TEXTNS,u'bibliography'),
+		(TEXTNS,u'change'),
+		(TEXTNS,u'change-end'),
+		(TEXTNS,u'change-start'),
+		(TEXTNS,u'h'),
+		(TEXTNS,u'illustration-index'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'numbered-paragraph'),
+		(TEXTNS,u'object-index'),
+		(TEXTNS,u'p'),
+		(TEXTNS,u'section'),
+		(TEXTNS,u'soft-page-break'),
+		(TEXTNS,u'table-index'),
+		(TEXTNS,u'table-of-content'),
+		(TEXTNS,u'user-index'),
 	),
 	(TABLENS,u'cut-offs') : (
-		(TABLENS,u'insertion-cut-off'), 
-		(TABLENS,u'movement-cut-off'), 
+		(TABLENS,u'insertion-cut-off'),
+		(TABLENS,u'movement-cut-off'),
 	),
 	(TABLENS,u'data-pilot-display-info') : (
 	),
 	(TABLENS,u'data-pilot-field') : (
-		(TABLENS,u'data-pilot-field-reference'), 
-		(TABLENS,u'data-pilot-groups'), 
-		(TABLENS,u'data-pilot-level'), 
+		(TABLENS,u'data-pilot-field-reference'),
+		(TABLENS,u'data-pilot-groups'),
+		(TABLENS,u'data-pilot-level'),
 	),
 	(TABLENS,u'data-pilot-field-reference') : (
 	),
 	(TABLENS,u'data-pilot-group') : (
-		(TABLENS,u'data-pilot-group-member'), 
+		(TABLENS,u'data-pilot-group-member'),
 	),
 	(TABLENS,u'data-pilot-group-member') : (
 	),
 	(TABLENS,u'data-pilot-groups') : (
-		(TABLENS,u'data-pilot-group'), 
+		(TABLENS,u'data-pilot-group'),
 	),
 	(TABLENS,u'data-pilot-layout-info') : (
 	),
 	(TABLENS,u'data-pilot-level') : (
-		(TABLENS,u'data-pilot-display-info'), 
-		(TABLENS,u'data-pilot-layout-info'), 
-		(TABLENS,u'data-pilot-members'), 
-		(TABLENS,u'data-pilot-sort-info'), 
-		(TABLENS,u'data-pilot-subtotals'), 
+		(TABLENS,u'data-pilot-display-info'),
+		(TABLENS,u'data-pilot-layout-info'),
+		(TABLENS,u'data-pilot-members'),
+		(TABLENS,u'data-pilot-sort-info'),
+		(TABLENS,u'data-pilot-subtotals'),
 	),
 	(TABLENS,u'data-pilot-member') : (
 	),
 	(TABLENS,u'data-pilot-members') : (
-		(TABLENS,u'data-pilot-member'), 
+		(TABLENS,u'data-pilot-member'),
 	),
 	(TABLENS,u'data-pilot-sort-info') : (
 	),
 	(TABLENS,u'data-pilot-subtotal') : (
 	),
 	(TABLENS,u'data-pilot-subtotals') : (
-		(TABLENS,u'data-pilot-subtotal'), 
+		(TABLENS,u'data-pilot-subtotal'),
 	),
 # allowed_children
 	(TABLENS,u'data-pilot-table') : (
-		(TABLENS,u'data-pilot-field'), 
-		(TABLENS,u'database-source-query'), 
-		(TABLENS,u'database-source-sql'), 
-		(TABLENS,u'database-source-table'), 
-		(TABLENS,u'source-cell-range'), 
-		(TABLENS,u'source-service'), 
+		(TABLENS,u'data-pilot-field'),
+		(TABLENS,u'database-source-query'),
+		(TABLENS,u'database-source-sql'),
+		(TABLENS,u'database-source-table'),
+		(TABLENS,u'source-cell-range'),
+		(TABLENS,u'source-service'),
 	),
 	(TABLENS,u'data-pilot-tables') : (
-		(TABLENS,u'data-pilot-table'), 
+		(TABLENS,u'data-pilot-table'),
 	),
 	(TABLENS,u'database-range') : (
-		(TABLENS,u'database-source-query'), 
-		(TABLENS,u'database-source-sql'), 
-		(TABLENS,u'database-source-table'), 
-		(TABLENS,u'filter'), 
-		(TABLENS,u'sort'), 
-		(TABLENS,u'subtotal-rules'), 
+		(TABLENS,u'database-source-query'),
+		(TABLENS,u'database-source-sql'),
+		(TABLENS,u'database-source-table'),
+		(TABLENS,u'filter'),
+		(TABLENS,u'sort'),
+		(TABLENS,u'subtotal-rules'),
 	),
 	(TABLENS,u'database-ranges') : (
-		(TABLENS,u'database-range'), 
+		(TABLENS,u'database-range'),
 	),
 	(TABLENS,u'database-source-query') : (
 	),
@@ -1606,54 +1606,54 @@ allowed_children = {
 	(TABLENS,u'database-source-table') : (
 	),
 	(TABLENS,u'dde-link') : (
-		(OFFICENS,u'dde-source'), 
-		(TABLENS,u'table'), 
+		(OFFICENS,u'dde-source'),
+		(TABLENS,u'table'),
 	),
 	(TABLENS,u'dde-links') : (
-		(TABLENS,u'dde-link'), 
+		(TABLENS,u'dde-link'),
 	),
 	(TABLENS,u'deletion') : (
-		(OFFICENS,u'change-info'), 
-		(TABLENS,u'cut-offs'), 
-		(TABLENS,u'deletions'), 
-		(TABLENS,u'dependencies'), 
+		(OFFICENS,u'change-info'),
+		(TABLENS,u'cut-offs'),
+		(TABLENS,u'deletions'),
+		(TABLENS,u'dependencies'),
 	),
 	(TABLENS,u'deletions') : (
-		(TABLENS,u'cell-content-deletion'), 
-		(TABLENS,u'change-deletion'), 
+		(TABLENS,u'cell-content-deletion'),
+		(TABLENS,u'change-deletion'),
 	),
 	(TABLENS,u'dependencies') : (
-		(TABLENS,u'dependency'), 
+		(TABLENS,u'dependency'),
 	),
 	(TABLENS,u'dependency') : (
 	),
 	(TABLENS,u'detective') : (
-		(TABLENS,u'highlighted-range'), 
-		(TABLENS,u'operation'), 
+		(TABLENS,u'highlighted-range'),
+		(TABLENS,u'operation'),
 	),
 	(TABLENS,u'error-macro') : (
 	),
 	(TABLENS,u'error-message') : (
-		(TEXTNS,u'p'), 
+		(TEXTNS,u'p'),
 	),
 	(TABLENS,u'even-columns') : (
 	),
 	(TABLENS,u'even-rows') : (
 	),
 	(TABLENS,u'filter') : (
-		(TABLENS,u'filter-and'), 
-		(TABLENS,u'filter-condition'), 
-		(TABLENS,u'filter-or'), 
+		(TABLENS,u'filter-and'),
+		(TABLENS,u'filter-condition'),
+		(TABLENS,u'filter-or'),
 	),
 	(TABLENS,u'filter-and') : (
-		(TABLENS,u'filter-condition'), 
-		(TABLENS,u'filter-or'), 
+		(TABLENS,u'filter-condition'),
+		(TABLENS,u'filter-or'),
 	),
 	(TABLENS,u'filter-condition') : (
 	),
 	(TABLENS,u'filter-or') : (
-		(TABLENS,u'filter-and'), 
-		(TABLENS,u'filter-condition'), 
+		(TABLENS,u'filter-and'),
+		(TABLENS,u'filter-condition'),
 	),
 # allowed_children
 	(TABLENS,u'first-column') : (
@@ -1661,14 +1661,14 @@ allowed_children = {
 	(TABLENS,u'first-row') : (
 	),
 	(TABLENS,u'help-message') : (
-		(TEXTNS,u'p'), 
+		(TEXTNS,u'p'),
 	),
 	(TABLENS,u'highlighted-range') : (
 	),
 	(TABLENS,u'insertion') : (
-		(OFFICENS,u'change-info'), 
-		(TABLENS,u'deletions'), 
-		(TABLENS,u'dependencies'), 
+		(OFFICENS,u'change-info'),
+		(TABLENS,u'deletions'),
+		(TABLENS,u'dependencies'),
 	),
 	(TABLENS,u'insertion-cut-off') : (
 	),
@@ -1677,26 +1677,26 @@ allowed_children = {
 	(TABLENS,u'label-range') : (
 	),
 	(TABLENS,u'label-ranges') : (
-		(TABLENS,u'label-range'), 
+		(TABLENS,u'label-range'),
 	),
 	(TABLENS,u'last-column') : (
 	),
 	(TABLENS,u'last-row') : (
 	),
 	(TABLENS,u'movement') : (
-		(OFFICENS,u'change-info'), 
-		(TABLENS,u'deletions'), 
-		(TABLENS,u'dependencies'), 
-		(TABLENS,u'source-range-address'), 
-		(TABLENS,u'target-range-address'), 
+		(OFFICENS,u'change-info'),
+		(TABLENS,u'deletions'),
+		(TABLENS,u'dependencies'),
+		(TABLENS,u'source-range-address'),
+		(TABLENS,u'target-range-address'),
 	),
 	(TABLENS,u'movement-cut-off') : (
 	),
 	(TABLENS,u'named-expression') : (
 	),
 	(TABLENS,u'named-expressions') : (
-		(TABLENS,u'named-expression'), 
-		(TABLENS,u'named-range'), 
+		(TABLENS,u'named-expression'),
+		(TABLENS,u'named-range'),
 	),
 	(TABLENS,u'named-range') : (
 	),
@@ -1709,38 +1709,38 @@ allowed_children = {
 	(TABLENS,u'operation') : (
 	),
 	(TABLENS,u'previous') : (
-		(TABLENS,u'change-track-table-cell'), 
+		(TABLENS,u'change-track-table-cell'),
 	),
 	(TABLENS,u'scenario') : (
 	),
 	(TABLENS,u'shapes') : (
-		(DR3DNS,u'scene'), 
-		(DRAWNS,u'caption'), 
-		(DRAWNS,u'circle'), 
-		(DRAWNS,u'connector'), 
-		(DRAWNS,u'control'), 
-		(DRAWNS,u'custom-shape'), 
-		(DRAWNS,u'ellipse'), 
-		(DRAWNS,u'frame'), 
-		(DRAWNS,u'g'), 
-		(DRAWNS,u'line'), 
-		(DRAWNS,u'measure'), 
-		(DRAWNS,u'page-thumbnail'), 
-		(DRAWNS,u'path'), 
-		(DRAWNS,u'polygon'), 
-		(DRAWNS,u'polyline'), 
-		(DRAWNS,u'rect'), 
-		(DRAWNS,u'regular-polygon'), 
+		(DR3DNS,u'scene'),
+		(DRAWNS,u'caption'),
+		(DRAWNS,u'circle'),
+		(DRAWNS,u'connector'),
+		(DRAWNS,u'control'),
+		(DRAWNS,u'custom-shape'),
+		(DRAWNS,u'ellipse'),
+		(DRAWNS,u'frame'),
+		(DRAWNS,u'g'),
+		(DRAWNS,u'line'),
+		(DRAWNS,u'measure'),
+		(DRAWNS,u'page-thumbnail'),
+		(DRAWNS,u'path'),
+		(DRAWNS,u'polygon'),
+		(DRAWNS,u'polyline'),
+		(DRAWNS,u'rect'),
+		(DRAWNS,u'regular-polygon'),
 	),
 	(TABLENS,u'sort') : (
-		(TABLENS,u'sort-by'), 
+		(TABLENS,u'sort-by'),
 	),
 	(TABLENS,u'sort-by') : (
 	),
 	(TABLENS,u'sort-groups') : (
 	),
 	(TABLENS,u'source-cell-range') : (
-		(TABLENS,u'filter'), 
+		(TABLENS,u'filter'),
 	),
 	(TABLENS,u'source-range-address') : (
 	),
@@ -1749,262 +1749,262 @@ allowed_children = {
 	(TABLENS,u'subtotal-field') : (
 	),
 	(TABLENS,u'subtotal-rule') : (
-		(TABLENS,u'subtotal-field'), 
+		(TABLENS,u'subtotal-field'),
 	),
 	(TABLENS,u'subtotal-rules') : (
-		(TABLENS,u'sort-groups'), 
-		(TABLENS,u'subtotal-rule'), 
+		(TABLENS,u'sort-groups'),
+		(TABLENS,u'subtotal-rule'),
 	),
 # allowed_children
 	(TABLENS,u'table') : (
-		(OFFICENS,u'dde-source'), 
-		(OFFICENS,u'forms'), 
-                (TEXTNS,u'soft-page-break'),
-		(TABLENS,u'scenario'), 
-		(TABLENS,u'shapes'), 
-		(TABLENS,u'table-column'), 
-		(TABLENS,u'table-column-group'), 
-		(TABLENS,u'table-columns'), 
-		(TABLENS,u'table-header-columns'), 
-		(TABLENS,u'table-header-rows'), 
-		(TABLENS,u'table-row'), 
-		(TABLENS,u'table-row-group'), 
-		(TABLENS,u'table-rows'), 
-		(TABLENS,u'table-source'), 
+		(OFFICENS,u'dde-source'),
+		(OFFICENS,u'forms'),
+		(TEXTNS,u'soft-page-break'),
+		(TABLENS,u'scenario'),
+		(TABLENS,u'shapes'),
+		(TABLENS,u'table-column'),
+		(TABLENS,u'table-column-group'),
+		(TABLENS,u'table-columns'),
+		(TABLENS,u'table-header-columns'),
+		(TABLENS,u'table-header-rows'),
+		(TABLENS,u'table-row'),
+		(TABLENS,u'table-row-group'),
+		(TABLENS,u'table-rows'),
+		(TABLENS,u'table-source'),
 	),
 	(TABLENS,u'table-cell') : (
-		(DR3DNS,u'scene'), 
-		(DRAWNS,u'a'), 
-		(DRAWNS,u'caption'), 
-		(DRAWNS,u'circle'), 
-		(DRAWNS,u'connector'), 
-		(DRAWNS,u'control'), 
-		(DRAWNS,u'custom-shape'), 
-		(DRAWNS,u'ellipse'), 
-		(DRAWNS,u'frame'), 
-		(DRAWNS,u'g'), 
-		(DRAWNS,u'line'), 
-		(DRAWNS,u'measure'), 
-		(DRAWNS,u'page-thumbnail'), 
-		(DRAWNS,u'path'), 
-		(DRAWNS,u'polygon'), 
-		(DRAWNS,u'polyline'), 
-		(DRAWNS,u'rect'), 
-		(DRAWNS,u'regular-polygon'), 
-		(OFFICENS,u'annotation'), 
-		(TABLENS,u'cell-range-source'), 
-		(TABLENS,u'detective'), 
-		(TABLENS,u'table'), 
-		(TEXTNS,u'alphabetical-index'), 
-		(TEXTNS,u'bibliography'), 
-		(TEXTNS,u'change'), 
-		(TEXTNS,u'change-end'), 
-		(TEXTNS,u'change-start'), 
-		(TEXTNS,u'h'), 
-		(TEXTNS,u'illustration-index'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'numbered-paragraph'), 
-		(TEXTNS,u'object-index'), 
-		(TEXTNS,u'p'), 
-		(TEXTNS,u'section'), 
-                (TEXTNS,u'soft-page-break'),
-		(TEXTNS,u'table-index'), 
-		(TEXTNS,u'table-of-content'), 
-		(TEXTNS,u'user-index'), 
+		(DR3DNS,u'scene'),
+		(DRAWNS,u'a'),
+		(DRAWNS,u'caption'),
+		(DRAWNS,u'circle'),
+		(DRAWNS,u'connector'),
+		(DRAWNS,u'control'),
+		(DRAWNS,u'custom-shape'),
+		(DRAWNS,u'ellipse'),
+		(DRAWNS,u'frame'),
+		(DRAWNS,u'g'),
+		(DRAWNS,u'line'),
+		(DRAWNS,u'measure'),
+		(DRAWNS,u'page-thumbnail'),
+		(DRAWNS,u'path'),
+		(DRAWNS,u'polygon'),
+		(DRAWNS,u'polyline'),
+		(DRAWNS,u'rect'),
+		(DRAWNS,u'regular-polygon'),
+		(OFFICENS,u'annotation'),
+		(TABLENS,u'cell-range-source'),
+		(TABLENS,u'detective'),
+		(TABLENS,u'table'),
+		(TEXTNS,u'alphabetical-index'),
+		(TEXTNS,u'bibliography'),
+		(TEXTNS,u'change'),
+		(TEXTNS,u'change-end'),
+		(TEXTNS,u'change-start'),
+		(TEXTNS,u'h'),
+		(TEXTNS,u'illustration-index'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'numbered-paragraph'),
+		(TEXTNS,u'object-index'),
+		(TEXTNS,u'p'),
+		(TEXTNS,u'section'),
+		(TEXTNS,u'soft-page-break'),
+		(TEXTNS,u'table-index'),
+		(TEXTNS,u'table-of-content'),
+		(TEXTNS,u'user-index'),
 	),
 	(TABLENS,u'table-column') : (
 	),
 	(TABLENS,u'table-column-group') : (
-		(TABLENS,u'table-column'), 
-		(TABLENS,u'table-column-group'), 
-		(TABLENS,u'table-columns'), 
-		(TABLENS,u'table-header-columns'), 
+		(TABLENS,u'table-column'),
+		(TABLENS,u'table-column-group'),
+		(TABLENS,u'table-columns'),
+		(TABLENS,u'table-header-columns'),
 	),
 	(TABLENS,u'table-columns') : (
-		(TABLENS,u'table-column'), 
+		(TABLENS,u'table-column'),
 	),
 	(TABLENS,u'table-header-columns') : (
-		(TABLENS,u'table-column'), 
+		(TABLENS,u'table-column'),
 	),
 	(TABLENS,u'table-header-rows') : (
-		(TABLENS,u'table-row'), 
-                (TEXTNS,u'soft-page-break'),
+		(TABLENS,u'table-row'),
+		(TEXTNS,u'soft-page-break'),
 	),
 	(TABLENS,u'table-row') : (
-		(TABLENS,u'covered-table-cell'), 
-		(TABLENS,u'table-cell'), 
+		(TABLENS,u'covered-table-cell'),
+		(TABLENS,u'table-cell'),
 	),
 	(TABLENS,u'table-row-group') : (
-		(TABLENS,u'table-header-rows'), 
-		(TABLENS,u'table-row'), 
-		(TABLENS,u'table-row-group'), 
-		(TABLENS,u'table-rows'), 
+		(TABLENS,u'table-header-rows'),
+		(TABLENS,u'table-row'),
+		(TABLENS,u'table-row-group'),
+		(TABLENS,u'table-rows'),
 	),
 	(TABLENS,u'table-rows') : (
-		(TABLENS,u'table-row'), 
-                (TEXTNS,u'soft-page-break'),
+		(TABLENS,u'table-row'),
+		(TEXTNS,u'soft-page-break'),
 	),
 	(TABLENS,u'table-source') : (
 	),
 	(TABLENS,u'table-template') : (
-		(TABLENS,u'body'), 
-		(TABLENS,u'even-columns'), 
-		(TABLENS,u'even-rows'), 
-		(TABLENS,u'first-column'), 
-		(TABLENS,u'first-row'), 
-		(TABLENS,u'last-column'), 
-		(TABLENS,u'last-row'), 
-		(TABLENS,u'odd-columns'), 
-		(TABLENS,u'odd-rows'), 
+		(TABLENS,u'body'),
+		(TABLENS,u'even-columns'),
+		(TABLENS,u'even-rows'),
+		(TABLENS,u'first-column'),
+		(TABLENS,u'first-row'),
+		(TABLENS,u'last-column'),
+		(TABLENS,u'last-row'),
+		(TABLENS,u'odd-columns'),
+		(TABLENS,u'odd-rows'),
 	),
 	(TABLENS,u'target-range-address') : (
 	),
 	(TABLENS,u'tracked-changes') : (
-		(TABLENS,u'cell-content-change'), 
-		(TABLENS,u'deletion'), 
-		(TABLENS,u'insertion'), 
-		(TABLENS,u'movement'), 
+		(TABLENS,u'cell-content-change'),
+		(TABLENS,u'deletion'),
+		(TABLENS,u'insertion'),
+		(TABLENS,u'movement'),
 	),
 # allowed_children
 	(TEXTNS,u'a') : (
-		(DR3DNS,u'scene'), 
-		(DRAWNS,u'a'), 
-		(DRAWNS,u'caption'), 
-		(DRAWNS,u'circle'), 
-		(DRAWNS,u'connector'), 
-		(DRAWNS,u'control'), 
-		(DRAWNS,u'custom-shape'), 
-		(DRAWNS,u'ellipse'), 
-		(DRAWNS,u'frame'), 
-		(DRAWNS,u'g'), 
-		(DRAWNS,u'line'), 
-		(DRAWNS,u'measure'), 
-		(DRAWNS,u'page-thumbnail'), 
-		(DRAWNS,u'path'), 
-		(DRAWNS,u'polygon'), 
-		(DRAWNS,u'polyline'), 
-		(DRAWNS,u'rect'), 
-		(DRAWNS,u'regular-polygon'), 
-		(OFFICENS,u'annotation'), 
-		(OFFICENS,u'event-listeners'), 
-		(PRESENTATIONNS,u'date-time'), 
-		(PRESENTATIONNS,u'footer'), 
-		(PRESENTATIONNS,u'header'), 
-		(TEXTNS,u'a'), 
-		(TEXTNS,u'alphabetical-index-mark'), 
-		(TEXTNS,u'alphabetical-index-mark-end'), 
-		(TEXTNS,u'alphabetical-index-mark-start'), 
-		(TEXTNS,u'author-initials'), 
-		(TEXTNS,u'author-name'), 
-		(TEXTNS,u'bibliography-mark'), 
-		(TEXTNS,u'bookmark'), 
-		(TEXTNS,u'bookmark-end'), 
-		(TEXTNS,u'bookmark-ref'), 
-		(TEXTNS,u'bookmark-start'), 
-		(TEXTNS,u'change'), 
-		(TEXTNS,u'change-end'), 
-		(TEXTNS,u'change-start'), 
-		(TEXTNS,u'chapter'), 
-		(TEXTNS,u'conditional-text'), 
-		(TEXTNS,u'creation-date'), 
-		(TEXTNS,u'creation-time'), 
-		(TEXTNS,u'creator'), 
-		(TEXTNS,u'database-display'), 
-		(TEXTNS,u'database-name'), 
-		(TEXTNS,u'database-next'), 
-		(TEXTNS,u'database-row-number'), 
-		(TEXTNS,u'database-row-select'), 
-		(TEXTNS,u'date'), 
-		(TEXTNS,u'dde-connection'), 
-		(TEXTNS,u'description'), 
-		(TEXTNS,u'editing-cycles'), 
-		(TEXTNS,u'editing-duration'), 
-		(TEXTNS,u'execute-macro'), 
-		(TEXTNS,u'expression'), 
-		(TEXTNS,u'file-name'), 
-		(TEXTNS,u'hidden-paragraph'), 
-		(TEXTNS,u'hidden-text'), 
-		(TEXTNS,u'initial-creator'), 
-		(TEXTNS,u'keywords'), 
-		(TEXTNS,u'line-break'), 
-		(TEXTNS,u'measure'), 
-		(TEXTNS,u'modification-date'), 
-		(TEXTNS,u'modification-time'), 
-		(TEXTNS,u'note'), 
-		(TEXTNS,u'note-ref'), 
+		(DR3DNS,u'scene'),
+		(DRAWNS,u'a'),
+		(DRAWNS,u'caption'),
+		(DRAWNS,u'circle'),
+		(DRAWNS,u'connector'),
+		(DRAWNS,u'control'),
+		(DRAWNS,u'custom-shape'),
+		(DRAWNS,u'ellipse'),
+		(DRAWNS,u'frame'),
+		(DRAWNS,u'g'),
+		(DRAWNS,u'line'),
+		(DRAWNS,u'measure'),
+		(DRAWNS,u'page-thumbnail'),
+		(DRAWNS,u'path'),
+		(DRAWNS,u'polygon'),
+		(DRAWNS,u'polyline'),
+		(DRAWNS,u'rect'),
+		(DRAWNS,u'regular-polygon'),
+		(OFFICENS,u'annotation'),
+		(OFFICENS,u'event-listeners'),
+		(PRESENTATIONNS,u'date-time'),
+		(PRESENTATIONNS,u'footer'),
+		(PRESENTATIONNS,u'header'),
+		(TEXTNS,u'a'),
+		(TEXTNS,u'alphabetical-index-mark'),
+		(TEXTNS,u'alphabetical-index-mark-end'),
+		(TEXTNS,u'alphabetical-index-mark-start'),
+		(TEXTNS,u'author-initials'),
+		(TEXTNS,u'author-name'),
+		(TEXTNS,u'bibliography-mark'),
+		(TEXTNS,u'bookmark'),
+		(TEXTNS,u'bookmark-end'),
+		(TEXTNS,u'bookmark-ref'),
+		(TEXTNS,u'bookmark-start'),
+		(TEXTNS,u'change'),
+		(TEXTNS,u'change-end'),
+		(TEXTNS,u'change-start'),
+		(TEXTNS,u'chapter'),
+		(TEXTNS,u'conditional-text'),
+		(TEXTNS,u'creation-date'),
+		(TEXTNS,u'creation-time'),
+		(TEXTNS,u'creator'),
+		(TEXTNS,u'database-display'),
+		(TEXTNS,u'database-name'),
+		(TEXTNS,u'database-next'),
+		(TEXTNS,u'database-row-number'),
+		(TEXTNS,u'database-row-select'),
+		(TEXTNS,u'date'),
+		(TEXTNS,u'dde-connection'),
+		(TEXTNS,u'description'),
+		(TEXTNS,u'editing-cycles'),
+		(TEXTNS,u'editing-duration'),
+		(TEXTNS,u'execute-macro'),
+		(TEXTNS,u'expression'),
+		(TEXTNS,u'file-name'),
+		(TEXTNS,u'hidden-paragraph'),
+		(TEXTNS,u'hidden-text'),
+		(TEXTNS,u'initial-creator'),
+		(TEXTNS,u'keywords'),
+		(TEXTNS,u'line-break'),
+		(TEXTNS,u'measure'),
+		(TEXTNS,u'modification-date'),
+		(TEXTNS,u'modification-time'),
+		(TEXTNS,u'note'),
+		(TEXTNS,u'note-ref'),
 		(TEXTNS,u'page-count'),
 		(TEXTNS,u'paragraph-count'),
 		(TEXTNS,u'word-count'),
 		(TEXTNS,u'character-count'),
 		(TEXTNS,u'table-count'),
 		(TEXTNS,u'image-count'),
-		(TEXTNS,u'object-count'), 
-		(TEXTNS,u'page-continuation'), 
-		(TEXTNS,u'page-number'), 
-		(TEXTNS,u'page-variable-get'), 
-		(TEXTNS,u'page-variable-set'), 
-		(TEXTNS,u'placeholder'), 
-		(TEXTNS,u'print-date'), 
-		(TEXTNS,u'print-time'), 
-		(TEXTNS,u'printed-by'), 
-		(TEXTNS,u'reference-mark'), 
-		(TEXTNS,u'reference-mark-end'), 
-		(TEXTNS,u'reference-mark-start'), 
-		(TEXTNS,u'reference-ref'), 
-		(TEXTNS,u'ruby'), 
-		(TEXTNS,u's'), 
-		(TEXTNS,u'script'), 
-		(TEXTNS,u'sender-city'), 
-		(TEXTNS,u'sender-company'), 
-		(TEXTNS,u'sender-country'), 
-		(TEXTNS,u'sender-email'), 
-		(TEXTNS,u'sender-fax'), 
-		(TEXTNS,u'sender-firstname'), 
-		(TEXTNS,u'sender-initials'), 
-		(TEXTNS,u'sender-lastname'), 
-		(TEXTNS,u'sender-phone-private'), 
-		(TEXTNS,u'sender-phone-work'), 
-		(TEXTNS,u'sender-position'), 
-		(TEXTNS,u'sender-postal-code'), 
-		(TEXTNS,u'sender-state-or-province'), 
-		(TEXTNS,u'sender-street'), 
-		(TEXTNS,u'sender-title'), 
-		(TEXTNS,u'sequence'), 
-		(TEXTNS,u'sequence-ref'), 
-		(TEXTNS,u'sheet-name'), 
-		(TEXTNS,u'span'), 
-		(TEXTNS,u'subject'), 
-		(TEXTNS,u'tab'), 
-		(TEXTNS,u'table-formula'), 
-		(TEXTNS,u'template-name'), 
-		(TEXTNS,u'text-input'), 
-		(TEXTNS,u'time'), 
-		(TEXTNS,u'title'), 
-		(TEXTNS,u'toc-mark'), 
-		(TEXTNS,u'toc-mark-end'), 
-		(TEXTNS,u'toc-mark-start'), 
-		(TEXTNS,u'user-defined'), 
-		(TEXTNS,u'user-field-get'), 
-		(TEXTNS,u'user-field-input'), 
-		(TEXTNS,u'user-index-mark'), 
-		(TEXTNS,u'user-index-mark-end'), 
-		(TEXTNS,u'user-index-mark-start'), 
-		(TEXTNS,u'variable-get'), 
-		(TEXTNS,u'variable-input'), 
-		(TEXTNS,u'variable-set'), 
+		(TEXTNS,u'object-count'),
+		(TEXTNS,u'page-continuation'),
+		(TEXTNS,u'page-number'),
+		(TEXTNS,u'page-variable-get'),
+		(TEXTNS,u'page-variable-set'),
+		(TEXTNS,u'placeholder'),
+		(TEXTNS,u'print-date'),
+		(TEXTNS,u'print-time'),
+		(TEXTNS,u'printed-by'),
+		(TEXTNS,u'reference-mark'),
+		(TEXTNS,u'reference-mark-end'),
+		(TEXTNS,u'reference-mark-start'),
+		(TEXTNS,u'reference-ref'),
+		(TEXTNS,u'ruby'),
+		(TEXTNS,u's'),
+		(TEXTNS,u'script'),
+		(TEXTNS,u'sender-city'),
+		(TEXTNS,u'sender-company'),
+		(TEXTNS,u'sender-country'),
+		(TEXTNS,u'sender-email'),
+		(TEXTNS,u'sender-fax'),
+		(TEXTNS,u'sender-firstname'),
+		(TEXTNS,u'sender-initials'),
+		(TEXTNS,u'sender-lastname'),
+		(TEXTNS,u'sender-phone-private'),
+		(TEXTNS,u'sender-phone-work'),
+		(TEXTNS,u'sender-position'),
+		(TEXTNS,u'sender-postal-code'),
+		(TEXTNS,u'sender-state-or-province'),
+		(TEXTNS,u'sender-street'),
+		(TEXTNS,u'sender-title'),
+		(TEXTNS,u'sequence'),
+		(TEXTNS,u'sequence-ref'),
+		(TEXTNS,u'sheet-name'),
+		(TEXTNS,u'span'),
+		(TEXTNS,u'subject'),
+		(TEXTNS,u'tab'),
+		(TEXTNS,u'table-formula'),
+		(TEXTNS,u'template-name'),
+		(TEXTNS,u'text-input'),
+		(TEXTNS,u'time'),
+		(TEXTNS,u'title'),
+		(TEXTNS,u'toc-mark'),
+		(TEXTNS,u'toc-mark-end'),
+		(TEXTNS,u'toc-mark-start'),
+		(TEXTNS,u'user-defined'),
+		(TEXTNS,u'user-field-get'),
+		(TEXTNS,u'user-field-input'),
+		(TEXTNS,u'user-index-mark'),
+		(TEXTNS,u'user-index-mark-end'),
+		(TEXTNS,u'user-index-mark-start'),
+		(TEXTNS,u'variable-get'),
+		(TEXTNS,u'variable-input'),
+		(TEXTNS,u'variable-set'),
 	),
 	(TEXTNS,u'alphabetical-index') : (
-		(TEXTNS,u'alphabetical-index-source'), 
-		(TEXTNS,u'index-body'), 
+		(TEXTNS,u'alphabetical-index-source'),
+		(TEXTNS,u'index-body'),
 	),
 	(TEXTNS,u'alphabetical-index-auto-mark-file') : (
 	),
 	(TEXTNS,u'alphabetical-index-entry-template') : (
-		(TEXTNS,u'index-entry-chapter'), 
-		(TEXTNS,u'index-entry-page-number'), 
-		(TEXTNS,u'index-entry-span'), 
-		(TEXTNS,u'index-entry-tab-stop'), 
-		(TEXTNS,u'index-entry-text'), 
+		(TEXTNS,u'index-entry-chapter'),
+		(TEXTNS,u'index-entry-page-number'),
+		(TEXTNS,u'index-entry-span'),
+		(TEXTNS,u'index-entry-tab-stop'),
+		(TEXTNS,u'index-entry-text'),
 	),
 	(TEXTNS,u'alphabetical-index-mark') : (
 	),
@@ -2013,31 +2013,31 @@ allowed_children = {
 	(TEXTNS,u'alphabetical-index-mark-start') : (
 	),
 	(TEXTNS,u'alphabetical-index-source') : (
-		(TEXTNS,u'alphabetical-index-entry-template'), 
-		(TEXTNS,u'index-title-template'), 
+		(TEXTNS,u'alphabetical-index-entry-template'),
+		(TEXTNS,u'index-title-template'),
 	),
 	(TEXTNS,u'author-initials') : (
 	),
 	(TEXTNS,u'author-name') : (
 	),
 	(TEXTNS,u'bibliography') : (
-		(TEXTNS,u'bibliography-source'), 
-		(TEXTNS,u'index-body'), 
+		(TEXTNS,u'bibliography-source'),
+		(TEXTNS,u'index-body'),
 	),
 	(TEXTNS,u'bibliography-configuration') : (
-		(TEXTNS,u'sort-key'), 
+		(TEXTNS,u'sort-key'),
 	),
 	(TEXTNS,u'bibliography-entry-template') : (
-		(TEXTNS,u'index-entry-bibliography'), 
-		(TEXTNS,u'index-entry-span'), 
-		(TEXTNS,u'index-entry-tab-stop'), 
+		(TEXTNS,u'index-entry-bibliography'),
+		(TEXTNS,u'index-entry-span'),
+		(TEXTNS,u'index-entry-tab-stop'),
 	),
 # allowed_children
 	(TEXTNS,u'bibliography-mark') : (
 	),
 	(TEXTNS,u'bibliography-source') : (
-		(TEXTNS,u'bibliography-entry-template'), 
-		(TEXTNS,u'index-title-template'), 
+		(TEXTNS,u'bibliography-entry-template'),
+		(TEXTNS,u'index-title-template'),
 	),
 	(TEXTNS,u'bookmark') : (
 	),
@@ -2054,12 +2054,14 @@ allowed_children = {
 	(TEXTNS,u'change-start') : (
 	),
 	(TEXTNS,u'changed-region') : (
-		(TEXTNS,u'deletion'), 
-		(TEXTNS,u'format-change'), 
-		(TEXTNS,u'insertion'), 
+		(TEXTNS,u'deletion'),
+		(TEXTNS,u'format-change'),
+		(TEXTNS,u'insertion'),
 	),
 	(TEXTNS,u'chapter') : (
 	),
+	(TEXTNS,u'character-count') : (
+	),
 	(TEXTNS,u'conditional-text') : (
 	),
 	(TEXTNS,u'creation-date') : (
@@ -2069,19 +2071,19 @@ allowed_children = {
 	(TEXTNS,u'creator') : (
 	),
 	(TEXTNS,u'database-display') : (
-		(FORMNS,u'connection-resource'), 
+		(FORMNS,u'connection-resource'),
 	),
 	(TEXTNS,u'database-name') : (
-		(FORMNS,u'connection-resource'), 
+		(FORMNS,u'connection-resource'),
 	),
 	(TEXTNS,u'database-next') : (
-		(FORMNS,u'connection-resource'), 
+		(FORMNS,u'connection-resource'),
 	),
 	(TEXTNS,u'database-row-number') : (
-		(FORMNS,u'connection-resource'), 
+		(FORMNS,u'connection-resource'),
 	),
 	(TEXTNS,u'database-row-select') : (
-		(FORMNS,u'connection-resource'), 
+		(FORMNS,u'connection-resource'),
 	),
 	(TEXTNS,u'date') : (
 	),
@@ -2090,46 +2092,46 @@ allowed_children = {
 	(TEXTNS,u'dde-connection-decl') : (
 	),
 	(TEXTNS,u'dde-connection-decls') : (
-		(TEXTNS,u'dde-connection-decl'), 
+		(TEXTNS,u'dde-connection-decl'),
 	),
 # allowed_children
 	(TEXTNS,u'deletion') : (
-		(DR3DNS,u'scene'), 
-		(DRAWNS,u'a'), 
-		(DRAWNS,u'caption'), 
-		(DRAWNS,u'circle'), 
-		(DRAWNS,u'connector'), 
-		(DRAWNS,u'control'), 
-		(DRAWNS,u'custom-shape'), 
-		(DRAWNS,u'ellipse'), 
-		(DRAWNS,u'frame'), 
-		(DRAWNS,u'g'), 
-		(DRAWNS,u'line'), 
-		(DRAWNS,u'measure'), 
-		(DRAWNS,u'page-thumbnail'), 
-		(DRAWNS,u'path'), 
-		(DRAWNS,u'polygon'), 
-		(DRAWNS,u'polyline'), 
-		(DRAWNS,u'rect'), 
-		(DRAWNS,u'regular-polygon'), 
-		(OFFICENS,u'change-info'), 
-		(TABLENS,u'table'), 
-		(TEXTNS,u'alphabetical-index'), 
-		(TEXTNS,u'bibliography'), 
-		(TEXTNS,u'change'), 
-		(TEXTNS,u'change-end'), 
-		(TEXTNS,u'change-start'), 
-		(TEXTNS,u'h'), 
-		(TEXTNS,u'illustration-index'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'numbered-paragraph'), 
-		(TEXTNS,u'object-index'), 
-		(TEXTNS,u'p'), 
-		(TEXTNS,u'section'), 
-                (TEXTNS,u'soft-page-break'),
-		(TEXTNS,u'table-index'), 
-		(TEXTNS,u'table-of-content'), 
-		(TEXTNS,u'user-index'), 
+		(DR3DNS,u'scene'),
+		(DRAWNS,u'a'),
+		(DRAWNS,u'caption'),
+		(DRAWNS,u'circle'),
+		(DRAWNS,u'connector'),
+		(DRAWNS,u'control'),
+		(DRAWNS,u'custom-shape'),
+		(DRAWNS,u'ellipse'),
+		(DRAWNS,u'frame'),
+		(DRAWNS,u'g'),
+		(DRAWNS,u'line'),
+		(DRAWNS,u'measure'),
+		(DRAWNS,u'page-thumbnail'),
+		(DRAWNS,u'path'),
+		(DRAWNS,u'polygon'),
+		(DRAWNS,u'polyline'),
+		(DRAWNS,u'rect'),
+		(DRAWNS,u'regular-polygon'),
+		(OFFICENS,u'change-info'),
+		(TABLENS,u'table'),
+		(TEXTNS,u'alphabetical-index'),
+		(TEXTNS,u'bibliography'),
+		(TEXTNS,u'change'),
+		(TEXTNS,u'change-end'),
+		(TEXTNS,u'change-start'),
+		(TEXTNS,u'h'),
+		(TEXTNS,u'illustration-index'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'numbered-paragraph'),
+		(TEXTNS,u'object-index'),
+		(TEXTNS,u'p'),
+		(TEXTNS,u'section'),
+		(TEXTNS,u'soft-page-break'),
+		(TEXTNS,u'table-index'),
+		(TEXTNS,u'table-of-content'),
+		(TEXTNS,u'user-index'),
 	),
 	(TEXTNS,u'description') : (
 	),
@@ -2138,200 +2140,202 @@ allowed_children = {
 	(TEXTNS,u'editing-duration') : (
 	),
 	(TEXTNS,u'execute-macro') : (
-		(OFFICENS,u'event-listeners'), 
+		(OFFICENS,u'event-listeners'),
 	),
 	(TEXTNS,u'expression') : (
 	),
 	(TEXTNS,u'file-name') : (
 	),
 	(TEXTNS,u'format-change') : (
-		(OFFICENS,u'change-info'), 
+		(OFFICENS,u'change-info'),
 	),
 # allowed_children
 	(TEXTNS,u'h') : (
-		(DR3DNS,u'scene'), 
-		(DRAWNS,u'a'), 
-		(DRAWNS,u'caption'), 
-		(DRAWNS,u'circle'), 
-		(DRAWNS,u'connector'), 
-		(DRAWNS,u'control'), 
-		(DRAWNS,u'custom-shape'), 
-		(DRAWNS,u'ellipse'), 
-		(DRAWNS,u'frame'), 
-		(DRAWNS,u'g'), 
-		(DRAWNS,u'line'), 
-		(DRAWNS,u'measure'), 
-		(DRAWNS,u'page-thumbnail'), 
-		(DRAWNS,u'path'), 
-		(DRAWNS,u'polygon'), 
-		(DRAWNS,u'polyline'), 
-		(DRAWNS,u'rect'), 
-		(DRAWNS,u'regular-polygon'), 
-		(OFFICENS,u'annotation'), 
-		(PRESENTATIONNS,u'date-time'), 
-		(PRESENTATIONNS,u'footer'), 
-		(PRESENTATIONNS,u'header'), 
-		(TEXTNS,u'a'), 
-		(TEXTNS,u'alphabetical-index-mark'), 
-		(TEXTNS,u'alphabetical-index-mark-end'), 
-		(TEXTNS,u'alphabetical-index-mark-start'), 
-		(TEXTNS,u'author-initials'), 
-		(TEXTNS,u'author-name'), 
-		(TEXTNS,u'bibliography-mark'), 
-		(TEXTNS,u'bookmark'), 
-		(TEXTNS,u'bookmark-end'), 
-		(TEXTNS,u'bookmark-ref'), 
-		(TEXTNS,u'bookmark-start'), 
-		(TEXTNS,u'change'), 
-		(TEXTNS,u'change-end'), 
-		(TEXTNS,u'change-start'), 
-		(TEXTNS,u'chapter'), 
-		(TEXTNS,u'conditional-text'), 
-		(TEXTNS,u'creation-date'), 
-		(TEXTNS,u'creation-time'), 
-		(TEXTNS,u'creator'), 
-		(TEXTNS,u'database-display'), 
-		(TEXTNS,u'database-name'), 
-		(TEXTNS,u'database-next'), 
-		(TEXTNS,u'database-row-number'), 
-		(TEXTNS,u'database-row-select'), 
-		(TEXTNS,u'date'), 
-		(TEXTNS,u'dde-connection'), 
-		(TEXTNS,u'description'), 
-		(TEXTNS,u'editing-cycles'), 
-		(TEXTNS,u'editing-duration'), 
-		(TEXTNS,u'execute-macro'), 
-		(TEXTNS,u'expression'), 
-		(TEXTNS,u'file-name'), 
-		(TEXTNS,u'hidden-paragraph'), 
-		(TEXTNS,u'hidden-text'), 
-		(TEXTNS,u'initial-creator'), 
-		(TEXTNS,u'keywords'), 
-		(TEXTNS,u'line-break'), 
-		(TEXTNS,u'measure'), 
-		(TEXTNS,u'modification-date'), 
-		(TEXTNS,u'modification-time'), 
-		(TEXTNS,u'note'), 
-		(TEXTNS,u'note-ref'), 
-		(TEXTNS,u'number'), 
+		(DR3DNS,u'scene'),
+		(DRAWNS,u'a'),
+		(DRAWNS,u'caption'),
+		(DRAWNS,u'circle'),
+		(DRAWNS,u'connector'),
+		(DRAWNS,u'control'),
+		(DRAWNS,u'custom-shape'),
+		(DRAWNS,u'ellipse'),
+		(DRAWNS,u'frame'),
+		(DRAWNS,u'g'),
+		(DRAWNS,u'line'),
+		(DRAWNS,u'measure'),
+		(DRAWNS,u'page-thumbnail'),
+		(DRAWNS,u'path'),
+		(DRAWNS,u'polygon'),
+		(DRAWNS,u'polyline'),
+		(DRAWNS,u'rect'),
+		(DRAWNS,u'regular-polygon'),
+		(OFFICENS,u'annotation'),
+		(PRESENTATIONNS,u'date-time'),
+		(PRESENTATIONNS,u'footer'),
+		(PRESENTATIONNS,u'header'),
+		(TEXTNS,u'a'),
+		(TEXTNS,u'alphabetical-index-mark'),
+		(TEXTNS,u'alphabetical-index-mark-end'),
+		(TEXTNS,u'alphabetical-index-mark-start'),
+		(TEXTNS,u'author-initials'),
+		(TEXTNS,u'author-name'),
+		(TEXTNS,u'bibliography-mark'),
+		(TEXTNS,u'bookmark'),
+		(TEXTNS,u'bookmark-end'),
+		(TEXTNS,u'bookmark-ref'),
+		(TEXTNS,u'bookmark-start'),
+		(TEXTNS,u'change'),
+		(TEXTNS,u'change-end'),
+		(TEXTNS,u'change-start'),
+		(TEXTNS,u'chapter'),
+		(TEXTNS,u'conditional-text'),
+		(TEXTNS,u'creation-date'),
+		(TEXTNS,u'creation-time'),
+		(TEXTNS,u'creator'),
+		(TEXTNS,u'database-display'),
+		(TEXTNS,u'database-name'),
+		(TEXTNS,u'database-next'),
+		(TEXTNS,u'database-row-number'),
+		(TEXTNS,u'database-row-select'),
+		(TEXTNS,u'date'),
+		(TEXTNS,u'dde-connection'),
+		(TEXTNS,u'description'),
+		(TEXTNS,u'editing-cycles'),
+		(TEXTNS,u'editing-duration'),
+		(TEXTNS,u'execute-macro'),
+		(TEXTNS,u'expression'),
+		(TEXTNS,u'file-name'),
+		(TEXTNS,u'hidden-paragraph'),
+		(TEXTNS,u'hidden-text'),
+		(TEXTNS,u'initial-creator'),
+		(TEXTNS,u'keywords'),
+		(TEXTNS,u'line-break'),
+		(TEXTNS,u'measure'),
+		(TEXTNS,u'modification-date'),
+		(TEXTNS,u'modification-time'),
+		(TEXTNS,u'note'),
+		(TEXTNS,u'note-ref'),
+		(TEXTNS,u'number'),
 		(TEXTNS,u'page-count'),
 		(TEXTNS,u'paragraph-count'),
 		(TEXTNS,u'word-count'),
 		(TEXTNS,u'character-count'),
 		(TEXTNS,u'table-count'),
 		(TEXTNS,u'image-count'),
-		(TEXTNS,u'object-count'), 
-		(TEXTNS,u'page-continuation'), 
-		(TEXTNS,u'page-number'), 
-		(TEXTNS,u'page-variable-get'), 
-		(TEXTNS,u'page-variable-set'), 
-		(TEXTNS,u'placeholder'), 
-		(TEXTNS,u'print-date'), 
-		(TEXTNS,u'print-time'), 
-		(TEXTNS,u'printed-by'), 
-		(TEXTNS,u'reference-mark'), 
-		(TEXTNS,u'reference-mark-end'), 
-		(TEXTNS,u'reference-mark-start'), 
-		(TEXTNS,u'reference-ref'), 
-		(TEXTNS,u'ruby'), 
-		(TEXTNS,u's'), 
-		(TEXTNS,u'script'), 
-		(TEXTNS,u'sender-city'), 
-		(TEXTNS,u'sender-company'), 
-		(TEXTNS,u'sender-country'), 
-		(TEXTNS,u'sender-email'), 
-		(TEXTNS,u'sender-fax'), 
-		(TEXTNS,u'sender-firstname'), 
-		(TEXTNS,u'sender-initials'), 
-		(TEXTNS,u'sender-lastname'), 
-		(TEXTNS,u'sender-phone-private'), 
-		(TEXTNS,u'sender-phone-work'), 
-		(TEXTNS,u'sender-position'), 
-		(TEXTNS,u'sender-postal-code'), 
-		(TEXTNS,u'sender-state-or-province'), 
-		(TEXTNS,u'sender-street'), 
-		(TEXTNS,u'sender-title'), 
-		(TEXTNS,u'sequence'), 
-		(TEXTNS,u'sequence-ref'), 
-		(TEXTNS,u'sheet-name'), 
-                (TEXTNS,u'soft-page-break'),
-		(TEXTNS,u'span'), 
-		(TEXTNS,u'subject'), 
-		(TEXTNS,u'tab'), 
-		(TEXTNS,u'table-formula'), 
-		(TEXTNS,u'template-name'), 
-		(TEXTNS,u'text-input'), 
-		(TEXTNS,u'time'), 
-		(TEXTNS,u'title'), 
-		(TEXTNS,u'toc-mark'), 
-		(TEXTNS,u'toc-mark-end'), 
-		(TEXTNS,u'toc-mark-start'), 
-		(TEXTNS,u'user-defined'), 
-		(TEXTNS,u'user-field-get'), 
-		(TEXTNS,u'user-field-input'), 
-		(TEXTNS,u'user-index-mark'), 
-		(TEXTNS,u'user-index-mark-end'), 
-		(TEXTNS,u'user-index-mark-start'), 
-		(TEXTNS,u'variable-get'), 
-		(TEXTNS,u'variable-input'), 
-		(TEXTNS,u'variable-set'), 
+		(TEXTNS,u'object-count'),
+		(TEXTNS,u'page-continuation'),
+		(TEXTNS,u'page-number'),
+		(TEXTNS,u'page-variable-get'),
+		(TEXTNS,u'page-variable-set'),
+		(TEXTNS,u'placeholder'),
+		(TEXTNS,u'print-date'),
+		(TEXTNS,u'print-time'),
+		(TEXTNS,u'printed-by'),
+		(TEXTNS,u'reference-mark'),
+		(TEXTNS,u'reference-mark-end'),
+		(TEXTNS,u'reference-mark-start'),
+		(TEXTNS,u'reference-ref'),
+		(TEXTNS,u'ruby'),
+		(TEXTNS,u's'),
+		(TEXTNS,u'script'),
+		(TEXTNS,u'sender-city'),
+		(TEXTNS,u'sender-company'),
+		(TEXTNS,u'sender-country'),
+		(TEXTNS,u'sender-email'),
+		(TEXTNS,u'sender-fax'),
+		(TEXTNS,u'sender-firstname'),
+		(TEXTNS,u'sender-initials'),
+		(TEXTNS,u'sender-lastname'),
+		(TEXTNS,u'sender-phone-private'),
+		(TEXTNS,u'sender-phone-work'),
+		(TEXTNS,u'sender-position'),
+		(TEXTNS,u'sender-postal-code'),
+		(TEXTNS,u'sender-state-or-province'),
+		(TEXTNS,u'sender-street'),
+		(TEXTNS,u'sender-title'),
+		(TEXTNS,u'sequence'),
+		(TEXTNS,u'sequence-ref'),
+		(TEXTNS,u'sheet-name'),
+		(TEXTNS,u'soft-page-break'),
+		(TEXTNS,u'span'),
+		(TEXTNS,u'subject'),
+		(TEXTNS,u'tab'),
+		(TEXTNS,u'table-formula'),
+		(TEXTNS,u'template-name'),
+		(TEXTNS,u'text-input'),
+		(TEXTNS,u'time'),
+		(TEXTNS,u'title'),
+		(TEXTNS,u'toc-mark'),
+		(TEXTNS,u'toc-mark-end'),
+		(TEXTNS,u'toc-mark-start'),
+		(TEXTNS,u'user-defined'),
+		(TEXTNS,u'user-field-get'),
+		(TEXTNS,u'user-field-input'),
+		(TEXTNS,u'user-index-mark'),
+		(TEXTNS,u'user-index-mark-end'),
+		(TEXTNS,u'user-index-mark-start'),
+		(TEXTNS,u'variable-get'),
+		(TEXTNS,u'variable-input'),
+		(TEXTNS,u'variable-set'),
 	),
 	(TEXTNS,u'hidden-paragraph') : (
 	),
 	(TEXTNS,u'hidden-text') : (
 	),
 	(TEXTNS,u'illustration-index') : (
-		(TEXTNS,u'illustration-index-source'), 
-		(TEXTNS,u'index-body'), 
+		(TEXTNS,u'illustration-index-source'),
+		(TEXTNS,u'index-body'),
 	),
 	(TEXTNS,u'illustration-index-entry-template') : (
-		(TEXTNS,u'index-entry-page-number'), 
-		(TEXTNS,u'index-entry-span'), 
-		(TEXTNS,u'index-entry-tab-stop'), 
-		(TEXTNS,u'index-entry-text'), 
+		(TEXTNS,u'index-entry-page-number'),
+		(TEXTNS,u'index-entry-span'),
+		(TEXTNS,u'index-entry-tab-stop'),
+		(TEXTNS,u'index-entry-text'),
 	),
 	(TEXTNS,u'illustration-index-source') : (
-		(TEXTNS,u'illustration-index-entry-template'), 
-		(TEXTNS,u'index-title-template'), 
+		(TEXTNS,u'illustration-index-entry-template'),
+		(TEXTNS,u'index-title-template'),
+	),
+	(TEXTNS,u'image-count') : (
 	),
 # allowed_children
 	(TEXTNS,u'index-body') : (
-		(DR3DNS,u'scene'), 
-		(DRAWNS,u'a'), 
-		(DRAWNS,u'caption'), 
-		(DRAWNS,u'circle'), 
-		(DRAWNS,u'connector'), 
-		(DRAWNS,u'control'), 
-		(DRAWNS,u'custom-shape'), 
-		(DRAWNS,u'ellipse'), 
-		(DRAWNS,u'frame'), 
-		(DRAWNS,u'g'), 
-		(DRAWNS,u'line'), 
-		(DRAWNS,u'measure'), 
-		(DRAWNS,u'page-thumbnail'), 
-		(DRAWNS,u'path'), 
-		(DRAWNS,u'polygon'), 
-		(DRAWNS,u'polyline'), 
-		(DRAWNS,u'rect'), 
-		(DRAWNS,u'regular-polygon'), 
-		(TABLENS,u'table'), 
-		(TEXTNS,u'alphabetical-index'), 
-		(TEXTNS,u'bibliography'), 
-		(TEXTNS,u'change'), 
-		(TEXTNS,u'change-end'), 
-		(TEXTNS,u'change-start'), 
-		(TEXTNS,u'h'), 
-		(TEXTNS,u'illustration-index'), 
-		(TEXTNS,u'index-title'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'numbered-paragraph'), 
-		(TEXTNS,u'object-index'), 
-		(TEXTNS,u'p'), 
-		(TEXTNS,u'section'), 
-                (TEXTNS,u'soft-page-break'),
-		(TEXTNS,u'table-index'), 
-		(TEXTNS,u'table-of-content'), 
-		(TEXTNS,u'user-index'), 
+		(DR3DNS,u'scene'),
+		(DRAWNS,u'a'),
+		(DRAWNS,u'caption'),
+		(DRAWNS,u'circle'),
+		(DRAWNS,u'connector'),
+		(DRAWNS,u'control'),
+		(DRAWNS,u'custom-shape'),
+		(DRAWNS,u'ellipse'),
+		(DRAWNS,u'frame'),
+		(DRAWNS,u'g'),
+		(DRAWNS,u'line'),
+		(DRAWNS,u'measure'),
+		(DRAWNS,u'page-thumbnail'),
+		(DRAWNS,u'path'),
+		(DRAWNS,u'polygon'),
+		(DRAWNS,u'polyline'),
+		(DRAWNS,u'rect'),
+		(DRAWNS,u'regular-polygon'),
+		(TABLENS,u'table'),
+		(TEXTNS,u'alphabetical-index'),
+		(TEXTNS,u'bibliography'),
+		(TEXTNS,u'change'),
+		(TEXTNS,u'change-end'),
+		(TEXTNS,u'change-start'),
+		(TEXTNS,u'h'),
+		(TEXTNS,u'illustration-index'),
+		(TEXTNS,u'index-title'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'numbered-paragraph'),
+		(TEXTNS,u'object-index'),
+		(TEXTNS,u'p'),
+		(TEXTNS,u'section'),
+		(TEXTNS,u'soft-page-break'),
+		(TEXTNS,u'table-index'),
+		(TEXTNS,u'table-of-content'),
+		(TEXTNS,u'user-index'),
 	),
 	(TEXTNS,u'index-entry-bibliography') : (
 	),
@@ -2352,95 +2356,95 @@ allowed_children = {
 	(TEXTNS,u'index-source-style') : (
 	),
 	(TEXTNS,u'index-source-styles') : (
-		(TEXTNS,u'index-source-style'), 
+		(TEXTNS,u'index-source-style'),
 	),
 # allowed_children
 	(TEXTNS,u'index-title') : (
-		(DR3DNS,u'scene'), 
-		(DRAWNS,u'a'), 
-		(DRAWNS,u'caption'), 
-		(DRAWNS,u'circle'), 
-		(DRAWNS,u'connector'), 
-		(DRAWNS,u'control'), 
-		(DRAWNS,u'custom-shape'), 
-		(DRAWNS,u'ellipse'), 
-		(DRAWNS,u'frame'), 
-		(DRAWNS,u'g'), 
-		(DRAWNS,u'line'), 
-		(DRAWNS,u'measure'), 
-		(DRAWNS,u'page-thumbnail'), 
-		(DRAWNS,u'path'), 
-		(DRAWNS,u'polygon'), 
-		(DRAWNS,u'polyline'), 
-		(DRAWNS,u'rect'), 
-		(DRAWNS,u'regular-polygon'), 
-		(TABLENS,u'table'), 
-		(TEXTNS,u'alphabetical-index'), 
-		(TEXTNS,u'bibliography'), 
-		(TEXTNS,u'change'), 
-		(TEXTNS,u'change-end'), 
-		(TEXTNS,u'change-start'), 
-		(TEXTNS,u'h'), 
-		(TEXTNS,u'illustration-index'), 
-		(TEXTNS,u'index-title'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'numbered-paragraph'), 
-		(TEXTNS,u'object-index'), 
-		(TEXTNS,u'p'), 
-		(TEXTNS,u'section'), 
-		(TEXTNS,u'table-index'), 
-		(TEXTNS,u'table-of-content'), 
-		(TEXTNS,u'user-index'), 
+		(DR3DNS,u'scene'),
+		(DRAWNS,u'a'),
+		(DRAWNS,u'caption'),
+		(DRAWNS,u'circle'),
+		(DRAWNS,u'connector'),
+		(DRAWNS,u'control'),
+		(DRAWNS,u'custom-shape'),
+		(DRAWNS,u'ellipse'),
+		(DRAWNS,u'frame'),
+		(DRAWNS,u'g'),
+		(DRAWNS,u'line'),
+		(DRAWNS,u'measure'),
+		(DRAWNS,u'page-thumbnail'),
+		(DRAWNS,u'path'),
+		(DRAWNS,u'polygon'),
+		(DRAWNS,u'polyline'),
+		(DRAWNS,u'rect'),
+		(DRAWNS,u'regular-polygon'),
+		(TABLENS,u'table'),
+		(TEXTNS,u'alphabetical-index'),
+		(TEXTNS,u'bibliography'),
+		(TEXTNS,u'change'),
+		(TEXTNS,u'change-end'),
+		(TEXTNS,u'change-start'),
+		(TEXTNS,u'h'),
+		(TEXTNS,u'illustration-index'),
+		(TEXTNS,u'index-title'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'numbered-paragraph'),
+		(TEXTNS,u'object-index'),
+		(TEXTNS,u'p'),
+		(TEXTNS,u'section'),
+		(TEXTNS,u'table-index'),
+		(TEXTNS,u'table-of-content'),
+		(TEXTNS,u'user-index'),
 	),
 	(TEXTNS,u'index-title-template') : (
 	),
 	(TEXTNS,u'initial-creator') : (
 	),
 	(TEXTNS,u'insertion') : (
-		(OFFICENS,u'change-info'), 
+		(OFFICENS,u'change-info'),
 	),
 	(TEXTNS,u'keywords') : (
 	),
 	(TEXTNS,u'line-break') : (
 	),
 	(TEXTNS,u'linenumbering-configuration') : (
-		(TEXTNS,u'linenumbering-separator'), 
+		(TEXTNS,u'linenumbering-separator'),
 	),
 	(TEXTNS,u'linenumbering-separator') : (
 	),
 	(TEXTNS,u'list') : (
-		(TEXTNS,u'list-header'), 
-		(TEXTNS,u'list-item'), 
+		(TEXTNS,u'list-header'),
+		(TEXTNS,u'list-item'),
 	),
 	(TEXTNS,u'list-header') : (
-		(TEXTNS,u'h'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'number'), 
-		(TEXTNS,u'p'), 
+		(TEXTNS,u'h'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'number'),
+		(TEXTNS,u'p'),
 	),
 	(TEXTNS,u'list-item') : (
-		(TEXTNS,u'h'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'number'), 
-		(TEXTNS,u'p'), 
-                (TEXTNS,u'soft-page-break'),
+		(TEXTNS,u'h'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'number'),
+		(TEXTNS,u'p'),
+		(TEXTNS,u'soft-page-break'),
 	),
 	(TEXTNS,u'list-level-style-bullet') : (
-		(STYLENS,u'list-level-properties'), 
-		(STYLENS,u'text-properties'), 
+		(STYLENS,u'list-level-properties'),
+		(STYLENS,u'text-properties'),
 	),
 	(TEXTNS,u'list-level-style-image') : (
-		(OFFICENS,u'binary-data'), 
-		(STYLENS,u'list-level-properties'), 
+		(OFFICENS,u'binary-data'),
+		(STYLENS,u'list-level-properties'),
 	),
 	(TEXTNS,u'list-level-style-number') : (
-		(STYLENS,u'list-level-properties'), 
-		(STYLENS,u'text-properties'), 
+		(STYLENS,u'list-level-properties'),
+		(STYLENS,u'text-properties'),
 	),
 	(TEXTNS,u'list-style') : (
-		(TEXTNS,u'list-level-style-bullet'), 
-		(TEXTNS,u'list-level-style-image'), 
-		(TEXTNS,u'list-level-style-number'), 
+		(TEXTNS,u'list-level-style-bullet'),
+		(TEXTNS,u'list-level-style-image'),
+		(TEXTNS,u'list-level-style-number'),
 	),
 	(TEXTNS,u'measure') : (
 	),
@@ -2449,45 +2453,45 @@ allowed_children = {
 	(TEXTNS,u'modification-time') : (
 	),
 	(TEXTNS,u'note') : (
-		(TEXTNS,u'note-body'), 
-		(TEXTNS,u'note-citation'), 
+		(TEXTNS,u'note-body'),
+		(TEXTNS,u'note-citation'),
 	),
 # allowed_children
 	(TEXTNS,u'note-body') : (
-		(DR3DNS,u'scene'), 
-		(DRAWNS,u'a'), 
-		(DRAWNS,u'caption'), 
-		(DRAWNS,u'circle'), 
-		(DRAWNS,u'connector'), 
-		(DRAWNS,u'control'), 
-		(DRAWNS,u'custom-shape'), 
-		(DRAWNS,u'ellipse'), 
-		(DRAWNS,u'frame'), 
-		(DRAWNS,u'g'), 
-		(DRAWNS,u'line'), 
-		(DRAWNS,u'measure'), 
-		(DRAWNS,u'page-thumbnail'), 
-		(DRAWNS,u'path'), 
-		(DRAWNS,u'polygon'), 
-		(DRAWNS,u'polyline'), 
-		(DRAWNS,u'rect'), 
-		(DRAWNS,u'regular-polygon'), 
-		(TABLENS,u'table'), 
-		(TEXTNS,u'alphabetical-index'), 
-		(TEXTNS,u'bibliography'), 
-		(TEXTNS,u'change'), 
-		(TEXTNS,u'change-end'), 
-		(TEXTNS,u'change-start'), 
-		(TEXTNS,u'h'), 
-		(TEXTNS,u'illustration-index'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'numbered-paragraph'), 
-		(TEXTNS,u'object-index'), 
-		(TEXTNS,u'p'), 
-		(TEXTNS,u'section'), 
-		(TEXTNS,u'table-index'), 
-		(TEXTNS,u'table-of-content'), 
-		(TEXTNS,u'user-index'), 
+		(DR3DNS,u'scene'),
+		(DRAWNS,u'a'),
+		(DRAWNS,u'caption'),
+		(DRAWNS,u'circle'),
+		(DRAWNS,u'connector'),
+		(DRAWNS,u'control'),
+		(DRAWNS,u'custom-shape'),
+		(DRAWNS,u'ellipse'),
+		(DRAWNS,u'frame'),
+		(DRAWNS,u'g'),
+		(DRAWNS,u'line'),
+		(DRAWNS,u'measure'),
+		(DRAWNS,u'page-thumbnail'),
+		(DRAWNS,u'path'),
+		(DRAWNS,u'polygon'),
+		(DRAWNS,u'polyline'),
+		(DRAWNS,u'rect'),
+		(DRAWNS,u'regular-polygon'),
+		(TABLENS,u'table'),
+		(TEXTNS,u'alphabetical-index'),
+		(TEXTNS,u'bibliography'),
+		(TEXTNS,u'change'),
+		(TEXTNS,u'change-end'),
+		(TEXTNS,u'change-start'),
+		(TEXTNS,u'h'),
+		(TEXTNS,u'illustration-index'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'numbered-paragraph'),
+		(TEXTNS,u'object-index'),
+		(TEXTNS,u'p'),
+		(TEXTNS,u'section'),
+		(TEXTNS,u'table-index'),
+		(TEXTNS,u'table-of-content'),
+		(TEXTNS,u'user-index'),
 	),
 	(TEXTNS,u'note-citation') : (
 	),
@@ -2498,180 +2502,184 @@ allowed_children = {
 	(TEXTNS,u'note-ref') : (
 	),
 	(TEXTNS,u'notes-configuration') : (
-		(TEXTNS,u'note-continuation-notice-backward'), 
-		(TEXTNS,u'note-continuation-notice-forward'), 
+		(TEXTNS,u'note-continuation-notice-backward'),
+		(TEXTNS,u'note-continuation-notice-forward'),
 	),
 	(TEXTNS,u'number') : (
 	),
 	(TEXTNS,u'numbered-paragraph') : (
-		(TEXTNS,u'h'), 
-		(TEXTNS,u'number'), 
-		(TEXTNS,u'p'), 
+		(TEXTNS,u'h'),
+		(TEXTNS,u'number'),
+		(TEXTNS,u'p'),
 	),
 	(TEXTNS,u'object-count') : (
 	),
 	(TEXTNS,u'object-index') : (
-		(TEXTNS,u'index-body'), 
-		(TEXTNS,u'object-index-source'), 
+		(TEXTNS,u'index-body'),
+		(TEXTNS,u'object-index-source'),
 	),
 	(TEXTNS,u'object-index-entry-template') : (
-		(TEXTNS,u'index-entry-page-number'), 
-		(TEXTNS,u'index-entry-span'), 
-		(TEXTNS,u'index-entry-tab-stop'), 
-		(TEXTNS,u'index-entry-text'), 
+		(TEXTNS,u'index-entry-page-number'),
+		(TEXTNS,u'index-entry-span'),
+		(TEXTNS,u'index-entry-tab-stop'),
+		(TEXTNS,u'index-entry-text'),
 	),
 	(TEXTNS,u'object-index-source') : (
-		(TEXTNS,u'index-title-template'), 
-		(TEXTNS,u'object-index-entry-template'), 
+		(TEXTNS,u'index-title-template'),
+		(TEXTNS,u'object-index-entry-template'),
 	),
 	(TEXTNS,u'outline-level-style') : (
-		(STYLENS,u'list-level-properties'), 
-		(STYLENS,u'text-properties'), 
+		(STYLENS,u'list-level-properties'),
+		(STYLENS,u'text-properties'),
 	),
 	(TEXTNS,u'outline-style') : (
-		(TEXTNS,u'outline-level-style'), 
+		(TEXTNS,u'outline-level-style'),
 	),
 # allowed_children
 	(TEXTNS,u'p') : (
-		(DR3DNS,u'scene'), 
-		(DRAWNS,u'a'), 
-		(DRAWNS,u'caption'), 
-		(DRAWNS,u'circle'), 
-		(DRAWNS,u'connector'), 
-		(DRAWNS,u'control'), 
-		(DRAWNS,u'custom-shape'), 
-		(DRAWNS,u'ellipse'), 
-		(DRAWNS,u'frame'), 
-		(DRAWNS,u'g'), 
-		(DRAWNS,u'line'), 
-		(DRAWNS,u'measure'), 
-		(DRAWNS,u'page-thumbnail'), 
-		(DRAWNS,u'path'), 
-		(DRAWNS,u'polygon'), 
-		(DRAWNS,u'polyline'), 
-		(DRAWNS,u'rect'), 
-		(DRAWNS,u'regular-polygon'), 
-		(OFFICENS,u'annotation'), 
-		(PRESENTATIONNS,u'date-time'), 
-		(PRESENTATIONNS,u'footer'), 
-		(PRESENTATIONNS,u'header'), 
-		(TEXTNS,u'a'), 
-		(TEXTNS,u'alphabetical-index-mark'), 
-		(TEXTNS,u'alphabetical-index-mark-end'), 
-		(TEXTNS,u'alphabetical-index-mark-start'), 
-		(TEXTNS,u'author-initials'), 
-		(TEXTNS,u'author-name'), 
-		(TEXTNS,u'bibliography-mark'), 
-		(TEXTNS,u'bookmark'), 
-		(TEXTNS,u'bookmark-end'), 
-		(TEXTNS,u'bookmark-ref'), 
-		(TEXTNS,u'bookmark-start'), 
-		(TEXTNS,u'change'), 
-		(TEXTNS,u'change-end'), 
-		(TEXTNS,u'change-start'), 
-		(TEXTNS,u'chapter'), 
+		(DR3DNS,u'scene'),
+		(DRAWNS,u'a'),
+		(DRAWNS,u'caption'),
+		(DRAWNS,u'circle'),
+		(DRAWNS,u'connector'),
+		(DRAWNS,u'control'),
+		(DRAWNS,u'custom-shape'),
+		(DRAWNS,u'ellipse'),
+		(DRAWNS,u'frame'),
+		(DRAWNS,u'g'),
+		(DRAWNS,u'line'),
+		(DRAWNS,u'measure'),
+		(DRAWNS,u'page-thumbnail'),
+		(DRAWNS,u'path'),
+		(DRAWNS,u'polygon'),
+		(DRAWNS,u'polyline'),
+		(DRAWNS,u'rect'),
+		(DRAWNS,u'regular-polygon'),
+		(OFFICENS,u'annotation'),
+		(PRESENTATIONNS,u'date-time'),
+		(PRESENTATIONNS,u'footer'),
+		(PRESENTATIONNS,u'header'),
+		(TEXTNS,u'a'),
+		(TEXTNS,u'alphabetical-index-mark'),
+		(TEXTNS,u'alphabetical-index-mark-end'),
+		(TEXTNS,u'alphabetical-index-mark-start'),
+		(TEXTNS,u'author-initials'),
+		(TEXTNS,u'author-name'),
+		(TEXTNS,u'bibliography-mark'),
+		(TEXTNS,u'bookmark'),
+		(TEXTNS,u'bookmark-end'),
+		(TEXTNS,u'bookmark-ref'),
+		(TEXTNS,u'bookmark-start'),
+		(TEXTNS,u'change'),
+		(TEXTNS,u'change-end'),
+		(TEXTNS,u'change-start'),
+		(TEXTNS,u'chapter'),
 		(TEXTNS,u'character-count'),
-		(TEXTNS,u'conditional-text'), 
-		(TEXTNS,u'creation-date'), 
-		(TEXTNS,u'creation-time'), 
-		(TEXTNS,u'creator'), 
-		(TEXTNS,u'database-display'), 
-		(TEXTNS,u'database-name'), 
-		(TEXTNS,u'database-next'), 
-		(TEXTNS,u'database-row-number'), 
-		(TEXTNS,u'database-row-select'), 
-		(TEXTNS,u'date'), 
-		(TEXTNS,u'dde-connection'), 
-		(TEXTNS,u'description'), 
-		(TEXTNS,u'editing-cycles'), 
-		(TEXTNS,u'editing-duration'), 
-		(TEXTNS,u'execute-macro'), 
-		(TEXTNS,u'expression'), 
-		(TEXTNS,u'file-name'), 
-		(TEXTNS,u'hidden-paragraph'), 
-		(TEXTNS,u'hidden-text'), 
+		(TEXTNS,u'conditional-text'),
+		(TEXTNS,u'creation-date'),
+		(TEXTNS,u'creation-time'),
+		(TEXTNS,u'creator'),
+		(TEXTNS,u'database-display'),
+		(TEXTNS,u'database-name'),
+		(TEXTNS,u'database-next'),
+		(TEXTNS,u'database-row-number'),
+		(TEXTNS,u'database-row-select'),
+		(TEXTNS,u'date'),
+		(TEXTNS,u'dde-connection'),
+		(TEXTNS,u'description'),
+		(TEXTNS,u'editing-cycles'),
+		(TEXTNS,u'editing-duration'),
+		(TEXTNS,u'execute-macro'),
+		(TEXTNS,u'expression'),
+		(TEXTNS,u'file-name'),
+		(TEXTNS,u'hidden-paragraph'),
+		(TEXTNS,u'hidden-text'),
 		(TEXTNS,u'image-count'),
-		(TEXTNS,u'initial-creator'), 
-		(TEXTNS,u'keywords'), 
-		(TEXTNS,u'line-break'), 
-		(TEXTNS,u'measure'), 
-		(TEXTNS,u'modification-date'), 
-		(TEXTNS,u'modification-time'), 
-		(TEXTNS,u'note'), 
-		(TEXTNS,u'note-ref'), 
-		(TEXTNS,u'object-count'), 
-		(TEXTNS,u'page-continuation'), 
+		(TEXTNS,u'initial-creator'),
+		(TEXTNS,u'keywords'),
+		(TEXTNS,u'line-break'),
+		(TEXTNS,u'measure'),
+		(TEXTNS,u'modification-date'),
+		(TEXTNS,u'modification-time'),
+		(TEXTNS,u'note'),
+		(TEXTNS,u'note-ref'),
+		(TEXTNS,u'object-count'),
+		(TEXTNS,u'page-continuation'),
 		(TEXTNS,u'page-count'),
-		(TEXTNS,u'page-number'), 
-		(TEXTNS,u'page-variable-get'), 
-		(TEXTNS,u'page-variable-set'), 
+		(TEXTNS,u'page-number'),
+		(TEXTNS,u'page-variable-get'),
+		(TEXTNS,u'page-variable-set'),
 		(TEXTNS,u'paragraph-count'),
-		(TEXTNS,u'placeholder'), 
-		(TEXTNS,u'print-date'), 
-		(TEXTNS,u'printed-by'), 
-		(TEXTNS,u'print-time'), 
-		(TEXTNS,u'reference-mark'), 
-		(TEXTNS,u'reference-mark-end'), 
-		(TEXTNS,u'reference-mark-start'), 
-		(TEXTNS,u'reference-ref'), 
-		(TEXTNS,u'ruby'), 
-		(TEXTNS,u's'), 
-		(TEXTNS,u'script'), 
-		(TEXTNS,u'sender-city'), 
-		(TEXTNS,u'sender-company'), 
-		(TEXTNS,u'sender-country'), 
-		(TEXTNS,u'sender-email'), 
-		(TEXTNS,u'sender-fax'), 
-		(TEXTNS,u'sender-firstname'), 
-		(TEXTNS,u'sender-initials'), 
-		(TEXTNS,u'sender-lastname'), 
-		(TEXTNS,u'sender-phone-private'), 
-		(TEXTNS,u'sender-phone-work'), 
-		(TEXTNS,u'sender-position'), 
-		(TEXTNS,u'sender-postal-code'), 
-		(TEXTNS,u'sender-state-or-province'), 
-		(TEXTNS,u'sender-street'), 
-		(TEXTNS,u'sender-title'), 
-		(TEXTNS,u'sequence'), 
-		(TEXTNS,u'sequence-ref'), 
-		(TEXTNS,u'sheet-name'), 
-                (TEXTNS,u'soft-page-break'),
-		(TEXTNS,u'span'), 
-		(TEXTNS,u'subject'), 
-		(TEXTNS,u'tab'), 
+		(TEXTNS,u'placeholder'),
+		(TEXTNS,u'print-date'),
+		(TEXTNS,u'printed-by'),
+		(TEXTNS,u'print-time'),
+		(TEXTNS,u'reference-mark'),
+		(TEXTNS,u'reference-mark-end'),
+		(TEXTNS,u'reference-mark-start'),
+		(TEXTNS,u'reference-ref'),
+		(TEXTNS,u'ruby'),
+		(TEXTNS,u's'),
+		(TEXTNS,u'script'),
+		(TEXTNS,u'sender-city'),
+		(TEXTNS,u'sender-company'),
+		(TEXTNS,u'sender-country'),
+		(TEXTNS,u'sender-email'),
+		(TEXTNS,u'sender-fax'),
+		(TEXTNS,u'sender-firstname'),
+		(TEXTNS,u'sender-initials'),
+		(TEXTNS,u'sender-lastname'),
+		(TEXTNS,u'sender-phone-private'),
+		(TEXTNS,u'sender-phone-work'),
+		(TEXTNS,u'sender-position'),
+		(TEXTNS,u'sender-postal-code'),
+		(TEXTNS,u'sender-state-or-province'),
+		(TEXTNS,u'sender-street'),
+		(TEXTNS,u'sender-title'),
+		(TEXTNS,u'sequence'),
+		(TEXTNS,u'sequence-ref'),
+		(TEXTNS,u'sheet-name'),
+		(TEXTNS,u'soft-page-break'),
+		(TEXTNS,u'span'),
+		(TEXTNS,u'subject'),
+		(TEXTNS,u'tab'),
 		(TEXTNS,u'table-count'),
-		(TEXTNS,u'table-formula'), 
-		(TEXTNS,u'template-name'), 
-		(TEXTNS,u'text-input'), 
-		(TEXTNS,u'time'), 
-		(TEXTNS,u'title'), 
-		(TEXTNS,u'toc-mark'), 
-		(TEXTNS,u'toc-mark-end'), 
-		(TEXTNS,u'toc-mark-start'), 
-		(TEXTNS,u'user-defined'), 
-		(TEXTNS,u'user-field-get'), 
-		(TEXTNS,u'user-field-input'), 
-		(TEXTNS,u'user-index-mark'), 
-		(TEXTNS,u'user-index-mark-end'), 
-		(TEXTNS,u'user-index-mark-start'), 
-		(TEXTNS,u'variable-get'), 
-		(TEXTNS,u'variable-input'), 
-		(TEXTNS,u'variable-set'), 
+		(TEXTNS,u'table-formula'),
+		(TEXTNS,u'template-name'),
+		(TEXTNS,u'text-input'),
+		(TEXTNS,u'time'),
+		(TEXTNS,u'title'),
+		(TEXTNS,u'toc-mark'),
+		(TEXTNS,u'toc-mark-end'),
+		(TEXTNS,u'toc-mark-start'),
+		(TEXTNS,u'user-defined'),
+		(TEXTNS,u'user-field-get'),
+		(TEXTNS,u'user-field-input'),
+		(TEXTNS,u'user-index-mark'),
+		(TEXTNS,u'user-index-mark-end'),
+		(TEXTNS,u'user-index-mark-start'),
+		(TEXTNS,u'variable-get'),
+		(TEXTNS,u'variable-input'),
+		(TEXTNS,u'variable-set'),
 		(TEXTNS,u'word-count'),
 	),
 	(TEXTNS,u'page') : (
 	),
+	(TEXTNS,u'page-count') : (
+	),
 	(TEXTNS,u'page-continuation') : (
 	),
 	(TEXTNS,u'page-number') : (
 	),
 	(TEXTNS,u'page-sequence') : (
-		(TEXTNS,u'page'), 
+		(TEXTNS,u'page'),
 	),
 	(TEXTNS,u'page-variable-get') : (
 	),
 	(TEXTNS,u'page-variable-set') : (
 	),
+	(TEXTNS,u'paragraph-count') : (
+	),
 	(TEXTNS,u'placeholder') : (
 	),
 	(TEXTNS,u'print-date') : (
@@ -2686,135 +2694,137 @@ allowed_children = {
 	),
 	(TEXTNS,u'reference-mark-start') : (
 	),
+	(TEXTNS,u'reference-ref') : (
+	),
 	(TEXTNS,u'ruby') : (
-		(TEXTNS,u'ruby-base'), 
-		(TEXTNS,u'ruby-text'), 
+		(TEXTNS,u'ruby-base'),
+		(TEXTNS,u'ruby-text'),
 	),
 	(TEXTNS,u'ruby-base') : (
-		(DR3DNS,u'scene'), 
-		(DRAWNS,u'a'), 
-		(DRAWNS,u'caption'), 
-		(DRAWNS,u'circle'), 
-		(DRAWNS,u'connector'), 
-		(DRAWNS,u'control'), 
-		(DRAWNS,u'custom-shape'), 
-		(DRAWNS,u'ellipse'), 
-		(DRAWNS,u'frame'), 
-		(DRAWNS,u'g'), 
-		(DRAWNS,u'line'), 
-		(DRAWNS,u'measure'), 
-		(DRAWNS,u'page-thumbnail'), 
-		(DRAWNS,u'path'), 
-		(DRAWNS,u'polygon'), 
-		(DRAWNS,u'polyline'), 
-		(DRAWNS,u'rect'), 
-		(DRAWNS,u'regular-polygon'), 
-		(OFFICENS,u'annotation'), 
-		(PRESENTATIONNS,u'date-time'), 
-		(PRESENTATIONNS,u'footer'), 
-		(PRESENTATIONNS,u'header'), 
-		(TEXTNS,u'a'), 
-		(TEXTNS,u'alphabetical-index-mark'), 
-		(TEXTNS,u'alphabetical-index-mark-end'), 
-		(TEXTNS,u'alphabetical-index-mark-start'), 
-		(TEXTNS,u'author-initials'), 
-		(TEXTNS,u'author-name'), 
-		(TEXTNS,u'bibliography-mark'), 
-		(TEXTNS,u'bookmark'), 
-		(TEXTNS,u'bookmark-end'), 
-		(TEXTNS,u'bookmark-ref'), 
-		(TEXTNS,u'bookmark-start'), 
-		(TEXTNS,u'change'), 
-		(TEXTNS,u'change-end'), 
-		(TEXTNS,u'change-start'), 
-		(TEXTNS,u'chapter'), 
-		(TEXTNS,u'conditional-text'), 
-		(TEXTNS,u'creation-date'), 
-		(TEXTNS,u'creation-time'), 
-		(TEXTNS,u'creator'), 
-		(TEXTNS,u'database-display'), 
-		(TEXTNS,u'database-name'), 
-		(TEXTNS,u'database-next'), 
-		(TEXTNS,u'database-row-number'), 
-		(TEXTNS,u'database-row-select'), 
-		(TEXTNS,u'date'), 
-		(TEXTNS,u'dde-connection'), 
-		(TEXTNS,u'description'), 
-		(TEXTNS,u'editing-cycles'), 
-		(TEXTNS,u'editing-duration'), 
-		(TEXTNS,u'execute-macro'), 
-		(TEXTNS,u'expression'), 
-		(TEXTNS,u'file-name'), 
-		(TEXTNS,u'hidden-paragraph'), 
-		(TEXTNS,u'hidden-text'), 
-		(TEXTNS,u'initial-creator'), 
-		(TEXTNS,u'keywords'), 
-		(TEXTNS,u'line-break'), 
-		(TEXTNS,u'measure'), 
-		(TEXTNS,u'modification-date'), 
-		(TEXTNS,u'modification-time'), 
-		(TEXTNS,u'note'), 
-		(TEXTNS,u'note-ref'), 
+		(DR3DNS,u'scene'),
+		(DRAWNS,u'a'),
+		(DRAWNS,u'caption'),
+		(DRAWNS,u'circle'),
+		(DRAWNS,u'connector'),
+		(DRAWNS,u'control'),
+		(DRAWNS,u'custom-shape'),
+		(DRAWNS,u'ellipse'),
+		(DRAWNS,u'frame'),
+		(DRAWNS,u'g'),
+		(DRAWNS,u'line'),
+		(DRAWNS,u'measure'),
+		(DRAWNS,u'page-thumbnail'),
+		(DRAWNS,u'path'),
+		(DRAWNS,u'polygon'),
+		(DRAWNS,u'polyline'),
+		(DRAWNS,u'rect'),
+		(DRAWNS,u'regular-polygon'),
+		(OFFICENS,u'annotation'),
+		(PRESENTATIONNS,u'date-time'),
+		(PRESENTATIONNS,u'footer'),
+		(PRESENTATIONNS,u'header'),
+		(TEXTNS,u'a'),
+		(TEXTNS,u'alphabetical-index-mark'),
+		(TEXTNS,u'alphabetical-index-mark-end'),
+		(TEXTNS,u'alphabetical-index-mark-start'),
+		(TEXTNS,u'author-initials'),
+		(TEXTNS,u'author-name'),
+		(TEXTNS,u'bibliography-mark'),
+		(TEXTNS,u'bookmark'),
+		(TEXTNS,u'bookmark-end'),
+		(TEXTNS,u'bookmark-ref'),
+		(TEXTNS,u'bookmark-start'),
+		(TEXTNS,u'change'),
+		(TEXTNS,u'change-end'),
+		(TEXTNS,u'change-start'),
+		(TEXTNS,u'chapter'),
+		(TEXTNS,u'conditional-text'),
+		(TEXTNS,u'creation-date'),
+		(TEXTNS,u'creation-time'),
+		(TEXTNS,u'creator'),
+		(TEXTNS,u'database-display'),
+		(TEXTNS,u'database-name'),
+		(TEXTNS,u'database-next'),
+		(TEXTNS,u'database-row-number'),
+		(TEXTNS,u'database-row-select'),
+		(TEXTNS,u'date'),
+		(TEXTNS,u'dde-connection'),
+		(TEXTNS,u'description'),
+		(TEXTNS,u'editing-cycles'),
+		(TEXTNS,u'editing-duration'),
+		(TEXTNS,u'execute-macro'),
+		(TEXTNS,u'expression'),
+		(TEXTNS,u'file-name'),
+		(TEXTNS,u'hidden-paragraph'),
+		(TEXTNS,u'hidden-text'),
+		(TEXTNS,u'initial-creator'),
+		(TEXTNS,u'keywords'),
+		(TEXTNS,u'line-break'),
+		(TEXTNS,u'measure'),
+		(TEXTNS,u'modification-date'),
+		(TEXTNS,u'modification-time'),
+		(TEXTNS,u'note'),
+		(TEXTNS,u'note-ref'),
 		(TEXTNS,u'page-count'),
 		(TEXTNS,u'paragraph-count'),
 		(TEXTNS,u'word-count'),
 		(TEXTNS,u'character-count'),
 		(TEXTNS,u'table-count'),
 		(TEXTNS,u'image-count'),
-		(TEXTNS,u'object-count'), 
-		(TEXTNS,u'page-continuation'), 
-		(TEXTNS,u'page-number'), 
-		(TEXTNS,u'page-variable-get'), 
-		(TEXTNS,u'page-variable-set'), 
-		(TEXTNS,u'placeholder'), 
-		(TEXTNS,u'print-date'), 
-		(TEXTNS,u'print-time'), 
-		(TEXTNS,u'printed-by'), 
-		(TEXTNS,u'reference-mark'), 
-		(TEXTNS,u'reference-mark-end'), 
-		(TEXTNS,u'reference-mark-start'), 
-		(TEXTNS,u'reference-ref'), 
-		(TEXTNS,u'ruby'), 
-		(TEXTNS,u's'), 
-		(TEXTNS,u'script'), 
-		(TEXTNS,u'sender-city'), 
-		(TEXTNS,u'sender-company'), 
-		(TEXTNS,u'sender-country'), 
-		(TEXTNS,u'sender-email'), 
-		(TEXTNS,u'sender-fax'), 
-		(TEXTNS,u'sender-firstname'), 
-		(TEXTNS,u'sender-initials'), 
-		(TEXTNS,u'sender-lastname'), 
-		(TEXTNS,u'sender-phone-private'), 
-		(TEXTNS,u'sender-phone-work'), 
-		(TEXTNS,u'sender-position'), 
-		(TEXTNS,u'sender-postal-code'), 
-		(TEXTNS,u'sender-state-or-province'), 
-		(TEXTNS,u'sender-street'), 
-		(TEXTNS,u'sender-title'), 
-		(TEXTNS,u'sequence'), 
-		(TEXTNS,u'sequence-ref'), 
-		(TEXTNS,u'sheet-name'), 
-		(TEXTNS,u'span'), 
-		(TEXTNS,u'subject'), 
-		(TEXTNS,u'tab'), 
-		(TEXTNS,u'table-formula'), 
-		(TEXTNS,u'template-name'), 
-		(TEXTNS,u'text-input'), 
-		(TEXTNS,u'time'), 
-		(TEXTNS,u'title'), 
-		(TEXTNS,u'toc-mark'), 
-		(TEXTNS,u'toc-mark-end'), 
-		(TEXTNS,u'toc-mark-start'), 
-		(TEXTNS,u'user-defined'), 
-		(TEXTNS,u'user-field-get'), 
-		(TEXTNS,u'user-field-input'), 
-		(TEXTNS,u'user-index-mark'), 
-		(TEXTNS,u'user-index-mark-end'), 
-		(TEXTNS,u'user-index-mark-start'), 
-		(TEXTNS,u'variable-get'), 
-		(TEXTNS,u'variable-input'), 
-		(TEXTNS,u'variable-set'), 
+		(TEXTNS,u'object-count'),
+		(TEXTNS,u'page-continuation'),
+		(TEXTNS,u'page-number'),
+		(TEXTNS,u'page-variable-get'),
+		(TEXTNS,u'page-variable-set'),
+		(TEXTNS,u'placeholder'),
+		(TEXTNS,u'print-date'),
+		(TEXTNS,u'print-time'),
+		(TEXTNS,u'printed-by'),
+		(TEXTNS,u'reference-mark'),
+		(TEXTNS,u'reference-mark-end'),
+		(TEXTNS,u'reference-mark-start'),
+		(TEXTNS,u'reference-ref'),
+		(TEXTNS,u'ruby'),
+		(TEXTNS,u's'),
+		(TEXTNS,u'script'),
+		(TEXTNS,u'sender-city'),
+		(TEXTNS,u'sender-company'),
+		(TEXTNS,u'sender-country'),
+		(TEXTNS,u'sender-email'),
+		(TEXTNS,u'sender-fax'),
+		(TEXTNS,u'sender-firstname'),
+		(TEXTNS,u'sender-initials'),
+		(TEXTNS,u'sender-lastname'),
+		(TEXTNS,u'sender-phone-private'),
+		(TEXTNS,u'sender-phone-work'),
+		(TEXTNS,u'sender-position'),
+		(TEXTNS,u'sender-postal-code'),
+		(TEXTNS,u'sender-state-or-province'),
+		(TEXTNS,u'sender-street'),
+		(TEXTNS,u'sender-title'),
+		(TEXTNS,u'sequence'),
+		(TEXTNS,u'sequence-ref'),
+		(TEXTNS,u'sheet-name'),
+		(TEXTNS,u'span'),
+		(TEXTNS,u'subject'),
+		(TEXTNS,u'tab'),
+		(TEXTNS,u'table-formula'),
+		(TEXTNS,u'template-name'),
+		(TEXTNS,u'text-input'),
+		(TEXTNS,u'time'),
+		(TEXTNS,u'title'),
+		(TEXTNS,u'toc-mark'),
+		(TEXTNS,u'toc-mark-end'),
+		(TEXTNS,u'toc-mark-start'),
+		(TEXTNS,u'user-defined'),
+		(TEXTNS,u'user-field-get'),
+		(TEXTNS,u'user-field-input'),
+		(TEXTNS,u'user-index-mark'),
+		(TEXTNS,u'user-index-mark-end'),
+		(TEXTNS,u'user-index-mark-start'),
+		(TEXTNS,u'variable-get'),
+		(TEXTNS,u'variable-input'),
+		(TEXTNS,u'variable-set'),
 	),
 	(TEXTNS,u'ruby-text') : (
 	),
@@ -2823,42 +2833,42 @@ allowed_children = {
 	(TEXTNS,u'script') : (
 	),
 	(TEXTNS,u'section') : (
-		(DR3DNS,u'scene'), 
-		(DRAWNS,u'a'), 
-		(DRAWNS,u'caption'), 
-		(DRAWNS,u'circle'), 
-		(DRAWNS,u'connector'), 
-		(DRAWNS,u'control'), 
-		(DRAWNS,u'custom-shape'), 
-		(DRAWNS,u'ellipse'), 
-		(DRAWNS,u'frame'), 
-		(DRAWNS,u'g'), 
-		(DRAWNS,u'line'), 
-		(DRAWNS,u'measure'), 
-		(DRAWNS,u'page-thumbnail'), 
-		(DRAWNS,u'path'), 
-		(DRAWNS,u'polygon'), 
-		(DRAWNS,u'polyline'), 
-		(DRAWNS,u'rect'), 
-		(DRAWNS,u'regular-polygon'), 
-		(OFFICENS,u'dde-source'), 
-		(TABLENS,u'table'), 
-		(TEXTNS,u'alphabetical-index'), 
-		(TEXTNS,u'bibliography'), 
-		(TEXTNS,u'change'), 
-		(TEXTNS,u'change-end'), 
-		(TEXTNS,u'change-start'), 
-		(TEXTNS,u'h'), 
-		(TEXTNS,u'illustration-index'), 
-		(TEXTNS,u'list'), 
-		(TEXTNS,u'numbered-paragraph'), 
-		(TEXTNS,u'object-index'), 
-		(TEXTNS,u'p'), 
-		(TEXTNS,u'section'), 
-		(TEXTNS,u'section-source'), 
-		(TEXTNS,u'table-index'), 
-		(TEXTNS,u'table-of-content'), 
-		(TEXTNS,u'user-index'), 
+		(DR3DNS,u'scene'),
+		(DRAWNS,u'a'),
+		(DRAWNS,u'caption'),
+		(DRAWNS,u'circle'),
+		(DRAWNS,u'connector'),
+		(DRAWNS,u'control'),
+		(DRAWNS,u'custom-shape'),
+		(DRAWNS,u'ellipse'),
+		(DRAWNS,u'frame'),
+		(DRAWNS,u'g'),
+		(DRAWNS,u'line'),
+		(DRAWNS,u'measure'),
+		(DRAWNS,u'page-thumbnail'),
+		(DRAWNS,u'path'),
+		(DRAWNS,u'polygon'),
+		(DRAWNS,u'polyline'),
+		(DRAWNS,u'rect'),
+		(DRAWNS,u'regular-polygon'),
+		(OFFICENS,u'dde-source'),
+		(TABLENS,u'table'),
+		(TEXTNS,u'alphabetical-index'),
+		(TEXTNS,u'bibliography'),
+		(TEXTNS,u'change'),
+		(TEXTNS,u'change-end'),
+		(TEXTNS,u'change-start'),
+		(TEXTNS,u'h'),
+		(TEXTNS,u'illustration-index'),
+		(TEXTNS,u'list'),
+		(TEXTNS,u'numbered-paragraph'),
+		(TEXTNS,u'object-index'),
+		(TEXTNS,u'p'),
+		(TEXTNS,u'section'),
+		(TEXTNS,u'section-source'),
+		(TEXTNS,u'table-index'),
+		(TEXTNS,u'table-of-content'),
+		(TEXTNS,u'user-index'),
 	),
 	(TEXTNS,u'section-source') : (
 	),
@@ -2897,7 +2907,7 @@ allowed_children = {
 	(TEXTNS,u'sequence-decl') : (
 	),
 	(TEXTNS,u'sequence-decls') : (
-		(TEXTNS,u'sequence-decl'), 
+		(TEXTNS,u'sequence-decl'),
 	),
 	(TEXTNS,u'sequence-ref') : (
 	),
@@ -2906,168 +2916,170 @@ allowed_children = {
 	(TEXTNS,u'sort-key') : (
 	),
 	(TEXTNS,u'span') : (
-		(DR3DNS,u'scene'), 
-		(DRAWNS,u'a'), 
-		(DRAWNS,u'caption'), 
-		(DRAWNS,u'circle'), 
-		(DRAWNS,u'connector'), 
-		(DRAWNS,u'control'), 
-		(DRAWNS,u'custom-shape'), 
-		(DRAWNS,u'ellipse'), 
-		(DRAWNS,u'frame'), 
-		(DRAWNS,u'g'), 
-		(DRAWNS,u'line'), 
-		(DRAWNS,u'measure'), 
-		(DRAWNS,u'page-thumbnail'), 
-		(DRAWNS,u'path'), 
-		(DRAWNS,u'polygon'), 
-		(DRAWNS,u'polyline'), 
-		(DRAWNS,u'rect'), 
-		(DRAWNS,u'regular-polygon'), 
-		(OFFICENS,u'annotation'), 
-		(PRESENTATIONNS,u'date-time'), 
-		(PRESENTATIONNS,u'footer'), 
-		(PRESENTATIONNS,u'header'), 
-		(TEXTNS,u'a'), 
-		(TEXTNS,u'alphabetical-index-mark'), 
-		(TEXTNS,u'alphabetical-index-mark-end'), 
-		(TEXTNS,u'alphabetical-index-mark-start'), 
-		(TEXTNS,u'author-initials'), 
-		(TEXTNS,u'author-name'), 
-		(TEXTNS,u'bibliography-mark'), 
-		(TEXTNS,u'bookmark'), 
-		(TEXTNS,u'bookmark-end'), 
-		(TEXTNS,u'bookmark-ref'), 
-		(TEXTNS,u'bookmark-start'), 
-		(TEXTNS,u'change'), 
-		(TEXTNS,u'change-end'), 
-		(TEXTNS,u'change-start'), 
-		(TEXTNS,u'chapter'), 
-		(TEXTNS,u'conditional-text'), 
-		(TEXTNS,u'creation-date'), 
-		(TEXTNS,u'creation-time'), 
-		(TEXTNS,u'creator'), 
-		(TEXTNS,u'database-display'), 
-		(TEXTNS,u'database-name'), 
-		(TEXTNS,u'database-next'), 
-		(TEXTNS,u'database-row-number'), 
-		(TEXTNS,u'database-row-select'), 
-		(TEXTNS,u'date'), 
-		(TEXTNS,u'dde-connection'), 
-		(TEXTNS,u'description'), 
-		(TEXTNS,u'editing-cycles'), 
-		(TEXTNS,u'editing-duration'), 
-		(TEXTNS,u'execute-macro'), 
-		(TEXTNS,u'expression'), 
-		(TEXTNS,u'file-name'), 
-		(TEXTNS,u'hidden-paragraph'), 
-		(TEXTNS,u'hidden-text'), 
-		(TEXTNS,u'initial-creator'), 
-		(TEXTNS,u'keywords'), 
-		(TEXTNS,u'line-break'), 
-		(TEXTNS,u'measure'), 
-		(TEXTNS,u'modification-date'), 
-		(TEXTNS,u'modification-time'), 
-		(TEXTNS,u'note'), 
-		(TEXTNS,u'note-ref'), 
+		(DR3DNS,u'scene'),
+		(DRAWNS,u'a'),
+		(DRAWNS,u'caption'),
+		(DRAWNS,u'circle'),
+		(DRAWNS,u'connector'),
+		(DRAWNS,u'control'),
+		(DRAWNS,u'custom-shape'),
+		(DRAWNS,u'ellipse'),
+		(DRAWNS,u'frame'),
+		(DRAWNS,u'g'),
+		(DRAWNS,u'line'),
+		(DRAWNS,u'measure'),
+		(DRAWNS,u'page-thumbnail'),
+		(DRAWNS,u'path'),
+		(DRAWNS,u'polygon'),
+		(DRAWNS,u'polyline'),
+		(DRAWNS,u'rect'),
+		(DRAWNS,u'regular-polygon'),
+		(OFFICENS,u'annotation'),
+		(PRESENTATIONNS,u'date-time'),
+		(PRESENTATIONNS,u'footer'),
+		(PRESENTATIONNS,u'header'),
+		(TEXTNS,u'a'),
+		(TEXTNS,u'alphabetical-index-mark'),
+		(TEXTNS,u'alphabetical-index-mark-end'),
+		(TEXTNS,u'alphabetical-index-mark-start'),
+		(TEXTNS,u'author-initials'),
+		(TEXTNS,u'author-name'),
+		(TEXTNS,u'bibliography-mark'),
+		(TEXTNS,u'bookmark'),
+		(TEXTNS,u'bookmark-end'),
+		(TEXTNS,u'bookmark-ref'),
+		(TEXTNS,u'bookmark-start'),
+		(TEXTNS,u'change'),
+		(TEXTNS,u'change-end'),
+		(TEXTNS,u'change-start'),
+		(TEXTNS,u'chapter'),
+		(TEXTNS,u'conditional-text'),
+		(TEXTNS,u'creation-date'),
+		(TEXTNS,u'creation-time'),
+		(TEXTNS,u'creator'),
+		(TEXTNS,u'database-display'),
+		(TEXTNS,u'database-name'),
+		(TEXTNS,u'database-next'),
+		(TEXTNS,u'database-row-number'),
+		(TEXTNS,u'database-row-select'),
+		(TEXTNS,u'date'),
+		(TEXTNS,u'dde-connection'),
+		(TEXTNS,u'description'),
+		(TEXTNS,u'editing-cycles'),
+		(TEXTNS,u'editing-duration'),
+		(TEXTNS,u'execute-macro'),
+		(TEXTNS,u'expression'),
+		(TEXTNS,u'file-name'),
+		(TEXTNS,u'hidden-paragraph'),
+		(TEXTNS,u'hidden-text'),
+		(TEXTNS,u'initial-creator'),
+		(TEXTNS,u'keywords'),
+		(TEXTNS,u'line-break'),
+		(TEXTNS,u'measure'),
+		(TEXTNS,u'modification-date'),
+		(TEXTNS,u'modification-time'),
+		(TEXTNS,u'note'),
+		(TEXTNS,u'note-ref'),
 		(TEXTNS,u'page-count'),
 		(TEXTNS,u'paragraph-count'),
 		(TEXTNS,u'word-count'),
 		(TEXTNS,u'character-count'),
 		(TEXTNS,u'table-count'),
 		(TEXTNS,u'image-count'),
-		(TEXTNS,u'object-count'), 
-		(TEXTNS,u'page-continuation'), 
-		(TEXTNS,u'page-number'), 
-		(TEXTNS,u'page-variable-get'), 
-		(TEXTNS,u'page-variable-set'), 
-		(TEXTNS,u'placeholder'), 
-		(TEXTNS,u'print-date'), 
-		(TEXTNS,u'print-time'), 
-		(TEXTNS,u'printed-by'), 
-		(TEXTNS,u'reference-mark'), 
-		(TEXTNS,u'reference-mark-end'), 
-		(TEXTNS,u'reference-mark-start'), 
-		(TEXTNS,u'reference-ref'), 
-		(TEXTNS,u'ruby'), 
-		(TEXTNS,u's'), 
-		(TEXTNS,u'script'), 
-		(TEXTNS,u'sender-city'), 
-		(TEXTNS,u'sender-company'), 
-		(TEXTNS,u'sender-country'), 
-		(TEXTNS,u'sender-email'), 
-		(TEXTNS,u'sender-fax'), 
-		(TEXTNS,u'sender-firstname'), 
-		(TEXTNS,u'sender-initials'), 
-		(TEXTNS,u'sender-lastname'), 
-		(TEXTNS,u'sender-phone-private'), 
-		(TEXTNS,u'sender-phone-work'), 
-		(TEXTNS,u'sender-position'), 
-		(TEXTNS,u'sender-postal-code'), 
-		(TEXTNS,u'sender-state-or-province'), 
-		(TEXTNS,u'sender-street'), 
-		(TEXTNS,u'sender-title'), 
-		(TEXTNS,u'sequence'), 
-		(TEXTNS,u'sequence-ref'), 
-		(TEXTNS,u'sheet-name'), 
-		(TEXTNS,u'span'), 
-		(TEXTNS,u'subject'), 
-		(TEXTNS,u'tab'), 
-		(TEXTNS,u'table-formula'), 
-		(TEXTNS,u'template-name'), 
-		(TEXTNS,u'text-input'), 
-		(TEXTNS,u'time'), 
-		(TEXTNS,u'title'), 
-		(TEXTNS,u'toc-mark'), 
-		(TEXTNS,u'toc-mark-end'), 
-		(TEXTNS,u'toc-mark-start'), 
-		(TEXTNS,u'user-defined'), 
-		(TEXTNS,u'user-field-get'), 
-		(TEXTNS,u'user-field-input'), 
-		(TEXTNS,u'user-index-mark'), 
-		(TEXTNS,u'user-index-mark-end'), 
-		(TEXTNS,u'user-index-mark-start'), 
-		(TEXTNS,u'variable-get'), 
-		(TEXTNS,u'variable-input'), 
-		(TEXTNS,u'variable-set'), 
+		(TEXTNS,u'object-count'),
+		(TEXTNS,u'page-continuation'),
+		(TEXTNS,u'page-number'),
+		(TEXTNS,u'page-variable-get'),
+		(TEXTNS,u'page-variable-set'),
+		(TEXTNS,u'placeholder'),
+		(TEXTNS,u'print-date'),
+		(TEXTNS,u'print-time'),
+		(TEXTNS,u'printed-by'),
+		(TEXTNS,u'reference-mark'),
+		(TEXTNS,u'reference-mark-end'),
+		(TEXTNS,u'reference-mark-start'),
+		(TEXTNS,u'reference-ref'),
+		(TEXTNS,u'ruby'),
+		(TEXTNS,u's'),
+		(TEXTNS,u'script'),
+		(TEXTNS,u'sender-city'),
+		(TEXTNS,u'sender-company'),
+		(TEXTNS,u'sender-country'),
+		(TEXTNS,u'sender-email'),
+		(TEXTNS,u'sender-fax'),
+		(TEXTNS,u'sender-firstname'),
+		(TEXTNS,u'sender-initials'),
+		(TEXTNS,u'sender-lastname'),
+		(TEXTNS,u'sender-phone-private'),
+		(TEXTNS,u'sender-phone-work'),
+		(TEXTNS,u'sender-position'),
+		(TEXTNS,u'sender-postal-code'),
+		(TEXTNS,u'sender-state-or-province'),
+		(TEXTNS,u'sender-street'),
+		(TEXTNS,u'sender-title'),
+		(TEXTNS,u'sequence'),
+		(TEXTNS,u'sequence-ref'),
+		(TEXTNS,u'sheet-name'),
+		(TEXTNS,u'span'),
+		(TEXTNS,u'subject'),
+		(TEXTNS,u'tab'),
+		(TEXTNS,u'table-formula'),
+		(TEXTNS,u'template-name'),
+		(TEXTNS,u'text-input'),
+		(TEXTNS,u'time'),
+		(TEXTNS,u'title'),
+		(TEXTNS,u'toc-mark'),
+		(TEXTNS,u'toc-mark-end'),
+		(TEXTNS,u'toc-mark-start'),
+		(TEXTNS,u'user-defined'),
+		(TEXTNS,u'user-field-get'),
+		(TEXTNS,u'user-field-input'),
+		(TEXTNS,u'user-index-mark'),
+		(TEXTNS,u'user-index-mark-end'),
+		(TEXTNS,u'user-index-mark-start'),
+		(TEXTNS,u'variable-get'),
+		(TEXTNS,u'variable-input'),
+		(TEXTNS,u'variable-set'),
 	),
 	(TEXTNS,u'subject') : (
 	),
 	(TEXTNS,u'tab') : (
 	),
+	(TEXTNS,u'table-count') : (
+	),
 	(TEXTNS,u'table-formula') : (
 	),
 	(TEXTNS,u'table-index') : (
-		(TEXTNS,u'index-body'), 
-		(TEXTNS,u'table-index-source'), 
+		(TEXTNS,u'index-body'),
+		(TEXTNS,u'table-index-source'),
 	),
 	(TEXTNS,u'table-index-entry-template') : (
-		(TEXTNS,u'index-entry-page-number'), 
-		(TEXTNS,u'index-entry-span'), 
-		(TEXTNS,u'index-entry-tab-stop'), 
-		(TEXTNS,u'index-entry-text'), 
+		(TEXTNS,u'index-entry-page-number'),
+		(TEXTNS,u'index-entry-span'),
+		(TEXTNS,u'index-entry-tab-stop'),
+		(TEXTNS,u'index-entry-text'),
 	),
 	(TEXTNS,u'table-index-source') : (
-		(TEXTNS,u'index-title-template'), 
-		(TEXTNS,u'table-index-entry-template'), 
+		(TEXTNS,u'index-title-template'),
+		(TEXTNS,u'table-index-entry-template'),
 	),
 	(TEXTNS,u'table-of-content') : (
-		(TEXTNS,u'index-body'), 
-		(TEXTNS,u'table-of-content-source'), 
+		(TEXTNS,u'index-body'),
+		(TEXTNS,u'table-of-content-source'),
 	),
 	(TEXTNS,u'table-of-content-entry-template') : (
-		(TEXTNS,u'index-entry-chapter'), 
-		(TEXTNS,u'index-entry-link-end'), 
-		(TEXTNS,u'index-entry-link-start'), 
-		(TEXTNS,u'index-entry-page-number'), 
-		(TEXTNS,u'index-entry-span'), 
-		(TEXTNS,u'index-entry-tab-stop'), 
-		(TEXTNS,u'index-entry-text'), 
+		(TEXTNS,u'index-entry-chapter'),
+		(TEXTNS,u'index-entry-link-end'),
+		(TEXTNS,u'index-entry-link-start'),
+		(TEXTNS,u'index-entry-page-number'),
+		(TEXTNS,u'index-entry-span'),
+		(TEXTNS,u'index-entry-tab-stop'),
+		(TEXTNS,u'index-entry-text'),
 	),
 	(TEXTNS,u'table-of-content-source') : (
-		(TEXTNS,u'index-source-styles'), 
-		(TEXTNS,u'index-title-template'), 
-		(TEXTNS,u'table-of-content-entry-template'), 
+		(TEXTNS,u'index-source-styles'),
+		(TEXTNS,u'index-title-template'),
+		(TEXTNS,u'table-of-content-entry-template'),
 	),
 	(TEXTNS,u'template-name') : (
 	),
@@ -3085,29 +3097,29 @@ allowed_children = {
 	),
 # allowed_children
 	(TEXTNS,u'tracked-changes') : (
-		(TEXTNS,u'changed-region'), 
+		(TEXTNS,u'changed-region'),
 	),
 	(TEXTNS,u'user-defined') : (
 	),
 	(TEXTNS,u'user-field-decl') : (
 	),
 	(TEXTNS,u'user-field-decls') : (
-		(TEXTNS,u'user-field-decl'), 
+		(TEXTNS,u'user-field-decl'),
 	),
 	(TEXTNS,u'user-field-get') : (
 	),
 	(TEXTNS,u'user-field-input') : (
 	),
 	(TEXTNS,u'user-index') : (
-		(TEXTNS,u'index-body'), 
-		(TEXTNS,u'user-index-source'), 
+		(TEXTNS,u'index-body'),
+		(TEXTNS,u'user-index-source'),
 	),
 	(TEXTNS,u'user-index-entry-template') : (
-		(TEXTNS,u'index-entry-chapter'), 
-		(TEXTNS,u'index-entry-page-number'), 
-		(TEXTNS,u'index-entry-span'), 
-		(TEXTNS,u'index-entry-tab-stop'), 
-		(TEXTNS,u'index-entry-text'), 
+		(TEXTNS,u'index-entry-chapter'),
+		(TEXTNS,u'index-entry-page-number'),
+		(TEXTNS,u'index-entry-span'),
+		(TEXTNS,u'index-entry-tab-stop'),
+		(TEXTNS,u'index-entry-text'),
 	),
 # allowed_children
 	(TEXTNS,u'user-index-mark') : (
@@ -3117,14 +3129,14 @@ allowed_children = {
 	(TEXTNS,u'user-index-mark-start') : (
 	),
 	(TEXTNS,u'user-index-source') : (
-		(TEXTNS,u'index-source-styles'), 
-		(TEXTNS,u'index-title-template'), 
-		(TEXTNS,u'user-index-entry-template'), 
+		(TEXTNS,u'index-source-styles'),
+		(TEXTNS,u'index-title-template'),
+		(TEXTNS,u'user-index-entry-template'),
 	),
 	(TEXTNS,u'variable-decl') : (
 	),
 	(TEXTNS,u'variable-decls') : (
-		(TEXTNS,u'variable-decl'), 
+		(TEXTNS,u'variable-decl'),
 	),
 	(TEXTNS,u'variable-get') : (
 	),
@@ -3132,6 +3144,8 @@ allowed_children = {
 	),
 	(TEXTNS,u'variable-set') : (
 	),
+	(TEXTNS,u'word-count') : (
+	),
 }
 
 struct_elements = (  # Unused?
@@ -3182,6 +3196,7 @@ allows_text = (
 	(PRESENTATIONNS,u'footer-decl'),
 	(PRESENTATIONNS,u'header-decl'),
 	(SVGNS,u'desc'),
+	(SVGNS,u'title'),
 	(TEXTNS,u'a'),
 	(TEXTNS,u'author-initials'),
 	(TEXTNS,u'author-name'),
@@ -3403,7 +3418,6 @@ required_attributes = {
 	(DRAWNS,u'glue-point'): (
 		(SVGNS,u'y'),
 		(SVGNS,u'x'),
-		(DRAWNS,u'align'),
 		(DRAWNS,u'id'),
 	),
 	(DRAWNS,u'gradient'): (
@@ -4297,35 +4311,47 @@ allowed_attributes = {
 		(ANIMNS,u'value'),
 	),
 	(ANIMNS,u'seq'):(
-		(PRESENTATIONNS,u'node-type'),
-		(SMILNS,u'decelerate'),
-		(SMILNS,u'begin'),
-		(SMILNS,u'end'),
-		(PRESENTATIONNS,u'group-id'),
-		(SMILNS,u'accelerate'),
-		(SMILNS,u'repeatDur'),
-		(SMILNS,u'endsync'),
-		(SMILNS,u'restartDefault'),
-		(PRESENTATIONNS,u'preset-class'),
-		(SMILNS,u'fillDefault'),
-		(PRESENTATIONNS,u'preset-id'),
-		(SMILNS,u'autoReverse'),
-		(PRESENTATIONNS,u'preset-sub-type'),
-		(SMILNS,u'repeatCount'),
-		(SMILNS,u'dur'),
-		(SMILNS,u'fill'),
 		(ANIMNS,u'id'),
-		(SMILNS,u'restart'),
+		(PRESENTATIONNS,u'group-id'),
 		(PRESENTATIONNS,u'master-element'),
+		(PRESENTATIONNS,u'node-type'),
+		(PRESENTATIONNS,u'preset-class'),
+		(PRESENTATIONNS,u'preset-id'),
+		(PRESENTATIONNS,u'preset-sub-type'),
+		(SMILNS,u'accelerate'),
+		(SMILNS,u'autoReverse'),
+		(SMILNS,u'begin'),
+		(SMILNS,u'decelerate'),
+		(SMILNS,u'dur'),
+		(SMILNS,u'end'),
+		(SMILNS,u'endsync'),
+		(SMILNS,u'fill'),
+		(SMILNS,u'fillDefault'),
+		(SMILNS,u'repeatCount'),
+		(SMILNS,u'repeatDur'),
+		(SMILNS,u'restart'),
+		(SMILNS,u'restartDefault'),
 	),
 	(ANIMNS,u'set'):(
+		(ANIMNS,u'sub-item'),
+		(SMILNS,u'accelerate'),
+		(SMILNS,u'accumulate'),
+		(SMILNS,u'autoReverse'),
 		(SMILNS,u'additive'),
 		(SMILNS,u'attributeName'),
-		(SMILNS,u'to'),
-		(ANIMNS,u'sub-item'),
-		(SMILNS,u'targetElement'),
-		(SMILNS,u'accumulate'),
+		(SMILNS,u'begin'),
+		(SMILNS,u'decelerate'),
+		(SMILNS,u'dur'),
+		(SMILNS,u'end'),
 		(SMILNS,u'fill'),
+		(SMILNS,u'fillDefault'),
+		(SMILNS,u'repeatCount'),
+		(SMILNS,u'repeatDur'),
+		(SMILNS,u'restart'),
+		(SMILNS,u'restartDefault'),
+		(SMILNS,u'targetElement'),
+		(SMILNS,u'to'),
+
 	),
 	(ANIMNS,u'transitionFilter'):(
 		(SMILNS,u'direction'),
@@ -5789,6 +5815,8 @@ allowed_attributes = {
 		(MANIFESTNS,'salt'),
 		(MANIFESTNS,'iteration-count'),
 	),
+	(MANIFESTNS,u'manifest'):(
+	),
 # allowed_attributes
 	(METANS,u'auto-reload'):(
 		(METANS,u'delay'),
@@ -6096,7 +6124,7 @@ allowed_attributes = {
 		(CHARTNS,u'gap-width'),
 		(CHARTNS,u'interpolation'),
 		(CHARTNS,u'interval-major'),
-		(CHARTNS,u'interval-minor'),
+		(CHARTNS,u'interval-minor-divisor'),
 		(CHARTNS,u'japanese-candle-stick'),
 		(CHARTNS,u'label-arrangement'),
 		(CHARTNS,u'lines'),
@@ -6117,6 +6145,7 @@ allowed_attributes = {
 		(CHARTNS,u'spline-resolution'),
 		(CHARTNS,u'stacked'),
 		(CHARTNS,u'symbol-height'),
+		(CHARTNS,u'symbol-name'),
 		(CHARTNS,u'symbol-type'),
 		(CHARTNS,u'symbol-width'),
 		(CHARTNS,u'text-overlap'),
@@ -6236,11 +6265,9 @@ allowed_attributes = {
 	),
 	(STYLENS,u'footer'):(
 		(STYLENS,u'display'),
-		(STYLENS,u'dynamic-spacing'),
 	),
 	(STYLENS,u'footer-left'):(
 		(STYLENS,u'display'),
-		(STYLENS,u'dynamic-spacing'),
 	),
 	(STYLENS,u'footer-style'):(
 	),
@@ -6437,7 +6464,6 @@ allowed_attributes = {
 	),
 	(STYLENS,u'header'):(
 		(STYLENS,u'display'),
-		(STYLENS,u'dynamic-spacing'),
 	),
 	(STYLENS,u'header-footer-properties'): (
 		(FONS,u'background-color'),
@@ -6468,7 +6494,6 @@ allowed_attributes = {
 	),
 	(STYLENS,u'header-left'):(
 		(STYLENS,u'display'),
-		(STYLENS,u'dynamic-spacing'),
 	),
 	(STYLENS,u'header-style'):(
 	),
@@ -6480,6 +6505,7 @@ allowed_attributes = {
 		(STYLENS,u'font-name'),
 		(STYLENS,u'vertical-pos'),
 		(STYLENS,u'vertical-rel'),
+		(SVGNS,u'y'),
 		(TEXTNS,u'min-label-distance'),
 		(TEXTNS,u'min-label-width'),
 		(TEXTNS,u'space-before'),
@@ -6534,12 +6560,10 @@ allowed_attributes = {
 		(STYLENS,u'layout-grid-print'),
 		(STYLENS,u'layout-grid-ruby-below'),
 		(STYLENS,u'layout-grid-ruby-height'),
-		(STYLENS,u'name'),
 		(STYLENS,u'num-format'),
 		(STYLENS,u'num-letter-sync'),
 		(STYLENS,u'num-prefix'),
 		(STYLENS,u'num-suffix'),
-		(STYLENS,u'page-usage'),
 		(STYLENS,u'paper-tray-name'),
 		(STYLENS,u'print'),
 		(STYLENS,u'print-orientation'),
@@ -7156,7 +7180,6 @@ allowed_attributes = {
 		(TABLENS,u'cell-range-address'),
 	),
 	(TABLENS,u'null-date'):(
-		(TABLENS,u'date-value-type'),
 		(TABLENS,u'value-type'),
 	),
 	(TABLENS,u'odd-columns'):(
diff --git a/src/odf/manifest.py b/src/odf/manifest.py
index 5a845335e4..de59048b91 100644
--- a/src/odf/manifest.py
+++ b/src/odf/manifest.py
@@ -39,15 +39,3 @@ def Algorithm(**args):
 def KeyDerivation(**args):
     return Element(qname = (MANIFESTNS,'key-derivation'), **args)
 
-
-
-if __name__ == "__main__":
-    import cStringIO
-    xml=cStringIO.StringIO()
-    m = Manifest()
-    f = FileEntry(mediatype="text/xml", fullpath="content.xml")
-    m.addElement(f)
-
-    m.toXml(0,xml)
-    print xml.getvalue()
-
diff --git a/src/odf/namespaces.py b/src/odf/namespaces.py
index 3fb42af7c6..5940535e24 100644
--- a/src/odf/namespaces.py
+++ b/src/odf/namespaces.py
@@ -17,7 +17,7 @@
 #
 # Contributor(s):
 #
-TOOLSVERSION = u"ODFPY/0.8.1dev"
+TOOLSVERSION = u"ODFPY/0.8.2dev"
 
 ANIMNS         = u"urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
 DBNS           = u"urn:oasis:names:tc:opendocument:xmlns:database:1.0"
@@ -49,7 +49,7 @@ TABLENS        = u"urn:oasis:names:tc:opendocument:xmlns:table:1.0"
 TEXTNS         = u"urn:oasis:names:tc:opendocument:xmlns:text:1.0"
 XFORMSNS       = u"http://www.w3.org/2002/xforms"
 XLINKNS        = u"http://www.w3.org/1999/xlink"
-XMLNS          = "http://www.w3.org/XML/1998/namespace"
+XMLNS          = u"http://www.w3.org/XML/1998/namespace"
 
 
 nsdict = {
diff --git a/src/odf/opendocument.py b/src/odf/opendocument.py
index 784ff70292..2744c256bf 100644
--- a/src/odf/opendocument.py
+++ b/src/odf/opendocument.py
@@ -64,6 +64,12 @@ odmimetypes = {
  'application/vnd.oasis.opendocument.text-web':              '.oth',
 }
 
+class OpaqueObject:
+    def __init__(self, filename, mediatype, content=None):
+       self.mediatype = mediatype
+       self.filename = filename
+       self.content = content
+
 class OpenDocument:
     """ A class to hold the content of an OpenDocument document
         Use the xml method to write the XML
@@ -76,6 +82,7 @@ class OpenDocument:
     def __init__(self, mimetype, add_generator=True):
         self.mimetype = mimetype
         self.childobjects = []
+        self._extra = []
         self.folder = "" # Always empty for toplevel documents
         self.topnode = Document(mimetype=self.mimetype)
         self.topnode.ownerDocument = self
@@ -303,12 +310,15 @@ class OpenDocument:
         else:
             self.thumbnail = filecontent
 
-    def addObject(self, document):
+    def addObject(self, document, objectname=None):
         """ Add an object. The object must be an OpenDocument class
             The return value will be the folder in the zipfile the object is stored in
         """
         self.childobjects.append(document)
-        document.folder = "%s/Object %d" % (self.folder, len(self.childobjects))
+        if objectname is None:
+            document.folder = "%s/Object %d" % (self.folder, len(self.childobjects))
+        else:
+            document.folder = objectname
         return ".%s" % document.folder
 
     def _savePictures(self, object, folder):
@@ -348,7 +358,7 @@ class OpenDocument:
         else:
             if addsuffix:
                 outputfile = outputfile + odmimetypes.get(self.mimetype,'.xxx')
-            outputfp = zipfile.ZipFile(outputfile,"w")
+            outputfp = zipfile.ZipFile(outputfile, "w")
         self._zipwrite(outputfp)
         outputfp.close()
 
@@ -382,6 +392,14 @@ class OpenDocument:
             zi.external_attr = UNIXPERMS
             self._z.writestr(zi, self.thumbnail)
 
+        # Write any extra files
+        for op in self._extra:
+            self.manifest.addElement(manifest.FileEntry(fullpath=op.filename, mediatype=op.mediatype))
+            zi = zipfile.ZipInfo(op.filename.encode('utf-8'), self._now)
+            zi.compress_type = zipfile.ZIP_DEFLATED
+            zi.external_attr = UNIXPERMS
+            if op.content is not None:
+                self._z.writestr(zi, op.content)
         # Write manifest
         zi = zipfile.ZipInfo("META-INF/manifest.xml", self._now)
         zi.compress_type = zipfile.ZIP_DEFLATED
@@ -528,15 +546,20 @@ def load(odffile):
             parser.parse(inpsrc)
             del doc._parsing
         except KeyError, v: pass
-    # Add the thumbnail here
-    # Add the images here
+    # FIXME: Add subobjects correctly here
     for mentry,mvalue in manifest.items():
         if mentry[:9] == "Pictures/" and len(mentry) > 9:
             doc.addPicture(mvalue['full-path'], mvalue['media-type'], z.read(mentry))
         elif mentry == "Thumbnails/thumbnail.png":
             doc.addThumbnail(z.read(mentry))
+        elif mentry in ('settings.xml', 'meta.xml', 'content.xml', 'styles.xml'):
+            pass
         else:
-            pass  # Add the SUN junk here to the struct somewhere
+            if mvalue['full-path'][-1] == '/':
+                doc._extra.append(OpaqueObject(mvalue['full-path'], mvalue['media-type'], None))
+            else:
+                doc._extra.append(OpaqueObject(mvalue['full-path'], mvalue['media-type'], z.read(mentry)))
+            # Add the SUN junk here to the struct somewhere
             # It is cached data, so it can be out-of-date
     z.close()
     b = doc.getElementsByType(Body)
diff --git a/src/odf/userfield.py b/src/odf/userfield.py
index 501435878f..3d9772416d 100644
--- a/src/odf/userfield.py
+++ b/src/odf/userfield.py
@@ -231,6 +231,19 @@ class ODFContentParser(xml.sax.saxutils.XMLGenerator):
         self._callback_func = callback_func
         xml.sax.saxutils.XMLGenerator.__init__(self, out, encoding)
 
+    def _qname(self, name):
+        """Builds a qualified name from a (ns_url, localname) pair"""
+        if name[0]:
+            if name[0] == u'http://www.w3.org/XML/1998/namespace':
+                return u'xml' + ":" + name[1]
+            # The name is in a non-empty namespace
+            prefix = self._current_context[name[0]]
+            if prefix:
+                # If it is not the default namespace, prepend the prefix
+                return prefix + ":" + name[1]
+        # Return the unqualified name
+        return name[1]
+
     def startElementNS(self, name, qname, attrs):
         if name == (TEXTNS, u'user-field-decl'):
             field_name = attrs.get((TEXTNS, u'name'))