marcus/scour
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

always order attributes based on defined order of known attributes, otherwise alphabetical

Browse source
This commit is contained in:
Dirk Thomas 2016-08-29 15:46:19 -07:00
parent bf4fc1b70e
commit a08814b459
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
scour/scour.py
View file

@ -2970,11 +2970,24 @@ def serializeXML(element, options, ind = 0, preserveWhitespace = False):
outParts.extend([' xml:id=', quot, id, quot]) outParts.extend([' xml:id=', quot, id, quot])
# now serialize the other attributes # now serialize the other attributes
known_attr = [
'id', 'class',
'transform',
'x', 'y', 'z', 'width', 'height', 'x1', 'x2', 'y1', 'y2',
'cx', 'cy', 'r', 'rx', 'ry', 'fx', 'fy',
'd',
] + sorted(svgAttributes) + [
'style',
]
attrList = element.attributes attrList = element.attributes
attrIndices = range(attrList.length) attrName2Index = dict([(attrList.item(i).nodeName, i) for i in range(attrList.length)])
if options.order_attributes : # use custom order for known attributes and alphabetical order for the rest
attrName2Index = dict([(attrList.item(i).nodeName, i) for i in attrIndices]) attrIndices = []
attrIndices = [attrName2Index[name] for name in sorted(attrName2Index.keys())] for name in known_attr:
if name in attrName2Index:
attrIndices.append(attrName2Index[name])
del attrName2Index[name]
attrIndices += [attrName2Index[name] for name in sorted(attrName2Index.keys())]
for index in attrIndices : for index in attrIndices :
attr = attrList.item(index) attr = attrList.item(index)
if attr.nodeName == 'id' or attr.nodeName == 'xml:id': continue if attr.nodeName == 'id' or attr.nodeName == 'xml:id': continue
@ -3419,9 +3432,6 @@ _option_group_formatting.add_option("--no-line-breaks",
_option_group_formatting.add_option("--strip-xml-space", _option_group_formatting.add_option("--strip-xml-space",
action="store_true", dest="strip_xml_space_attribute", default=False, action="store_true", dest="strip_xml_space_attribute", default=False,
help="strip the xml:space=\"preserve\" attribute from the root SVG element") help="strip the xml:space=\"preserve\" attribute from the root SVG element")
_option_group_formatting.add_option("--order-attributes",
action="store_true", dest="order_attributes", default=False,
help="order attributes alphabetically (except \"id\")")
_options_parser.add_option_group(_option_group_formatting) _options_parser.add_option_group(_option_group_formatting)
_option_group_ids = optparse.OptionGroup(_options_parser, "ID attributes") _option_group_ids = optparse.OptionGroup(_options_parser, "ID attributes")