From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 7 Mar 2017 00:33:42 +0000 (-0800)
Subject: Fix test, now that I understand what's going on.
X-Git-Tag: mit-scheme-pucked-9.2.12~195^2~9
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=52be6a23e3b087a179496083bef96a5b1c78ed27;p=mit-scheme.git

Fix test, now that I understand what's going on.
---

diff --git a/src/runtime/ustring.scm b/src/runtime/ustring.scm
index ab6c627b1..382080a9f 100644
--- a/src/runtime/ustring.scm
+++ b/src/runtime/ustring.scm
@@ -791,7 +791,7 @@ USA.
 	(if (fix:< i1 n)
 	    (let ((wb1 (get-wb i1)))
 	      (cond ((select:extender wb1)
-		     (t1-!breaker wb0 i1 ctx))
+		     (t1-!breaker (if (select:zwj wb0) wb1 wb0) i1 ctx))
 		    ((select:breaker wb1)
 		     (t1-breaker wb1 i1 (break i1 ctx)))
 		    (else
@@ -856,6 +856,9 @@ USA.
 (define select:extender
   (make-selector wb-names '(extend format zwj)))
 
+(define select:zwj
+  (make-selector wb-names '(zwj)))
+
 (define wb-states
   (make-vector (vector-length wb-names)
 	       (lambda (wb1 wb2 k1 k2)
diff --git a/tests/runtime/test-string.scm b/tests/runtime/test-string.scm
index 0feb721c5..3e12df3ef 100644
--- a/tests/runtime/test-string.scm
+++ b/tests/runtime/test-string.scm
@@ -2356,11 +2356,9 @@ USA.
 	 (#t #\x200D #t #\x1F3FB #t)
 	 (#t #\x200D #f #\x0308 #t #\x1F3FB #t)
 	 (#t #\x200D #f #\x2764 #t)
-	 ;; Not clear why this is correct:
-	 ;; (#t #\x200D #f #\x0308 #t #\x2764 #t)
+	 (#t #\x200D #f #\x0308 #t #\x2764 #t)
 	 (#t #\x200D #f #\x1F466 #t)
-	 ;; Not clear why this is correct:
-	 ;; (#t #\x200D #f #\x0308 #t #\x1F466 #t)
+	 (#t #\x200D #f #\x0308 #t #\x1F466 #t)
 	 (#t #\x200D #f #\x00AD #t)
 	 (#t #\x200D #f #\x0308 #f #\x00AD #t)
 	 (#t #\x200D #f #\x0300 #t)