wrap.strings: preserve leading whitespace when wrapping.

diff --git a/basis/wrap/strings/strings-tests.factor b/basis/wrap/strings/strings-tests.factor
index a28dad2b8334b9e50ccf487f67b3740e230f1545..81142a1934fa90e2878ec6bb5e8f3297e680e946 100644 (file)
--- a/basis/wrap/strings/strings-tests.factor
+++ b/basis/wrap/strings/strings-tests.factor
@@ -26,6 +26,30 @@ word wrap."
     "  " wrap-indented-string
 ] unit-test
 
+{
+    "   This is
+a long
+piece of
+text that
+we wish to
+word wrap."
+} [
+    "  This is a long piece of text that we wish to word wrap." 10
+    wrap-string
+] unit-test
+
+{
+    "     This is
+  a long
+  piece of
+  text that
+  we wish to
+  word wrap."
+} [
+    "  This is a long piece of text that we wish to word wrap." 12
+    "  " wrap-indented-string
+] unit-test
+
 { t } [
     "This is a long piece of text that we wish to word wrap." 12
     [ "  " wrap-indented-string ] [ 2 wrap-indented-string ] 2bi =

diff --git a/basis/wrap/strings/strings.factor b/basis/wrap/strings/strings.factor
index fa9d0f04d65d30aa94658e72454333eeaceb39d7..bcc49ac8949d59d257f46aea4a9318aaa9664157 100644 (file)
--- a/basis/wrap/strings/strings.factor
+++ b/basis/wrap/strings/strings.factor
@@ -5,11 +5,14 @@ IN: wrap.strings
 
 <PRIVATE
 
+: split-line ( string -- elements )
+    dup [ " \t" member? not ] find drop 0 or
+    [ f swap ] [ cut ] if-zero
+    " \t" split harvest [ dup length 1 <element> ] map!
+    swap [ 0 over length <element> prefix ] when* ;
+
 : split-lines ( string -- elements-lines )
-    string-lines [
-        " \t" split harvest
-        [ dup length 1 <element> ] map!
-    ] map! ;
+    string-lines [ split-line ] map! ;
 
 : join-elements ( wrapped-lines -- lines )
     [ " " join ] map! ;