X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/62988984527c450219fd6808946c618280371047..66cfb7956488139a507375b9b8964cf78a221962:/test/scan/test-scan-multibyte

diff --git a/test/scan/test-scan-multibyte b/test/scan/test-scan-multibyte
index 3acd1ca1..98dd9a26 100755
--- a/test/scan/test-scan-multibyte
+++ b/test/scan/test-scan-multibyte
@@ -47,7 +47,7 @@ Subject: =?utf-8?q?Sp=C4=B1n=CC=88al_Tap_=E2=86=92_Tap_into_America!?=
 Things are looking great!
 EOF
 
-width=`${MH_OBJ_DIR}/test/getcwidth`
+width=`${MH_OBJ_DIR}/test/getcwidth "→n̈"`
 if test $? -ne 0; then
     echo "getcwidth failed to run"
     exit 1
@@ -56,28 +56,21 @@ fi
 expected="$MH_TEST_DIR/$$.expected"
 actual="$MH_TEST_DIR/$$.actual"
 
-if test "$width" -eq 1; then
+if test "$width" -eq 3; then
 cat > "$expected" <<EOF
   11  03/02 David st Hubbins    Spın̈al Tap → Tap into America!<<Things are look
 EOF
-elif test "$width" -eq 0; then
+elif test "$width" -eq 2; then
 cat > "$expected" <<EOF
   11  03/02 David st Hubbins    Spın̈al Tap → Tap into America!<<Things are looki
 EOF
 else
-    echo "Unsupported width for combining diaeresis: $width"
+    echo "Unsupported width for UTF-8 test string: $width"
     exit 1
 fi
 
 scan -width 80 +inbox 11 > $actual || exit 1
-set -x
-oldfailed="${failed:-0}"
 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
-set +x
 
 #
 # Check decoding with an invalid multibyte sequence.  We skip this test
@@ -107,10 +100,29 @@ if test "$ICONV_ENABLED" -eq 1; then
     check "$expected" "$actual"
 fi
 
+#
+# Find out the width of our Unicode apostrophe (U+2019).  Some implementations
+# say it has a width of 2, but that seems totally bizarre to me.
+#
+
+width=`${MH_OBJ_DIR}/test/getcwidth U+2019`
+if test $? -ne 0; then
+    echo "getcwidth failed to run"
+    exit 1
+fi
+
 # check scan width with a valid multibyte sequence
-cat >"$expected" <<EOF
+if test "$width" -eq 1; then
+    cat >"$expected" <<EOF
   12  12/31 Test12             2013 New Year’s Deals! Start the year right
 EOF
+elif test "$width" -eq 2; then
+    cat >"$expected" <<EOF
+  12  12/31 Test12             2013 New Year’s Deals! Start the year righ
+EOF
+else
+    echo "Unsupported width for U+2019: $width"
+fi
 
 LC_CTYPE=en_US.UTF-8 MM_CHARSET=UTF-8 scan -width 75 last >"$actual"
 check "$expected" "$actual"