                 with-printed-result,
                 now,
                 defvar-,
-                defmacro-)]
+                defmacro-,
+                defnk)]
 	[conexp.math.util
          :only (with-doubles)]
 	[conexp.layout


;;; Drawing Routine for the REPL

(defn draw-lattice
  "Draws given lattice with given layout-function on a canvas. Uses
  *standard-layout-function* if no layout-function is given. Returns
  the panel of the lattice editor."
  ([lattice]
     (draw-lattice lattice *standard-layout-function*))
  ([lattice layout-function]
     (let [^JFrame frame (JFrame. "conexp-clj Lattice"),
           ^JPanel lattice-editor (make-lattice-editor frame (layout-function lattice))]
       (doto frame
	 (.add lattice-editor)
	 (.setSize (Dimension. 600 600))
	 (.setVisible true))
       lattice-editor)))

;;;


	(.add canvas BorderLayout/CENTER)
	(.add hscrollbar BorderLayout/SOUTH)
	(.add vscrollbar BorderLayout/EAST))
      (add-scrollbars scn hscrollbar vscrollbar)

      ;; main panel
      (doto main-panel
