# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: launchpad@marcel-lancelle.de-20130121101448-\ # vryiwa4trehc8izi # target_branch: bzr+ssh://bazaar.launchpad.net/+branch/inkscape/ # testament_sha1: 77d7abc24c3d657922e00b4dc84a1fae048962ba # timestamp: 2013-01-21 11:20:10 +0100 # base_revision_id: kris.de.gussem@hotmail.com-20130120165458-\ # 0uy78cxu3zcjcwwn # # Begin patch === modified file 'src/libnrtype/FontFactory.cpp' --- src/libnrtype/FontFactory.cpp 2013-01-13 15:40:39 +0000 +++ src/libnrtype/FontFactory.cpp 2013-01-21 10:14:48 +0000 @@ -371,6 +371,11 @@ pango_font_description_unset_fields (copy, PANGO_FONT_MASK_SIZE); char * copyAsString = pango_font_description_to_string(copy); + + // if there is a comma at the end, remove it, e.g. 'Aller Light,' becomes 'Aller Light' (bug #595432) + int casLength = strlen(copyAsString); + if (casLength && (copyAsString[casLength-1] == ',')) copyAsString[casLength-1] = 0; + pangoString = copyAsString; g_free(copyAsString); copyAsString = 0; # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZQU64IAAZtfgAAwWef//3ME CAq//9/wUAPjwACqAAaFNATTU03oNGSnlNqaAPETR6TQDmAAAAAAAAAADmAAAAAAAAAADmAAAAAA AAAABJICaAmmTIETZSemSfoiaNMTRtQyMjZGtDaFcqchXBQGSPRABjESMJZjldo1mdexmNxgz+JK RzfhpM0Jb9X5jtP6C+C9aUNw5Dnp+w+WkAksmOQwx9A+6q/pY9WqMIYLxuOOUIQ7DGFtVdcU5vPl UThQsWAOFkuuFf5SqpWK6p0QgqC7kyOXxy1unKAunXkn6rlERF4hhMnj1EJe434qr4NJVOVb/Wyc aU9V+VRHX5zE/XUqztFyV0IuQSVSxPGG3855QETwyX1gJq/C7WK0XbzpYNAt3dtxxMvj0V5RCsWT CwGVuVHonwNj0PtmPSOKakKm0Hj3zI468qKVLK+JD/U1hnFcdivWlB0DaP2tATqRT64MJ1GLh+ha S1FszsjNxzrgRXGSk5WH09cJmvDYWQsdGyBc+W7GbsFeZ5GcFdttXksCvRxuwro18dOittUmxnoq n4aKwVW7YqxjvjVlVtlGcFZZe6imVCvhWqFtY9hxWz87C99lzib7H1SaTk+6A5yZ83RJhCbFfxl8 jd6sfvwLcfgxHw85b+akl2OSjcyY+zrq+wWjLyMCWE3BH0eX1NmcIrwb9C05e3b/PEclh6JtnYPb YDP9c8/FKcp7WSsR5g7RilQFXl4muBVf2+7e4O6fXjzFOn6PngliBcyXNaP9QxoY2OaCkvouynX1 wz7vffJQWXUfuIq5KvoYCH950l9sO/f0IZQSiKpCR3VMLU1ZDvdbu1Nk7jTXKBtUwZ77Z3LPJgJ7 kppccNGq+7iKXgqG3l/wPO5MoGvDfrR2XDFigUinlCgtwZRAFDtFgSEdMJ7WpnegviRPCAbzIY7C CoR9zSCaxDvOAe4TPtbpRSSxL13GSZTK+XJr/L2TTn+NOhr7xg5qRHw/AbIXqv092+XAK5rb4g+3 QV893vFquCN4Xp6XeDBMJuDgl0Og08t9KkmMnD5tnWl+jrL8L0R+yktDp3Lh1SwV9NuJCkFWSkSf AKnxAvSi8P6UnL7JiAaT+UJRZmGTmTLnd2bmBAPhH6sRIrIHr0cKuiyPOKdlBLNzJ51xqnYt04LE kycG2+CULxWzghubyPSS8k1ag6kboR8WF4ifqFweCr/aEXLA4tb3yB01vqzTTDa1uA2+tnvY5l7W VLpEvB5PbytHvVYTOCb0F7KD6mWDr1t5HC1KrBdlgQwLVmGorxdFtUpwop6JlJY7kyNVyVn0UBcL f4VwFn/i7kinChISgp1wQA==