Case conversion title case fixed

basis/unicode/breaks/breaks.factor

@@ -3,7 +3,7 @@
 USING: combinators.short-circuit unicode.categories kernel math
 combinators splitting sequences math.parser io.files io assocs
 arrays namespaces make math.ranges unicode.normalize.private values
-io.encodings.ascii unicode.syntax unicode.data compiler.units
+io.encodings.ascii unicode.syntax unicode.data compiler.units fry
 alien.syntax sets accessors interval-maps memoize locals words ;
 IN: unicode.breaks
 
@@ -111,14 +111,9 @@ PRIVATE>
 
 <PRIVATE
 
-:: (>pieces) ( str quot -- )
+: >pieces ( str quot: ( str -- i ) -- graphemes )
-    str [
+    [ dup empty? not ] swap '[ dup @ cut-slice swap ]
-        dup quot call cut-slice
+    [ ] produce nip ; inline
-        swap , quot (>pieces)
-    ] unless-empty ; inline recursive
-
-: >pieces ( str quot -- graphemes )
-    [ (>pieces) ] { } make ; inline
 
 PRIVATE>
 

basis/unicode/case/case-tests.factor

@@ -4,7 +4,7 @@ USING: unicode.case tools.test namespaces ;
 \ >lower must-infer
 \ >title must-infer
 
-[ "Hello How Are You? I'M Good" ] [ "hEllo how ARE yOU? I'm good" >title ] unit-test
+[ "Hello How Are You? I'm Good" ] [ "hEllo how ARE yOU? I'm good" >title ] unit-test
 [ "FUSS" ] [ "Fu\u0000DF" >upper ] unit-test
 [ "\u0003C3\u0003C2" ] [ "\u0003A3\u0003A3" >lower ] unit-test
 [ t ] [ "hello how are you?" lower? ] unit-test

basis/unicode/case/case.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: unicode.data sequences sequences.next namespaces make
 unicode.normalize math unicode.categories combinators
-assocs strings splitting kernel accessors ;
+assocs strings splitting kernel accessors unicode.breaks ;
 IN: unicode.case
 
 <PRIVATE
@@ -82,23 +82,30 @@ SYMBOL: locale ! Just casing locale, or overall?
             [ [ % ] compose ] [ [ , ] compose ] bi* ?if
         ] 2curry each
     ] "" make ; inline
-PRIVATE>
-: >lower ( string -- lower )
-    i-dot? [ turk>lower ] when
-    final-sigma [ lower>> ] [ ch>lower ] map-case ;
 
-: >upper ( string -- upper )
+: (>lower) ( string -- lower )
-    i-dot? [ turk>upper ] when
+    [ lower>> ] [ ch>lower ] map-case ;
+
+: (>title) ( string -- title )
+    [ title>> ] [ ch>title ] map-case ;
+
+: (>upper) ( string -- upper )
     [ upper>> ] [ ch>upper ] map-case ;
 
+: title-word ( string -- title )
+    unclip 1string [ (>lower) ] [ (>title) ] bi* prepend ;
+
+PRIVATE>
+
+: >lower ( string -- lower )
+    i-dot? [ turk>lower ] when
+    final-sigma (>lower) ;
+
+: >upper ( string -- upper )
+    i-dot? [ turk>upper ] when (>upper) ;
+
 : >title ( string -- title )
-    final-sigma
+    final-sigma >words [ title-word ] map concat ;
-    CHAR: \s swap
-    [ tuck word-boundary swapd
-        [ title>> ] [ lower>> ] if ]
-    [ tuck word-boundary swapd 
-        [ ch>title ] [ ch>lower ] if ]
-    map-case nip ;
 
 : >case-fold ( string -- fold )
     >upper >lower ;

basis/unicode/collation/collation-tests.factor

@@ -1,6 +1,6 @@
 USING: io io.files splitting grouping unicode.collation
 sequences kernel io.encodings.utf8 math.parser math.order
-tools.test assocs io.streams.null words ;
+tools.test assocs words ;
 IN: unicode.collation.tests
 
 : parse-test ( -- strings )
@@ -25,4 +25,4 @@ IN: unicode.collation.tests
 unit-test
 
 parse-test 2 <clumps>
-[ [ test-two ] assoc-each ] with-null-writer
+[ test-two ] assoc-each

basis/unicode/normalize/normalize.factor

@@ -155,7 +155,7 @@ DEFER: compose-iter
         ] if (compose)
     ] when* ;
 
-: compose ( str -- comp )
+: combine ( str -- comp )
     [
         main-str set
         0 ind set
@@ -166,7 +166,7 @@ DEFER: compose-iter
 PRIVATE>
 
 : nfc ( string -- nfc )
-    nfd compose ;
+    nfd combine ;
 
 : nfkc ( string -- nfkc )
-    nfkd compose ;
+    nfkd combine ;