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

Also shorten unused IDs when --shorten-ids is specified

Browse source 
(previously unreferenced IDs were simply ignored)
This commit is contained in:
Eduard Braun 2016-08-14 17:03:37 +02:00
parent df142a2f22
commit ac82d2e52b
1 changed files with 51 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

97
scour/scour.py
View file

@ -658,11 +658,14 @@ def shortenIDs(doc, prefix, unprotectedElements=None):
# descending, so the highest reference count is first. # descending, so the highest reference count is first.
# First check that there's actually a defining element for the current ID name. # First check that there's actually a defining element for the current ID name.
# (Cyn: I've seen documents with #id references but no element with that ID!) # (Cyn: I've seen documents with #id references but no element with that ID!)
idList = [(referencedIDs[rid][0], rid) for rid in referencedIDs idList = [(referencedIDs[rid][0], rid) for rid in referencedIDs
if rid in unprotectedElements] if rid in unprotectedElements]
idList.sort(reverse=True) idList.sort(reverse=True)
idList = [rid for count, rid in idList] idList = [rid for count, rid in idList]
# Add unreferenced IDs to end of idList in arbitrary order
idList.extend([rid for rid in unprotectedElements if not rid in idList])
curIdNum = 1 curIdNum = 1
for rid in idList: for rid in idList:
@ -713,58 +716,60 @@ def renameID(doc, idFrom, idTo, identifiedElements, referencedIDs):
del identifiedElements[idFrom] del identifiedElements[idFrom]
identifiedElements[idTo] = definingNode identifiedElements[idTo] = definingNode
referringNodes = referencedIDs[idFrom] # Update references to renamed node
referringNodes = referencedIDs.get(idFrom)
if referringNodes is not None:
# Look for the idFrom ID name in each of the referencing elements, # Look for the idFrom ID name in each of the referencing elements,
# exactly like findReferencedElements would. # exactly like findReferencedElements would.
# Cyn: Duplicated processing! # Cyn: Duplicated processing!
for node in referringNodes[1]: for node in referringNodes[1]:
# if this node is a style element, parse its text into CSS # if this node is a style element, parse its text into CSS
if node.nodeName == 'style' and node.namespaceURI == NS['SVG']: if node.nodeName == 'style' and node.namespaceURI == NS['SVG']:
# node.firstChild will be either a CDATA or a Text node now # node.firstChild will be either a CDATA or a Text node now
if node.firstChild != None: if node.firstChild != None:
# concatenate the value of all children, in case # concatenate the value of all children, in case
# there's a CDATASection node surrounded by whitespace # there's a CDATASection node surrounded by whitespace
# nodes # nodes
# (node.normalize() will NOT work here, it only acts on Text nodes) # (node.normalize() will NOT work here, it only acts on Text nodes)
oldValue = "".join([child.nodeValue for child in node.childNodes]) oldValue = "".join([child.nodeValue for child in node.childNodes])
# not going to reparse the whole thing # not going to reparse the whole thing
newValue = oldValue.replace('url(#' + idFrom + ')', 'url(#' + idTo + ')') newValue = oldValue.replace('url(#' + idFrom + ')', 'url(#' + idTo + ')')
newValue = newValue.replace("url(#'" + idFrom + "')", 'url(#' + idTo + ')') newValue = newValue.replace("url(#'" + idFrom + "')", 'url(#' + idTo + ')')
newValue = newValue.replace('url(#"' + idFrom + '")', 'url(#' + idTo + ')') newValue = newValue.replace('url(#"' + idFrom + '")', 'url(#' + idTo + ')')
# and now replace all the children with this new stylesheet. # and now replace all the children with this new stylesheet.
# again, this is in case the stylesheet was a CDATASection # again, this is in case the stylesheet was a CDATASection
node.childNodes[:] = [node.ownerDocument.createTextNode(newValue)] node.childNodes[:] = [node.ownerDocument.createTextNode(newValue)]
num += len(oldValue) - len(newValue) num += len(oldValue) - len(newValue)
# if xlink:href is set to #idFrom, then change the id # if xlink:href is set to #idFrom, then change the id
href = node.getAttributeNS(NS['XLINK'],'href') href = node.getAttributeNS(NS['XLINK'],'href')
if href == '#' + idFrom: if href == '#' + idFrom:
node.setAttributeNS(NS['XLINK'],'href', '#' + idTo) node.setAttributeNS(NS['XLINK'],'href', '#' + idTo)
num += len(idFrom) - len(idTo) num += len(idFrom) - len(idTo)
# if the style has url(#idFrom), then change the id # if the style has url(#idFrom), then change the id
styles = node.getAttribute('style') styles = node.getAttribute('style')
if styles != '': if styles != '':
newValue = styles.replace('url(#' + idFrom + ')', 'url(#' + idTo + ')') newValue = styles.replace('url(#' + idFrom + ')', 'url(#' + idTo + ')')
newValue = newValue.replace("url('#" + idFrom + "')", 'url(#' + idTo + ')')
newValue = newValue.replace('url("#' + idFrom + '")', 'url(#' + idTo + ')')
node.setAttribute('style', newValue)
num += len(styles) - len(newValue)
# now try the fill, stroke, filter attributes
for attr in referencingProps:
oldValue = node.getAttribute(attr)
if oldValue != '':
newValue = oldValue.replace('url(#' + idFrom + ')', 'url(#' + idTo + ')')
newValue = newValue.replace("url('#" + idFrom + "')", 'url(#' + idTo + ')') newValue = newValue.replace("url('#" + idFrom + "')", 'url(#' + idTo + ')')
newValue = newValue.replace('url("#' + idFrom + '")', 'url(#' + idTo + ')') newValue = newValue.replace('url("#' + idFrom + '")', 'url(#' + idTo + ')')
node.setAttribute(attr, newValue) node.setAttribute('style', newValue)
num += len(oldValue) - len(newValue) num += len(styles) - len(newValue)
del referencedIDs[idFrom] # now try the fill, stroke, filter attributes
referencedIDs[idTo] = referringNodes for attr in referencingProps:
oldValue = node.getAttribute(attr)
if oldValue != '':
newValue = oldValue.replace('url(#' + idFrom + ')', 'url(#' + idTo + ')')
newValue = newValue.replace("url('#" + idFrom + "')", 'url(#' + idTo + ')')
newValue = newValue.replace('url("#' + idFrom + '")', 'url(#' + idTo + ')')
node.setAttribute(attr, newValue)
num += len(oldValue) - len(newValue)
del referencedIDs[idFrom]
referencedIDs[idTo] = referringNodes
return num return num