Commit 7d364b7e51982ebe926c4148c752e0758c4dd2ed

Werner Lemberg 2015-09-17T16:31:58

[psaux] Improve tracing message. * src/psaux/psobjs.c (ps_parser_load_field) <T1_FIELD_TYPE_MM_BBOX>: Handle plural correctly.

diff --git a/ChangeLog b/ChangeLog
index d4f859b..8bad3b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2015-09-17  Werner Lemberg  <wl@gnu.org>
 
+	[psaux] Improve tracing message.
+
+	* src/psaux/psobjs.c (ps_parser_load_field) <T1_FIELD_TYPE_MM_BBOX>:
+	Handle plural correctly.
+
+2015-09-17  Werner Lemberg  <wl@gnu.org>
+
 	[pcf] Fix integer overflows (#45985).
 
 	* src/pcf/pcfread.c (pcf_load_font): Use FT_MulDiv.
diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
index 54eabe2..1852998 100644
--- a/src/psaux/psobjs.c
+++ b/src/psaux/psobjs.c
@@ -1232,10 +1232,10 @@
             if ( result < 0 || (FT_UInt)result < max_objects )
             {
               FT_ERROR(( "ps_parser_load_field:"
-                         " expected %d integers in the %s subarray\n"
+                         " expected %d integer%s in the %s subarray\n"
                          "                     "
                          " of /FontBBox in the /Blend dictionary\n",
-                         max_objects,
+                         max_objects, max_objects > 1 ? "s" : "",
                          i == 0 ? "first"
                                 : ( i == 1 ? "second"
                                            : ( i == 2 ? "third"