diff --git a/extra/hamurabi/hamurabi.factor b/extra/hamurabi/hamurabi.factor index d0d7291d99..812733d98c 100644 --- a/extra/hamurabi/hamurabi.factor +++ b/extra/hamurabi/hamurabi.factor @@ -58,7 +58,7 @@ total-births total-deaths ; } cleave 100 /i 1 + ; : #starved ( game -- n ) - [ population>> ] [ feed>> 20 /i ] bi - 0 max ; + [ population>> ] [ feed>> 20 /i ] bi [-] ; : leave-fink ( -- ) "DUE TO THIS EXTREME MISMANAGEMENT YOU HAVE NOT ONLY" print diff --git a/extra/pdf/canvas/canvas.factor b/extra/pdf/canvas/canvas.factor index 588c37db6d..c3d9d9a88c 100644 --- a/extra/pdf/canvas/canvas.factor +++ b/extra/pdf/canvas/canvas.factor @@ -106,10 +106,10 @@ foreground background page-color inset line-height metrics ; [ 0 >>x ] dip [ dup line-break ] times drop ; : avail-width ( canvas -- n ) - [ width ] [ x>> ] bi - 0 max ; + [ width ] [ x>> ] bi [-] ; : avail-height ( canvas -- n ) - [ height ] [ y>> ] bi - 0 max ; + [ height ] [ y>> ] bi [-] ; : avail-lines ( canvas -- n ) [ avail-height ] [ line-height>> ] bi /i ; ! FIXME: 1 + diff --git a/extra/pdf/layout/layout.factor b/extra/pdf/layout/layout.factor index d9ff982c53..d2177f63db 100644 --- a/extra/pdf/layout/layout.factor +++ b/extra/pdf/layout/layout.factor @@ -256,7 +256,7 @@ M: table-row pdf-render ] each widths >alist sort-keys values ! make last cell larger - dup sum 400 swap - 0 max [ + ] curry dupd change-last + dup sum 400 swap [-] [ + ] curry dupd change-last ! size down each column dup sum dup 400 > [ 400 swap / [ * ] curry map ] [ drop ] if ; diff --git a/extra/sequences/extras/extras.factor b/extra/sequences/extras/extras.factor index e98ba17475..859d8e9b41 100644 --- a/extra/sequences/extras/extras.factor +++ b/extra/sequences/extras/extras.factor @@ -177,7 +177,7 @@ IN: sequences.extras