# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: cr33dog@gmail.com-20100528002030-k6qcj4abucgya1qx # target_branch: bzr+ssh://bazaar.launchpad.net/~inkscape.dev\ # /inkscape/trunk/ # testament_sha1: 7baf2706b27715baf291f6de17963f828a3af86c # timestamp: 2010-05-27 19:20:55 -0500 # base_revision_id: kris-degussem__-20100524104454-5oo1o9767b9ob0ip # # Begin patch === modified file 'share/extensions/simplepath.py' --- share/extensions/simplepath.py 2009-02-08 11:12:51 +0000 +++ share/extensions/simplepath.py 2010-05-28 00:20:30 +0000 @@ -84,6 +84,7 @@ subPathStart = pen lastControl = pen lastCommand = '' + isClosed = False while 1: try: @@ -151,6 +152,7 @@ pen = subPathStart if outputCommand == 'Z': pen = subPathStart + isClosed = True else: pen = tuple(params[-2:]) @@ -161,6 +163,13 @@ lastCommand = command retval.append([outputCommand,params]) + + if (isClosed): + if (retval[0][1] != retval[-2][1]): + retval.pop() + retval.append(['L', retval[0][1][:]]) + retval.append(['Z', []]) + return retval def formatPath(a): # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWchNnf4AAcpfgERQcef//1sG BBq////wUAQZt4rDm7tZrslwSSSZE9NMpsjTJDamTINPU9RoyZA2oAkogmwmRoQp+plM1GnqNGhp oAAaBJJkpqbKnmTKm1P0iflQD9U/UJ6g9qjTQ00AcwAEyYAEwmCYQwBGABJIRknpqak8ANTTaKZG QPUxDIMRpCVO+3nw99Mpd38Lyd+DVEuZOMENhOHgRq+OG3mn5dpjuQiEvd37ORwOVLAzfftDwijZ K1mfhuocmrbjPwbu66pccYvw+1fhFrGjdGXxatKxoW73/qfbu3X4ZnVJnDETYyxXAXGTfu4Esw+q q2juOrMmWPGeykFgeWxTKBMKrpceSDfcOqVfWMZTGcLbO07hX45AbrjmW8UGH6qxhMgw6kKBJhdd hAUGHKtVCHqLggQ0H7Xp5qgYmK2a11+maCa2UUrlAenxZYuls/h5Dx1DLmHHDhWXjImIiQsmLVtU AnrIUJwpTCO1wl9Upp5mc8TLNMcE7zFKJN4EXmaMDKBZnNRrHCMh65ppyeSTxicFmFqsKLmTtNTM 4itMc6bOGmEkEi4cuTSpry8xK6KY+LKRn46945W3Z50V61POvaKyl2c41GM7Fid5tJLQgoHlUCJA V6g1RNhWb2UM7Gl7pPRkQqJkNVWeSZuXxOwhHrfVs0wGDFVIiFnYd3zLspC+jK8+2/dnSPmxxqNT Ds3nyON7xJ2oZ4K0te2AY/M9Sev5MM2hmtAeyQ3C9pYdei7FceRrUNZpvqHB0Dxci05YEWFzrot+ itLwuS/wu3zzZVSOXsMlJBRJlzFlagNZQmHaGE2o6hZSosPE2G3CYnCnpYeApVc9yTOn64lEyKO1 kBjzLQzLuNC5Wpl00O5JtpnA158L/i1ZuxhaU9sFXEq7jhCAcJVHeWk2HONvT3lVmqzTVipYXc0x GAXUtm4cl6N5BWJ4l1XLhZAT0kxtJw7h8gN+aJRs+yqeWYDloFaldqVrlzixsyahF+F4+4+ulORe jJLEPHG2omSoT5yrH8BnwaN2x9cUHevYF3pKwD143FlNq1gfAWgOnnNBgk1iZeA8aW7F35INOgjZ 7ThdrWpLtWJVpdC1XU9LnlMsME5cBwLVFp4iYTar4KXFdONEUSFJkMsHWly5Lx5gf3aBYByaSr3M KfYDA9yvCmEnQ16t41996zqssLTZMV9S21PL5zTGMrW4WwVJE3GkBhwYT41iyV2TV9UrGT01a9/W oVsXC1L0zkH+7HXCDLodeZzWTqGmpYGOsNzrG9iwjq52pArnUsdhSmpR0UOrK4I9xG5xiuI0kubI VEgxJ8hycyjpKCgH16twnsuNCF/dRcpimsZARx+AuhV5GSaFrjoTlVUMiLX3rblAf/xdyRThQkMh Nnf4