[goffice] fix Pango CRITICALS [#657375]

[Andreas J. Guelzow <guelzow src gnome org>]

commit 13fdd13d6a1aea7710968ced735a0c4a4cd5efc5
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Thu Aug 25 14:40:12 2011 -0600

    fix Pango CRITICALS [#657375]
    
    2011-08-25  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* goffice/utils/go-format.c (gogo_format_parse_number_fraction):
    	don't use both OP_NUM_FRACTION_SIMPLIFY_PI and OP_NUM_FRACTION_BLANK

 ChangeLog                 |    5 +++++
 goffice/utils/go-format.c |    9 +++++----
 2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f12bb41..7a0b191 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-08-25  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* goffice/utils/go-format.c (gogo_format_parse_number_fraction):
+	don't use both OP_NUM_FRACTION_SIMPLIFY_PI and OP_NUM_FRACTION_BLANK
+
+2011-08-25  Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* goffice/utils/go-format.c (go_format_parse_number_fraction): use
 	OP_NUM_FRACTION_SLASH and OP_NUM_FRACTION_ALIGN
 	(UNICODE_PI): use "mathematical small italic pi"
diff --git a/goffice/utils/go-format.c b/goffice/utils/go-format.c
index 467cb8a..060ed42 100644
--- a/goffice/utils/go-format.c
+++ b/goffice/utils/go-format.c
@@ -1973,12 +1973,13 @@ go_format_parse_number_fraction (GOFormatParseState *pstate)
 					   0, 3, NULL))
 		return NULL;
 	scale += pstate->scale;
+	ADD_OP (OP_NUM_FRACTION_ALIGN);
+	if (inhibit_blank) {
 #ifdef ALLOW_PI_SLASH
-	if (inhibit_blank && pi_scale)
-		ADD_OP (OP_NUM_FRACTION_SIMPLIFY_PI);
+		if (pi_scale)
+			ADD_OP (OP_NUM_FRACTION_SIMPLIFY_PI);
 #endif
-	ADD_OP (OP_NUM_FRACTION_ALIGN);
-	if (!inhibit_blank)
+	} else
 		ADD_OP (OP_NUM_FRACTION_BLANK);
 	if (!inhibit_blank_whole)
 		ADD_OP (OP_NUM_FRACTION_BLANK_WHOLE);