]> Chaos Git - corbenik/bdfe.git/commitdiff
Use multiline C comments in generation to workaround issue
authorchaoskagami <chaos.kagami@gmail.com>
Sun, 19 Jun 2016 01:40:11 +0000 (21:40 -0400)
committerchaoskagami <chaos.kagami@gmail.com>
Sun, 19 Jun 2016 01:40:11 +0000 (21:40 -0400)
bdf.c

diff --git a/bdf.c b/bdf.c
index 4809eea4a1be32d4015f5e5207830be873a9b9c5..83876a38e5e830cfcd9e71d13559847aa4070a1b 100644 (file)
--- a/bdf.c
+++ b/bdf.c
@@ -92,14 +92,14 @@ bdfe_t *bdf_convert(const char *name, unsigned gmin, unsigned gmax, unsigned asc
        int mute = flags & BDF_MUTE;
 
        if (!mute && (flags & BDF_HEADER)) {
-               printf("// File generated by 'bdfe");
+               printf("/* File generated by 'bdfe");
                if (flags & BDF_NATIVE)
                        printf(" -n");
                if (flags & BDF_ROTATE)
                        printf(" -r");
                if (ascender)
                        printf(" -a %d", ascender);
-               printf(" -s %d-%d %s'\n", gmin, gmax, name);
+               printf(" -s %d-%d %s' */\n", gmin, gmax, name);
        }
 
        // parse file header up to 'CHARS' keyword
@@ -110,18 +110,18 @@ bdfe_t *bdf_convert(const char *name, unsigned gmin, unsigned gmax, unsigned asc
 
                if (!mute && (flags & BDF_HEADER)) {
                        if (key_arg(buf, "FONT", &arg))
-                               printf("// %s\n", buf);
+                               printf("/* %s */\n", buf);
                        if (key_arg(buf, "COMMENT", &arg))
-                               printf("// %s\n", buf);
+                               printf("/* %s */\n", buf);
                        if (key_arg(buf, "COPYRIGHT", &arg))
-                               printf("// %s\n", buf);
+                               printf("/* %s */\n", buf);
                        if (key_arg(buf, "FONT_ASCENT", &arg))
-                               printf("// %s\n", buf);
+                               printf("/* %s */\n", buf);
                }
 
                if (key_arg(buf, "FONTBOUNDINGBOX", &arg)) {
                        if (!mute && (flags & BDF_HEADER))
-                               printf("// %s\n", buf);
+                               printf("/* %s */\n", buf);
                        dx = strtoul(arg, &arg, 10);
                        dy = strtoul(arg, &arg, 10);
                        strtoul(arg, &arg, 10);
@@ -130,7 +130,7 @@ bdfe_t *bdf_convert(const char *name, unsigned gmin, unsigned gmax, unsigned asc
 
                if (key_arg(buf, "FONT_DESCENT", &arg)) {
                        if (!mute && (flags & BDF_HEADER))
-                               printf("// %s\n", buf);
+                               printf("/* %s */\n", buf);
                        descent = strtoul(arg, &arg, 10);
                }
 
@@ -219,8 +219,8 @@ bdfe_t *bdf_convert(const char *name, unsigned gmin, unsigned gmax, unsigned asc
                                        if (idx < gmin || idx > gmax)
                                                break;
                                        if (!mute && !(flags & BDF_GPL) && (flags & BDF_VERBOSE)) {
-                                               printf("// %s\n", startchar);
-                                               printf("// %s\n", buf);
+                                               printf("/* %s */\n", startchar);
+                                               printf("/* %s */\n", buf);
                                        }
                                }
                                if (key_arg(buf, "DWIDTH", &arg)) {
@@ -230,7 +230,7 @@ bdfe_t *bdf_convert(const char *name, unsigned gmin, unsigned gmax, unsigned asc
                                }
                                if (key_arg(buf, "BBX", &arg)) {
                                        if (!mute && !(flags & BDF_GPL) && (flags & BDF_VERBOSE))
-                                               printf("// %s\n", buf);
+                                               printf("/* %s */\n", buf);
                                        bbw = strtol(arg, &arg, 10);
                                        strtol(arg, &arg, 10); // skip bbh, we'll calculate it (i)
                                        bbox = strtol(arg, &arg, 10);
@@ -265,25 +265,25 @@ bdfe_t *bdf_convert(const char *name, unsigned gmin, unsigned gmax, unsigned asc
                                                                        printf("\n\t");
                                                                printf("0x%02X,", gout[i]);
                                                        }
-                                                       printf(" // %5d", idx);
+                                                       printf(" /* %5d", idx);
                                                        if (isprint(idx))
                                                                printf(" '%c'", idx);
-                                                       printf("\n");
+                                                       printf(" */\n");
                                                }
                                                else {
-                                                       printf("// %5d '%c' |", idx, isprint(idx) ? idx : ' ');
+                                                       printf("/* %5d '%c' |", idx, isprint(idx) ? idx : ' ');
                                                        for(i = 0; i < gw; i++)
                                                                printf("%d", i);
-                                                       printf("|\n");
+                                                       printf("| */\n");
                                                        for(i = 0; i < gh; i++) {
-                                                               printf(" 0x%02X, //  %2d|", gout[i], i);
+                                                               printf(" 0x%02X, /*  %2d|", gout[i], i);
                                                                for(unsigned bit = 0; bit < gw; bit++) {
                                                                        if (gout[i] & (0x80 >> bit))
                                                                                printf("#");
                                                                        else
                                                                                printf(" ");
                                                                }
-                                                               printf("|\n");
+                                                               printf("| */\n");
                                                        }
                                                        printf("\n");
                                                }