From 4589aab8a4de759570da429d7ad16ebc3a2468eb Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 16 Mar 2009 03:00:37 -0500
Subject: [PATCH 01/14] Move ui.gadgets.alerts, ui.gadgets.book-extras and
 ui.utils to extra

---
 {basis => extra}/ui/gadgets/alerts/alerts.factor           | 0
 {basis => extra}/ui/gadgets/book-extras/book-extras.factor | 0
 {basis => extra}/ui/utils/utils.factor                     | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename {basis => extra}/ui/gadgets/alerts/alerts.factor (100%)
 rename {basis => extra}/ui/gadgets/book-extras/book-extras.factor (100%)
 rename {basis => extra}/ui/utils/utils.factor (100%)

diff --git a/basis/ui/gadgets/alerts/alerts.factor b/extra/ui/gadgets/alerts/alerts.factor
similarity index 100%
rename from basis/ui/gadgets/alerts/alerts.factor
rename to extra/ui/gadgets/alerts/alerts.factor
diff --git a/basis/ui/gadgets/book-extras/book-extras.factor b/extra/ui/gadgets/book-extras/book-extras.factor
similarity index 100%
rename from basis/ui/gadgets/book-extras/book-extras.factor
rename to extra/ui/gadgets/book-extras/book-extras.factor
diff --git a/basis/ui/utils/utils.factor b/extra/ui/utils/utils.factor
similarity index 100%
rename from basis/ui/utils/utils.factor
rename to extra/ui/utils/utils.factor

From 56ffaf5cb1a82f2d192f7d24ecca26771d2c4e40 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 16 Mar 2009 03:01:32 -0500
Subject: [PATCH 02/14] Updating ui.gadgets.alerts, ui.gadgets.book-extras,
 ui.utils and drills for new_ui changes

---
 extra/drills/drills.factor                      | 13 +++++++------
 extra/ui/gadgets/alerts/alerts.factor           |  2 +-
 extra/ui/gadgets/book-extras/book-extras.factor |  2 +-
 extra/ui/utils/utils.factor                     |  6 +++---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/extra/drills/drills.factor b/extra/drills/drills.factor
index ee4343b1b8..98da12959b 100644
--- a/extra/drills/drills.factor
+++ b/extra/drills/drills.factor
@@ -1,17 +1,18 @@
 USING: accessors arrays cocoa.dialogs combinators continuations
 fry grouping io.encodings.utf8 io.files io.styles kernel math
-math.parser models models.filter models.history namespaces random
+math.parser models models.arrow models.history namespaces random
 sequences splitting ui ui.gadgets.alerts ui.gadgets.book-extras
 ui.gadgets.books ui.gadgets.buttons ui.gadgets.frames
-ui.gadgets.grids ui.gadgets.labels ui.gadgets.tracks ui.gestures ;
+ui.gadgets.grids ui.gadgets.labels ui.gadgets.tracks ui.gestures
+ui.gadgets.corners ;
 
 IN: drills
 SYMBOLS: it startLength ;
 : big ( gadget -- gadget ) { "sans-serif" plain 30 } >>font ;
-: card ( model quot -- button ) <filter> <label-control> big [ next ] <book-btn> ;
+: card ( model quot -- button ) <arrow> <label-control> big [ next ] <book-btn> ;
 : op ( quot str -- gadget ) <label> big swap <book-bevel-btn> ;
 
