steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Making basis/wrap not try to align the last line

db4
Daniel Ehrenberg 2009-02-10 01:46:02 -06:00
parent 8c4fb753f6
commit c51a5d7678
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
basis/wrap/strings/strings-tests.factor
View File

@ -27,7 +27,7 @@ word wrap.">
" " wrap-indented-string " " wrap-indented-string
] unit-test ] unit-test
[ "this text\nhas lots\nof spaces" ] [ "this text\nhas lots of\nspaces" ]
[ "this text has lots of spaces" 12 wrap-string ] unit-test [ "this text has lots of spaces" 12 wrap-string ] unit-test
[ "hello\nhow\nare\nyou\ntoday?" ] [ "hello\nhow\nare\nyou\ntoday?" ]
@ -39,3 +39,5 @@ word wrap.">
[ "aaa bb\nccccccc\nddddddd" ] [ "aaa bb ccccccc ddddddd" 6 wrap-string ] unit-test [ "aaa bb\nccccccc\nddddddd" ] [ "aaa bb ccccccc ddddddd" 6 wrap-string ] unit-test
\ wrap-string must-infer \ wrap-string must-infer
[ "a b c d e f\ng h" ] [ "a b c d e f g h" 11 wrap-string ] unit-test

6
basis/wrap/wrap.factor
View File

@ -36,8 +36,10 @@ SYMBOL: line-ideal
] each drop ; inline ] each drop ; inline
: paragraph-cost ( paragraph -- cost ) : paragraph-cost ( paragraph -- cost )
[ head-width>> deviation ] dup lines>> 1list? [ drop 0 ] [
[ tail-cost>> ] bi + ; [ head-width>> deviation ]
[ tail-cost>> ] bi +
] if ;
: min-cost ( paragraphs -- paragraph ) : min-cost ( paragraphs -- paragraph )
[ paragraph-cost ] min-by ; [ paragraph-cost ] min-by ;