diff --git a/basis/models/range/range-tests.factor b/basis/models/range/range-tests.factor index c8a2d1acc6..50c0365728 100755 --- a/basis/models/range/range-tests.factor +++ b/basis/models/range/range-tests.factor @@ -31,6 +31,6 @@ tools.test models.range ; ! should be able to move by a page of 10 [ 10 ] [ - setup-range 10 over set-range-page-value - 1 over move-by-page range-value + setup-range 10 over set-range-page-value + 1 over move-by-page range-value ] unit-test diff --git a/basis/ui/gadgets/books/books.factor b/basis/ui/gadgets/books/books.factor index 1c6e4c8331..da0ff35728 100755 --- a/basis/ui/gadgets/books/books.factor +++ b/basis/ui/gadgets/books/books.factor @@ -25,6 +25,6 @@ M: book model-changed ( model book -- ) M: book pref-dim* ( book -- dim ) children>> pref-dims max-dim ; M: book layout* ( book -- ) - [ children>> ] [ dim>> ] bi [ >>dim drop ] curry each ; + [ children>> ] [ dim>> ] bi [ >>dim drop ] curry each ; M: book focusable-child* ( book -- child/t ) current-page ; diff --git a/basis/ui/gadgets/panes/panes.factor b/basis/ui/gadgets/panes/panes.factor index 673f2f0c11..f100a72f06 100755 --- a/basis/ui/gadgets/panes/panes.factor +++ b/basis/ui/gadgets/panes/panes.factor @@ -115,7 +115,7 @@ C: pane-stream GENERIC: write-gadget ( gadget stream -- ) M: pane-stream write-gadget ( gadget pane-stream -- ) - pane>> current>> swap add-gadget drop ; + pane>> current>> swap add-gadget drop ; M: style-stream write-gadget stream>> write-gadget ; @@ -143,7 +143,7 @@ M: style-stream write-gadget TUPLE: pane-control < pane quot ; M: pane-control model-changed ( model pane-control -- ) - [ value>> ] [ dup quot>> ] bi* with-pane ; + [ value>> ] [ dup quot>> ] bi* with-pane ; : ( model quot -- pane ) pane-control new-pane @@ -338,7 +338,7 @@ M: paragraph stream-format GENERIC: sloppy-pick-up* ( loc gadget -- n ) M: pack sloppy-pick-up* ( loc gadget -- n ) - [ orientation>> ] [ children>> ] bi (fast-children-on) ; + [ orientation>> ] [ children>> ] bi (fast-children-on) ; M: gadget sloppy-pick-up* children>> [ inside? ] with find-last drop ; diff --git a/basis/ui/gadgets/tracks/tracks.factor b/basis/ui/gadgets/tracks/tracks.factor index 2d6e6c6c9e..5a9683ceff 100644 --- a/basis/ui/gadgets/tracks/tracks.factor +++ b/basis/ui/gadgets/tracks/tracks.factor @@ -44,11 +44,11 @@ M: track layout* ( track -- ) dup track-layout pack-layout ; [ >fixnum ] map ; M: track pref-dim* ( gadget -- dim ) - [ track-pref-dims-1 ] - [ [ alloted-dim ] [ track-pref-dims-2 ] bi v+ ] - [ orientation>> ] - tri - set-axis ; + [ track-pref-dims-1 ] + [ [ alloted-dim ] [ track-pref-dims-2 ] bi v+ ] + [ orientation>> ] + tri + set-axis ; : track-add ( track gadget constraint -- track ) pick sizes>> push add-gadget ; diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor index d975c34e5e..6fc6fa4f10 100755 --- a/basis/ui/tools/listener/listener.factor +++ b/basis/ui/tools/listener/listener.factor @@ -30,8 +30,8 @@ TUPLE: listener-gadget < track input output stack ; f track-add ; : welcome. ( -- ) - "If this is your first time with Factor, please read the " print - "handbook" ($link) "." print nl ; + "If this is your first time with Factor, please read the " print + "handbook" ($link) "." print nl ; M: listener-gadget focusable-child* input>> ; diff --git a/basis/ui/tools/search/search-tests.factor b/basis/ui/tools/search/search-tests.factor index dcfb7346b4..d477274520 100755 --- a/basis/ui/tools/search/search-tests.factor +++ b/basis/ui/tools/search/search-tests.factor @@ -19,7 +19,7 @@ IN: ui.tools.search.tests ] with-grafted-gadget ; : test-live-search ( gadget quot -- ? ) - >r update-live-search dup assert-non-empty r> all? ; + >r update-live-search dup assert-non-empty r> all? ; [ t ] [ "swp" all-words f