Add DEFAULT_CHAR to BDF

Also sort properties into the order they appear in the XLFD spec.

diff --git a/bedstead.c b/bedstead.c
index 54c050ee47001b5f367340131bd3752dbe30732b..d7379e954289a975b0ba786dc9d45ca8c2105c91 100644 (file)
--- a/bedstead.c
+++ b/bedstead.c
@@ -3872,7 +3872,7 @@ bdf_gen(int px_height)
               dpt_height, px_height, px_width * 10);
        printf("SIZE %d 75 75\n", pt_height);
        printf("FONTBOUNDINGBOX %d %d 0 %d\n", px_width, px_height, -base);
-       printf("STARTPROPERTIES 22\n");
+       printf("STARTPROPERTIES 23\n");
        printf("FOUNDRY \"bjh21\"\n");
        printf("FAMILY_NAME \"Bedstead\"\n");
        printf("WEIGHT_NAME \"%s\"\n",
@@ -3889,8 +3889,6 @@ bdf_gen(int px_height)
        printf("AVERAGE_WIDTH %d\n", px_width * 10);
        printf("CHARSET_REGISTRY \"ISO10646\"\n");
        printf("CHARSET_ENCODING \"1\"\n");
-       printf("FONT_ASCENT %d\n", px_height - base);
-       printf("FONT_DESCENT %d\n", base);
        printf("UNDERLINE_POSITION %d\n", base / 2);
        printf("UNDERLINE_THICKNESS %d\n", base / 2);
        printf("RELATIVE_SETWIDTH %d\n", width->ttfwidth * 10);
@@ -3899,6 +3897,9 @@ bdf_gen(int px_height)
        printf("FONT_VERSION \") print\n");
        printf("currentfont /FontInfo get /version get print\n");
        printf("(\"\n");
+       printf("FONT_ASCENT %d\n", px_height - base);
+       printf("FONT_DESCENT %d\n", base);
+       printf("DEFAULT_CHAR %d\n", 0xf1ff);
        printf("ENDPROPERTIES\n");
        printf("CHARS %d\n", nglyphs);
        for (i = 0; i < nglyphs; i++) {