If the multibyte width test fails, dump the values of wcwidth() for the

complete BMP.

diff --git a/test/getcwidth.c b/test/getcwidth.c
index f24172f..f2a2ac6 100644 (file)
--- a/test/getcwidth.c
+++ b/test/getcwidth.c
@@ -20,6 +20,9 @@
 #include <wchar.h>
 #endif
 
 #include <wchar.h>
 #endif
 

+static void usage(char *);
+static void dumpwidth(void);
+

 int
 main(int argc, char *argv[])
 {
 int
 main(int argc, char *argv[])
 {


@@ -35,17 +38,22 @@ main(int argc, char *argv[])
 
        setlocale(LC_ALL, "");
 
 
        setlocale(LC_ALL, "");
 

-       if (argc != 1) {
-               fprintf(stderr, "Usage: %s\n", argv[0]);
-               fprintf(stderr, "Returns the column width of a UTF-8 "
-                       "multibyte character\n");
-               exit(1);
+       if (argc > 2)
+               usage(argv[0]);
+
+       if (argc == 2) {
+               if (strcmp(argv[1], "--dump") == 0) {
+                       dumpwidth();
+                       exit(0);
+               } else {
+                       usage(argv[0]);
+               }

        }
 
 #ifndef MULTIBYTE_SUPPORT
        fprintf(stderr, "Nmh was not configured with multibyte support\n");
        exit(1);
        }
 
 #ifndef MULTIBYTE_SUPPORT
        fprintf(stderr, "Nmh was not configured with multibyte support\n");
        exit(1);

-#else
+#else /* MULTIBYTE_SUPPORT */

        /*
         * It's not clear to me that we can just call mbtowc() with a
         * combining character; just to be safe, feed it in a base
        /*
         * It's not clear to me that we can just call mbtowc() with a
         * combining character; just to be safe, feed it in a base


@@ -78,3 +86,39 @@ main(int argc, char *argv[])
        exit(0);
 #endif /* MULTIBYTE_SUPPORT */
 }
        exit(0);
 #endif /* MULTIBYTE_SUPPORT */
 }

+
+static void
+usage(char *argv0)
+{
+       fprintf(stderr, "Usage: %s [--dump]\n", argv0);
+       fprintf(stderr, "Returns the column width of a UTF-8 combining "
+               "multibyte character\n");
+       fprintf(stderr, "\t--dump\tDump complete width table\n");
+
+       exit(1);
+}
+
+static void
+dumpwidth(void)
+{
+#ifndef MULTIBYTE_SUPPORT
+       fprintf(stderr, "Nmh was not configured with multibyte support\n");
+       exit(1);
+#else /* MULTIBYTE_SUPPORT */
+       wchar_t wc, low;
+       int width, lastwidth;
+
+       for (wc = low = 1, lastwidth = wcwidth(wc); wc <= 0xffff; wc++) {
+               width = wcwidth(wc);
+               if (width != lastwidth) {
+                       printf("%04X - %04X = %d\n", low, wc - 1, lastwidth);
+                       low = wc;
+               }
+               lastwidth = width;
+       }
+
+       width = wcwidth(wc - 1);
+       if (width == lastwidth)
+               printf("%04X - %04X = %d\n", low, wc - 1, width);
+#endif /* MULTIBYTE_SUPPORT */
+}

diff --git a/test/scan/test-scan-multibyte b/test/scan/test-scan-multibyte
index 2650d12..c2c581b 100755 (executable)
--- a/test/scan/test-scan-multibyte
+++ b/test/scan/test-scan-multibyte
@@ -70,7 +70,12 @@ else
 fi
 
 scan -width 80 +inbox 11 > $actual || exit 1
 fi
 
 scan -width 80 +inbox 11 > $actual || exit 1

+oldfailed="${failed:-0}"

 check "$expected" "$actual"
 check "$expected" "$actual"

+if test "$oldfailed" -ne "${failed:-0}"; then
+       echo "Complete UTF-8 width table for BMP"
+       ${MH_OBJ_DIR}/test/getcwidth --dump
+fi

 
 #
 # Check decoding with an invalid multibyte sequence.  We skip this test
 
 #
 # Check decoding with an invalid multibyte sequence.  We skip this test