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

wrap: some cleanup.

db4
John Benediktsson 2015-07-20 12:25:30 -07:00
parent 46fbfe3ff0
commit d5ebb43905
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
basis/wrap/wrap.factor
View File

@ -16,19 +16,21 @@ C: <element> element
TUPLE: paragraph line-max line-ideal lines head-width tail-cost ; TUPLE: paragraph line-max line-ideal lines head-width tail-cost ;
C: <paragraph> paragraph C: <paragraph> paragraph
: if-one-line ( paragraph true false -- )
[ dup lines>> 1list? ] 2dip if ; inline
TYPED: top-fits? ( paragraph: paragraph -- ? ) TYPED: top-fits? ( paragraph: paragraph -- ? )
[ head-width>> ] [ head-width>> ]
[ dup lines>> 1list? [ line-ideal>> ] [ line-max>> ] if ] bi <= ; inline [ [ line-ideal>> ] [ line-max>> ] if-one-line ] bi <= ; inline
TYPED: fits? ( paragraph: paragraph -- ? ) TYPED: fits? ( paragraph: paragraph -- ? )
! Make this not count spaces at end ! Make this not count spaces at end
{ [ lines>> car 1list? ] [ top-fits? ] } 1|| ; inline { [ lines>> car 1list? ] [ top-fits? ] } 1|| ; inline
TYPED: paragraph-cost ( paragraph: paragraph -- cost ) TYPED: paragraph-cost ( paragraph: paragraph -- cost )
dup lines>> 1list? [ drop 0 ] [ [ drop 0 ] [
[ [ head-width>> ] [ line-ideal>> ] bi - sq ] [ head-width>> ] [ line-ideal>> - sq ] [ tail-cost>> ] tri +
[ tail-cost>> ] bi + ] if-one-line ; inline
] if ; inline
: min-cost ( paragraphs -- paragraph ) : min-cost ( paragraphs -- paragraph )
[ paragraph-cost ] infimum-by ; inline [ paragraph-cost ] infimum-by ; inline
@ -42,15 +44,14 @@ TYPED: new-line ( paragraph: paragraph element: element -- paragraph )
} 2cleave <paragraph> ; inline } 2cleave <paragraph> ; inline
TYPED: add-element ( paragraph: paragraph element: element -- ) TYPED: add-element ( paragraph: paragraph element: element -- )
[ element-length [ + ] curry change-head-width ] [ '[ _ element-length + ] change-head-width ]
[ [ [ unswons ] dip swons swons ] curry change-lines ] [ '[ unswons _ swons swons ] change-lines ] bi drop ; inline
bi drop ; inline
TYPED: wrap-step ( paragraphs: array element: element -- paragraphs ) TYPED: wrap-step ( paragraphs: array element: element -- paragraphs )
[ [ min-cost ] dip new-line ] [ [ min-cost ] dip new-line ]
[ dupd '[ _ add-element ] each ] [ dupd '[ _ add-element ] each ]
2bi swap prefix { array } declare 2bi swap prefix { array } declare
[ fits? ] filter ; [ fits? ] filter ; inline
: 1paragraph ( line-max line-ideal element -- paragraph ) : 1paragraph ( line-max line-ideal element -- paragraph )
[ 1list 1list ] [ black>> ] bi 0 <paragraph> ; [ 1list 1list ] [ black>> ] bi 0 <paragraph> ;
@ -58,14 +59,14 @@ TYPED: wrap-step ( paragraphs: array element: element -- paragraphs )
: post-process ( paragraph -- array ) : post-process ( paragraph -- array )
lines>> [ [ contents>> ] lmap>array ] lmap>array ; lines>> [ [ contents>> ] lmap>array ] lmap>array ;
: initialize ( line-max line-ideal elements -- elements paragraph ) : initial-step ( line-max line-ideal elements -- elements paragraph )
reverse unclip [ -rot ] dip 1paragraph 1array ; reverse unclip [ -rot ] dip 1paragraph 1array ;
PRIVATE> PRIVATE>
: wrap ( elements line-max line-ideal -- array ) : wrap ( elements line-max line-ideal -- array )
rot [ 2drop { } ] [ rot [ 2drop { } ] [
initialize initial-step
[ wrap-step ] reduce [ wrap-step ] reduce
min-cost min-cost
post-process post-process