# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: launchpad@marcel-lancelle.de-20130122154532-\
#   krfuhrgdu58urmwd
# target_branch: bzr+ssh://bazaar.launchpad.net/+branch/inkscape/
# testament_sha1: 1f7283b160d7484f755c7ea8c9511e626ea07af0
# timestamp: 2013-01-22 16:45:38 +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-22 15:45:32 +0000
@@ -371,6 +371,19 @@
 
         pango_font_description_unset_fields (copy, PANGO_FONT_MASK_SIZE);
         char * copyAsString = pango_font_description_to_string(copy);
+
+		// If the last word of the font family is also a valid style, pango
+		// adds a comma at the end to differentiate between
+		// 'Fontx, Light' (family: 'Fontx', style: 'Light') and
+		// 'Fontx Light' (family: 'Fontx Light', style: 'Regular')
+		// we strip the comma, so e.g. 'Aller Light,' becomes 'Aller Light'
+		// (see bug #595432)
+		// It should still be possible to differentiate between 'Fontx, Light'
+		// and 'Fontx Light' = 'Fontx Light,Regular' so this hopefully does
+		// not break anything.
+		int casLength = strlen(copyAsString);
+		if (casLength && (copyAsString[casLength-1] == ',')) copyAsString[casLength-1] = 0;
+
         pangoString = copyAsString;
         g_free(copyAsString);
         copyAsString = 0;

# Begin bundle
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
u5IpwoSFCjqpKA==