Merge remote-tracking branch 'factorcode/master'

basis/images/tessellation/tessellation-tests.factor

@@ -1,6 +1,6 @@
 USING: images accessors kernel tools.test literals math.ranges
 byte-arrays ;
-IN: images.tesselation
+IN: images.tessellation
 
 ! Check an invariant we depend on
 [ t ] [

basis/images/tessellation/tessellation.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: sequences kernel math grouping fry columns locals accessors
 images math.vectors arrays ;
-IN: images.tesselation
+IN: images.tessellation
 
 : group-rows ( bitmap bitmap-dim -- rows )
     first <sliced-groups> ; inline

basis/opengl/textures/textures.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.data assocs cache colors.constants
 destructors kernel opengl opengl.gl opengl.capabilities
-combinators images images.tesselation grouping sequences math
+combinators images images.tessellation grouping sequences math
 math.vectors generalizations fry arrays namespaces system locals
 literals specialized-arrays ;
 FROM: alien.c-types => int float ;

extra/graphviz/ffi/ffi.factor

@@ -6,6 +6,7 @@ fry io kernel literals math prettyprint sequences splitting
 system memoize graphviz ;
 IN: graphviz.ffi
 
+<<
 "libgraph" {
     { [ os macosx? ] [ "libgraph.dylib" ] }
     { [ os unix?   ] [ "libgraph.so"    ] }
@@ -18,6 +19,7 @@ IN: graphviz.ffi
     { [ os unix?   ] [ "libgvc.so"    ] }
     { [ os winnt?  ] [ "gvc.dll"      ] }
 } cond cdecl add-library
+>>
 
 LIBRARY: libgraph
 

extra/graphviz/render/render.factor

@@ -110,7 +110,7 @@ PRIVATE>
 <PRIVATE
 
 : define-graphviz-by-engine ( -K -- )
-    [ create-in dup make-inline ]
+    [ "graphviz.render" create dup make-inline ]
     [ [ graphviz ] curry ] bi
     (( graph -O -T -- ))
     define-declared ;
@@ -118,7 +118,7 @@ PRIVATE>
 : define-graphviz-by-format ( -T -- )
     [
         dup supported-engines member? [ "-file" append ] when
-        create-in dup make-inline
+        "graphviz.render" create dup make-inline
     ]
     [ [ graphviz* ] curry ] bi
     (( graph -O -- ))