-: show ( model -- gadget ) dup it set-global [ random ] <filter>
+: show ( model -- gadget ) dup it set-global [ random ] <arrow>
    { [ [ first ] card ]
    [ [ [ second ] [ drop [ "malformed input" throw ] "Malformed Input" alert ] recover ] card ]
    [ '[ |<< [ it get [
@@ -20,8 +21,8 @@ SYMBOLS: it startLength ;
    ] change-model ] with-return ] "Yes" op ]
    [ '[ |<< it get _ model-changed ] "No" op ] } cleave
 2array { 1 0 } <track> swap [ 0.5 track-add ] each
-3array <book*> <frame> { 450 175 } >>pref-dim swap @center grid-add
-it get [ length startLength get swap - number>string "/" startLength get number>string 3append ] <filter> <label-control> @bottom grid-add ;
+3array <book*> 3 3 <frame> { 450 175 } >>pref-dim swap @center grid-add
+it get [ length startLength get swap - number>string "/" startLength get number>string 3append ] <arrow> <label-control> @bottom grid-add ;
 
 : drill ( -- ) [ 
    open-panel [
diff --git a/extra/ui/gadgets/alerts/alerts.factor b/extra/ui/gadgets/alerts/alerts.factor
index 3a4120b3de..04c6b013df 100644
--- a/extra/ui/gadgets/alerts/alerts.factor
+++ b/extra/ui/gadgets/alerts/alerts.factor
@@ -1,4 +1,4 @@
 USING: accessors ui ui.gadgets ui.gadgets.labels ui.gadgets.buttons ui.gadgets.packs locals sequences io.styles ;
 IN: ui.gadgets.alerts
 :: alert ( quot string -- ) <pile> { 10 10 } >>gap 1 >>align string <label> { "sans-serif" plain 18 } >>font { 200 100 } >>pref-dim add-gadget 
-   "okay" [ close-window ] quot append <bevel-button> add-gadget "" open-window ;
\ No newline at end of file
+   "okay" [ close-window ] quot append <border-button> add-gadget "" open-window ;
\ No newline at end of file
diff --git a/extra/ui/gadgets/book-extras/book-extras.factor b/extra/ui/gadgets/book-extras/book-extras.factor
index 31ce8831be..b9d859962f 100644
--- a/extra/ui/gadgets/book-extras/book-extras.factor
+++ b/extra/ui/gadgets/book-extras/book-extras.factor
@@ -6,6 +6,6 @@ IN: ui.gadgets.book-extras
 : prev ( book -- ) model>> [ 1 - ] change-model ;
 : (book-t) ( quot -- quot ) '[ : owner ( gadget -- book ) parent>> dup book? [ owner ] unless ; owner @ ] ;
 : <book-btn> ( label quot -- button ) (book-t) <button> ;
-: <book-bevel-btn> ( label quot -- button ) (book-t) <bevel-button> ;
+: <book-bevel-btn> ( label quot -- button ) (book-t) <border-button> ;
 : >>> ( label -- button ) [ next ] <book-btn> ;
 : <<< ( label -- button ) [ prev ] <book-btn> ;
\ No newline at end of file
diff --git a/extra/ui/utils/utils.factor b/extra/ui/utils/utils.factor
index 468af45150..0880139865 100644
--- a/extra/ui/utils/utils.factor
+++ b/extra/ui/utils/utils.factor
@@ -1,6 +1,6 @@
-USING: accessors sequences namespaces ui.render opengl fry ;
+USING: accessors sequences namespaces ui.render opengl fry kernel ;
 IN: ui.utils
 SYMBOLS: width height ;
 : store-dim ( gadget -- ) dim>> [ first width set ] [ second height set ] bi ;
-: with-dim ( gadget quot -- ) '[ _ store-dim @ ] with-scope ;
-: with-w/h ( gadget quot -- ) '[ origin get _ with-translation ] with-dim ;
\ No newline at end of file
+: with-dim ( gadget quot -- ) '[ _ store-dim @ ] with-scope ; inline
+: with-w/h ( gadget quot -- ) '[ origin get _ with-translation ] with-dim ; inline
\ No newline at end of file

From 36d03dfa08f25d3e6b50b90e446ee5498848d586 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 16 Mar 2009 03:01:47 -0500
Subject: [PATCH 03/14] Use call( so that with-ui infers

---
 basis/ui/backend/cocoa/cocoa.factor | 4 ++--
 basis/ui/ui.factor                  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/basis/ui/backend/cocoa/cocoa.factor b/basis/ui/backend/cocoa/cocoa.factor
index 9888fc4e77..5cb02f5ad6 100755
--- a/basis/ui/backend/cocoa/cocoa.factor
+++ b/basis/ui/backend/cocoa/cocoa.factor
@@ -8,7 +8,7 @@ ui.backend ui.clipboards ui.gadgets ui.gadgets.worlds
 ui.backend.cocoa.views core-foundation core-foundation.run-loop
 core-graphics.types threads math.rectangles fry libc
 generalizations alien.c-types cocoa.views
-combinators io.thread locals ;
+combinators io.thread locals call ;
 IN: ui.backend.cocoa
 
 TUPLE: handle ;
@@ -152,7 +152,7 @@ M: cocoa-ui-backend (with-ui)
     "UI" assert.app [
         [
             init-clipboard
-            cocoa-init-hook get call
+            cocoa-init-hook get call( -- )
             start-ui
             f io-thread-running? set-global
             init-thread-timer
diff --git a/basis/ui/ui.factor b/basis/ui/ui.factor
index 42885aecb7..fe318101ee 100644
--- a/basis/ui/ui.factor
+++ b/basis/ui/ui.factor
@@ -153,7 +153,7 @@ PRIVATE>
     "UI update" spawn drop ;
 
 : start-ui ( quot -- )
-    call notify-ui-thread start-ui-thread ;
+    call( -- ) notify-ui-thread start-ui-thread ;
 
 : restore-windows ( -- )
     [
@@ -193,6 +193,6 @@ M: object close-window
 ] "ui" add-init-hook
 
 : with-ui ( quot -- )
-    ui-running? [ call ] [ '[ init-ui @ ] (with-ui) ] if ;
+    ui-running? [ call( -- ) ] [ '[ init-ui @ ] (with-ui) ] if ;
 
 HOOK: beep ui-backend ( -- )
\ No newline at end of file

From 5f2aac9bda08020f231905465d0b897c4981cd8c Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 16 Mar 2009 03:01:56 -0500
Subject: [PATCH 04/14] Fix slides for with-ui change

---
 extra/slides/slides.factor | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extra/slides/slides.factor b/extra/slides/slides.factor
index 752d0b3ffa..c7a27f87a4 100755
--- a/extra/slides/slides.factor
+++ b/extra/slides/slides.factor
@@ -1,9 +1,9 @@
-! Copyright (C) 2007, 2008 Slava Pestov.
+! Copyright (C) 2007, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: arrays hashtables help.markup help.stylesheet io
 io.styles kernel math models namespaces sequences ui ui.gadgets
 ui.gadgets.books ui.gadgets.panes ui.gestures ui.pens.gradient
-parser accessors colors ;
+parser accessors colors fry ;
 IN: slides
 
 CONSTANT: stylesheet
@@ -104,4 +104,4 @@ TUPLE: slides < book ;
 } set-gestures
 
 : slides-window ( slides -- )
-    [ <slides> "Slides" open-window ] with-ui ;
+    '[ _ <slides> "Slides" open-window ] with-ui ;

From 6bf8097f777672223fd1a5b7aa9f9fa681b8422c Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 16 Mar 2009 03:02:10 -0500
Subject: [PATCH 05/14] editors.notepad needed an unportable tag

---
 basis/editors/notepad/tags.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 basis/editors/notepad/tags.txt

diff --git a/basis/editors/notepad/tags.txt b/basis/editors/notepad/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/basis/editors/notepad/tags.txt
@@ -0,0 +1 @@
+unportable

From 8936408df68c194f43a977c301fcdae40a2d895c Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 16 Mar 2009 03:17:57 -0500
Subject: [PATCH 06/14] Add unportable tag to drills

---
 extra/drills/tags.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 extra/drills/tags.txt

diff --git a/extra/drills/tags.txt b/extra/drills/tags.txt
new file mode 100644
index 0000000000..6bf68304bb
--- /dev/null
+++ b/extra/drills/tags.txt
@@ -0,0 +1 @@
+unportable

From f1197fe327aee06e0749f45ea125f1df5548e99f Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 16 Mar 2009 03:29:04 -0500
Subject: [PATCH 07/14] peg.ebnf gives better stack effects

---
 basis/peg/ebnf/ebnf.factor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/basis/peg/ebnf/ebnf.factor b/basis/peg/ebnf/ebnf.factor
index 91af91b3a1..db29ce1ee7 100644
--- a/basis/peg/ebnf/ebnf.factor
+++ b/basis/peg/ebnf/ebnf.factor
@@ -530,7 +530,7 @@ M: ebnf-non-terminal (transform) ( ast -- parser )
 
 : EBNF: 
   reset-tokenizer CREATE-WORD dup ";EBNF" parse-multiline-string  
-  ebnf>quot swapd 1 1 <effect> define-declared "ebnf-parser" set-word-prop 
+  ebnf>quot swapd (( input -- ast )) define-declared "ebnf-parser" set-word-prop 
   reset-tokenizer ; parsing
 
 

From cac26d7b44208d1ed6f4f8a48878556919a16f26 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 16 Mar 2009 03:29:16 -0500
Subject: [PATCH 08/14] peg-lexer: fix help lint

---
 extra/peg-lexer/peg-lexer-docs.factor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extra/peg-lexer/peg-lexer-docs.factor b/extra/peg-lexer/peg-lexer-docs.factor
index 22e620235d..18a458e8ff 100644
--- a/extra/peg-lexer/peg-lexer-docs.factor
+++ b/extra/peg-lexer/peg-lexer-docs.factor
@@ -1,14 +1,14 @@
 USING: peg.ebnf help.syntax help.markup strings ;
 IN: peg-lexer
-ABOUT: "peg-lexer"
 
 HELP: ON-BNF:
 { $syntax "ON-BNF: word ... ;ON-BNF" }
 { $description "Creates a parsing word using a parser for lexer control, adding the resulting ast to the stack.  Parser syntax is as in " { $link POSTPONE: EBNF: } } ;
 
 HELP: create-bnf
-{ $values { "word" string } { "parser" parser } }
+{ $values { "name" string } { "parser" parser } }
 { $description "Runtime equivalent of " { $link POSTPONE: ON-BNF: } " also useful with manually constructed parsers." } ;
 
 HELP: factor
+{ $values { "input" string } { "ast" "a sequence of tokens" } }
 { $description "Tokenizer that acts like standard factor lexer, separating tokens by whitespace." } ;
\ No newline at end of file

From e697fe8a90fce07b5f66ef8831fc33dae157b275 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 16 Mar 2009 03:29:29 -0500
Subject: [PATCH 09/14] Remove Farkup caching from Wiki now that Farkup parser
 is fast

---
 extra/webapps/wiki/view.xml    | 2 +-
 extra/webapps/wiki/wiki.factor | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/extra/webapps/wiki/view.xml b/extra/webapps/wiki/view.xml
index e3774bbe0b..38d9d39d55 100644
--- a/extra/webapps/wiki/view.xml
+++ b/extra/webapps/wiki/view.xml
@@ -5,7 +5,7 @@
 	<t:title><t:label t:name="title" /></t:title>
 
 	<div class="description">
-		<t:farkup t:name="parsed" t:parsed="true" />
+		<t:farkup t:name="content" />
 	</div>
 
 	<p>
diff --git a/extra/webapps/wiki/wiki.factor b/extra/webapps/wiki/wiki.factor
index 07fbbe0596..2341b020a8 100644
--- a/extra/webapps/wiki/wiki.factor
+++ b/extra/webapps/wiki/wiki.factor
@@ -47,7 +47,7 @@ article "ARTICLES" {
 
 : <article> ( title -- article ) article new swap >>title ;
 
-TUPLE: revision id title author date content parsed description ;
+TUPLE: revision id title author date content description ;
 
 revision "REVISIONS" {
     { "id" "ID" INTEGER +db-assigned-id+ }
@@ -55,7 +55,6 @@ revision "REVISIONS" {
     { "author" "AUTHOR" { VARCHAR 256 } +not-null+ } ! uid
     { "date" "DATE" TIMESTAMP +not-null+ }
     { "content" "CONTENT" TEXT +not-null+ }
-    { "parsed" "PARSED" FACTOR-BLOB +not-null+ } ! Farkup AST
     { "description" "DESCRIPTION" TEXT }
 } define-persistent
 
@@ -72,9 +71,6 @@ M: revision feed-entry-url id>> revision-url ;
 : <revision> ( id -- revision )
     revision new swap >>id ;
 
-: compute-html ( revision -- )
-    dup content>> parse-farkup >>parsed drop ;
-
 : validate-title ( -- )
     { { "title" [ v-one-line ] } } validate-params ;
 
@@ -141,13 +137,12 @@ M: revision feed-entry-url id>> revision-url ;
     [ title>> ] [ id>> ] bi article boa insert-tuple ;
 
 : add-revision ( revision -- )
-    [ compute-html ]
     [ insert-tuple ]
     [
         dup title>> <article> select-tuple
         [ amend-article ] [ add-article ] if*
     ]
-    tri ;
+    bi ;
 
 : <edit-article-action> ( -- action )
     <page-action>

From 27a68b8aa43b9382b0077faefdee7cd382b61c5b Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 16 Mar 2009 03:39:42 -0500
Subject: [PATCH 10/14] Update meta-data

---
 basis/farkup/authors.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/basis/farkup/authors.txt b/basis/farkup/authors.txt
index 5674120196..a4a77d97e9 100644
--- a/basis/farkup/authors.txt
+++ b/basis/farkup/authors.txt
@@ -1,2 +1,2 @@
 Doug Coleman
-Slava Pestov
+Daniel Ehrenberg

From 58d997de5c9053ff6d987d3ac2f4f081e747dc74 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 16 Mar 2009 05:00:27 -0500
Subject: [PATCH 11/14] Refactor regexp.compiler to not all
 with-compilation-unit so much; benchmark.regex-dna loads about twice as fast
 now

---
 basis/regexp/compiler/compiler.factor | 17 ++++++-----------
 basis/regexp/regexp.factor            | 17 +++++++----------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/basis/regexp/compiler/compiler.factor b/basis/regexp/compiler/compiler.factor
index b55cab6294..a0646002f9 100644
--- a/basis/regexp/compiler/compiler.factor
+++ b/basis/regexp/compiler/compiler.factor
@@ -104,13 +104,11 @@ C: <box> box
     transitions>quot ;
 
 : states>code ( words dfa -- )
-    [
-        '[
-            dup _ word>quot
-            (( last-match index string -- ? ))
-            define-declared
-        ] each
-    ] with-compilation-unit ;
+    '[
+        dup _ word>quot
+        (( last-match index string -- ? ))
+        define-declared
+    ] each ;
 
 : states>words ( dfa -- words dfa )
     dup transitions>> keys [ gensym ] H{ } map>assoc
@@ -123,12 +121,9 @@ C: <box> box
 
 PRIVATE>
 
-: simple-define-temp ( quot effect -- word )
-    [ define-temp ] with-compilation-unit ;
-
 : dfa>word ( dfa -- quot )
     dfa>main-word execution-quot '[ drop [ f ] 2dip @ ]
-    (( start-index string regexp -- i/f )) simple-define-temp ;
+    (( start-index string regexp -- i/f )) define-temp ;
 
 : dfa>shortest-word ( dfa -- word )
     t shortest? [ dfa>word ] with-variable ;
diff --git a/basis/regexp/regexp.factor b/basis/regexp/regexp.factor
index 29f7e3e84e..63a2f25885 100644
--- a/basis/regexp/regexp.factor
+++ b/basis/regexp/regexp.factor
@@ -4,7 +4,7 @@ USING: accessors combinators kernel kernel.private math sequences
 sequences.private strings sets assocs prettyprint.backend
 prettyprint.custom make lexer namespaces parser arrays fry locals
 regexp.parser splitting sorting regexp.ast regexp.negation
-regexp.compiler words call call.private math.ranges ;
+regexp.compiler compiler.units words call call.private math.ranges ;
 IN: regexp
 
 TUPLE: regexp
@@ -35,7 +35,7 @@ M: lookbehind question>quot ! Returns ( index string -- ? )
 : match-index-from ( i string regexp -- index/f )
     ! This word is unsafe. It assumes that i is a fixnum
     ! and that string is a string.
-    dup dfa>> execute-unsafe( index string regexp -- i/f ) ;
+    dup dfa>> execute-unsafe( index string regexp -- i/f ) ; inline
 
 GENERIC: end/start ( string regexp -- end start )
 M: regexp end/start drop length 0 ;
@@ -129,31 +129,28 @@ PRIVATE>
 GENERIC: compile-regexp ( regex -- regexp )
 
 : regexp-initial-word ( i string regexp -- i/f )
-    compile-regexp match-index-from ;
+    [ compile-regexp ] with-compilation-unit match-index-from ;
 
-: do-compile-regexp ( regexp -- regexp )
+M: regexp compile-regexp ( regexp -- regexp )
     dup '[
         dup \ regexp-initial-word =
         [ drop _ get-ast ast>dfa dfa>word ] when
     ] change-dfa ;
 
-M: regexp compile-regexp ( regexp -- regexp )
-    do-compile-regexp ;
-
 M: reverse-regexp compile-regexp ( regexp -- regexp )
-    t backwards? [ do-compile-regexp ] with-variable ;
+    t backwards? [ call-next-method ] with-variable ;
 
 DEFER: compile-next-match
 
 : next-initial-word ( i string regexp -- i start end string )
-    compile-next-match do-next-match ;
+    [ compile-next-match ] with-compilation-unit do-next-match ;
 
 : compile-next-match ( regexp -- regexp )
     dup '[
         dup \ next-initial-word = [
             drop _ [ compile-regexp dfa>> def>> ] [ reverse-regexp? ] bi
             '[ { array-capacity string regexp } declare _ _ next-match ]
-            (( i string regexp -- i start end string )) simple-define-temp
+            (( i string regexp -- i start end string )) define-temp
         ] when
     ] change-next-match ;
 

From baf2cc6c5a55188c86fbb8012a9dedd9b1010eee Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Mon, 16 Mar 2009 07:08:35 -0500
Subject: [PATCH 12/14] fix bitmap loading of odd-width files

---
 basis/images/bitmap/bitmap.factor | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/basis/images/bitmap/bitmap.factor b/basis/images/bitmap/bitmap.factor
index ffe3adff48..8209159a8e 100755
--- a/basis/images/bitmap/bitmap.factor
+++ b/basis/images/bitmap/bitmap.factor
@@ -83,14 +83,15 @@ ERROR: bmp-not-supported n ;
 
 :: fixup-color-index ( loading-bitmap -- loading-bitmap )
     loading-bitmap width>> :> width
+    width 3 * :> width*3
     loading-bitmap height>> abs :> height
     loading-bitmap color-index>> length :> color-index-length
-    height 3 * :> height*3
-    color-index-length width height*3 * - height*3 /i :> misaligned
-    misaligned 0 > [
+    color-index-length height /i :> stride
+    color-index-length width*3 height * - height /i :> padding
+    padding 0 > [
         loading-bitmap [
-            loading-bitmap width>> misaligned + 3 * <sliced-groups>
-            [ 3 misaligned * head* ] map concat
+            stride <sliced-groups>
+            [ width*3 head-slice ] map concat
         ] change-color-index
     ] [
         loading-bitmap

From bb33894d8af2a4216660b62d4446bb233171baa8 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Mon, 16 Mar 2009 07:11:46 -0500
Subject: [PATCH 13/14] check in more test images

---
 basis/images/test-images/40red24bit.bmp | Bin 0 -> 4854 bytes
 basis/images/test-images/41red24bit.bmp | Bin 0 -> 5014 bytes
 basis/images/test-images/42red24bit.bmp | Bin 0 -> 5174 bytes
 basis/images/test-images/43red24bit.bmp | Bin 0 -> 5334 bytes
 basis/images/test-images/elephants.tiff | Bin 0 -> 8466 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 basis/images/test-images/40red24bit.bmp
 create mode 100644 basis/images/test-images/41red24bit.bmp
 create mode 100644 basis/images/test-images/42red24bit.bmp
 create mode 100644 basis/images/test-images/43red24bit.bmp
 create mode 100644 basis/images/test-images/elephants.tiff

diff --git a/basis/images/test-images/40red24bit.bmp b/basis/images/test-images/40red24bit.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..5e694559c681682f57c889475a0499fddefb6d86
GIT binary patch
literal 4854
zcmeHF+YNvq5W^Mxas(%E0RP?Dsr=Oo7;@oNBbXR10Rl&9?+Wv>^~SbI=24B#3^u-=
z=XP^WI~yH%p99A1<^EjCqFZP#s{-KmQCU}LA>f`gq=f+LUU?m8BLpOUhPUbg)aCoe
ze}Mlg@B|tX;N2G9st0%>q0&8>j}JD~)tvRTkiplhb^SWGfV2?sC0!}@xq2OWa?ZU@
g9M|dTb&PBq(ORyAw){CZt((IzP6y}!9r%v}2UeN#FaQ7m

literal 0
HcmV?d00001

diff --git a/basis/images/test-images/41red24bit.bmp b/basis/images/test-images/41red24bit.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..6599dcc10772ac1cd46166e13a10e10f1698ea56
GIT binary patch
literal 5014
zcmeH_-3`Jp41~=Lyf6YRzyQ3nL#OJxB}${ju8b~D4F$<jf9%%2OTOgsoX?cUJw31K
zzLochF8TXZ{^z7Tmg5E;XT5~?_u>CJa~hrhXdm05@MbW2!rx{Nw-Xk;V}REUrC~vM
zO9H`M@@N@6O0b}5$tajh9xa1NVL{W9k-|J_Z7$ie&78ff{5px6s=)`nRX_eQyg7}I
zSU+pEv4>|*O%>#UgEyBm#n^jzS#Tb}8}{!hP`vlZnR>(9gv+Hkn7d#!i3D>KE|+3@
E0TpDtwg3PC

literal 0
HcmV?d00001

diff --git a/basis/images/test-images/42red24bit.bmp b/basis/images/test-images/42red24bit.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..e95a4f75f5335c9819d5bd04be732d56b2e3605e
GIT binary patch
literal 5174
zcmeHE!41MN3=BK)U<AYf9e_Xkk5f#Y7}s@^GlEn?K_#`F^WEuse@y4J{3bfD^uOiz
zDP5L%%J<yxIUo8<=}`H3=>J{*^hxoriX%%-P5KaJ2)tO}jXf7pz9@cvXX{#s@<s7V
zpVD9p!XZWZR_%9uWxF90DcZUP0jwB^X^Ds@bZ)PT%<dalF%Z+T{&u*lxV``u4TM_v
zS@WWuA@|k*NOt6HH)a4i0C|akFyjZ<0w7r*L~0Ab3INHBI8rPCD*$BZFA3mDRr4nr
z^9a0Nd{19=*od_C;y3zrO?}%-pF?p^Z3n46%X+43gfEKm`1MTJQEmk9@#~qc5xywK
s<JU8)bsME`;yrS2)+G86&{NB^IP|?#`priE{j&CyM*dzZ{bngW0fLF^$p8QV

literal 0
HcmV?d00001

diff --git a/basis/images/test-images/43red24bit.bmp b/basis/images/test-images/43red24bit.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..d88f2d4c3264019b992f5e63b2999ca85da28456
GIT binary patch
literal 5334
zcmeH{Q4#_n2!`zrJ#>U-dhY<ecgIfEbv8zfAyW~g*&f&_mt7D(e{pa3=P~8$3ga36
zmvTR(Q-1#_{`^peZTd=S<G<;7LLhJm5zJl15)TWpm@0-|0fgy!#rG}@P-O+fi(v)B
zkpVG8<-Y@h0W}F7+;uP?&zZe|<l_sgi($Paiwx$qbDl*8Otr5Ld^up-w!=jSA_)d+
z4ANxYh`o5LCw+i4-R{_vbl%CB++1G<DvB8NI5vLAFs{qJyECX1`y_AlBwr4<`NYaL
z13;eU_kq{tHr2(7)kt2gVPnu%8OP5sG^H4)Re41QRW@62lfjnCJS!Mby3iqX;D;#s
I;jjAP1wR0Al>h($

literal 0
HcmV?d00001

diff --git a/basis/images/test-images/elephants.tiff b/basis/images/test-images/elephants.tiff
new file mode 100644
index 0000000000000000000000000000000000000000..f462a0c0432f8c9e0c3138236bc698c4eb081979
GIT binary patch
literal 8466
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
ROxqshuBuGaP*>jo{uc>T4FUiF

literal 0
HcmV?d00001


From 8eea41b53727448dc00b7da673da310c9cbf0b3f Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Mon, 16 Mar 2009 07:11:56 -0500
Subject: [PATCH 14/14] normalizing alpha data for tiffs is done too often,
 check in test image for it

---
 basis/images/tiff/tiff.factor | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/basis/images/tiff/tiff.factor b/basis/images/tiff/tiff.factor
index 2ea1b08e20..80eaff8140 100755
--- a/basis/images/tiff/tiff.factor
+++ b/basis/images/tiff/tiff.factor
@@ -477,26 +477,24 @@ ERROR: unknown-component-order ifd ;
         [ unknown-component-order ]
     } case ;
 
+: normalize-alpha-data ( seq -- byte-array )
+    ! [ normalize-alpha-data ] change-bitmap
+    B{ } like dup
+    byte-array>float-array
+    4 <sliced-groups>
+    [
+        dup fourth dup 0 = [
+            2drop
+        ] [
+            [ 3 head-slice ] dip '[ _ / ] change-each
+        ] if
+    ] each ;
+
 : handle-alpha-data ( ifd -- ifd )
     dup extra-samples find-tag {
-        { extra-samples-associated-alpha-data [
-            [
-                B{ } like dup
-                byte-array>float-array
-                4 <sliced-groups>
-                [
-                    dup fourth dup 0 = [
-                        2drop
-                    ] [
-                        [ 3 head-slice ] dip '[ _ / ] change-each
-                    ] if
-                ] each
-            ] change-bitmap
-        ] }
-        { extra-samples-unspecified-alpha-data [
-        ] }
-        { extra-samples-unassociated-alpha-data [
-        ] }
+        { extra-samples-associated-alpha-data [ ] }
+        { extra-samples-unspecified-alpha-data [ ] }
+        { extra-samples-unassociated-alpha-data [ ] }
         [ bad-extra-samples ]
     } case ;