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

Merge sibling <g> nodes with identical attributes

Browse source 
In some cases, gnuplot generates a very suboptimal SVG content of the
following pattern:

        <g color="black" fill="none" stroke="currentColor">
        <path d="m82.5 323.3v-4.1" stroke="#000"/>
        </g>
        <g color="black" fill="none" stroke="currentColor">
        <path d="m116.4 323.3v-4.1" stroke="#000"/>
        </g>
        ... repeated 10+ more times here ...
        <g color="black" fill="none" stroke="currentColor">
        <path d="m65.4 72.8v250.5h420v-250.5h-420z" stroke="#000"/>
        </g>

A more optimal pattern would be:

        <g color="black" fill="none" stroke="#000">
        <path d="m82.5 323.3v-4.1"/>
        <path d="m116.4 323.3v-4.1"/>
        ... 10+ more paths here ...
        <path d="m65.4 72.8v250.5h420v-250.5h-420z"/>
        </g>

This patch enables that optimization by handling the merging of two
sibling <g> entries that have identical attributes.  In the above
example that does not solve the rewrite from "currentColor" to "#000"
for the stroke attribute.  However, the existing code already handles
that automatically after the <g> elements have been merged.

This change provides comparable results to --create-groups as shown by
the following diagram while being a distinct optimization:

       +----------------------------+-------+--------+
       |           Test             | Size  |  in %  |
       +----------------------------+-------+--------+
       | baseline                   | 17961 |  100%  |
       | baseline + --create-groups | 17418 |  97.0% |
       | patched                    | 16939 |  94.3% |
       | patched + --create-groups  | 16855 |  93.8% |
       +----------------------------+-------+--------+

The image used in the size table above was generated based on the
instructions from https://bugs.debian.org/858039#10 with gnuplot 5.2
patchlevel 2.  Beyond the test-based "--create-groups", the following
scour command-line parameters were used:
      --enable-id-stripping --enable-comment-stripping \
      --shorten-ids --indent=none

Note that the baseline was scour'ed repeatedly to stablize the image
size.

Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2018-03-20 21:34:20 +00:00
parent 40753af88a
commit cdf5e479a6
No known key found for this signature in database
GPG key ID: A65B78DBE67C7AAC
3 changed files with 115 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
testscour.py
View file

@ -2075,6 +2075,21 @@ class MustKeepGInSwitch2(unittest.TestCase):
'Erroneously removed a <g> in a <switch>')
class GroupSiblingMerge(unittest.TestCase):
def test_sibling_merge(self):
doc = scourXmlFile('unittests/group-sibling-merge.svg',
parse_args([]))
self.assertEqual(doc.getElementsByTagName('g').length, 5,
'Merged sibling <g> tags with similar values')
def test_sibling_merge_disabled(self):
doc = scourXmlFile('unittests/group-sibling-merge.svg',
parse_args(['--disable-group-collapsing']))
self.assertEqual(doc.getElementsByTagName('g').length, 8,
'Sibling merging is disabled by --disable-group-collapsing')
class GroupCreation(unittest.TestCase):
def runTest(self):