1.1 --- a/src/rlm/function_utils.clj	Thu Jul 19 10:56:39 2012 -0500
     1.2 +++ b/src/rlm/function_utils.clj	Mon Jul 08 12:51:12 2013 -0400
     1.3 @@ -83,7 +83,7 @@
     1.4  	name (with-meta name
     1.5                 (assoc (meta name) :arglists `(quote ~arglists)
     1.6                        :doc doc-string))]   
     1.7 -    `(def ~name (mix ~@functions))))
     1.8 +    `(def ~name (race ~@functions))))
     1.9  
    1.10  (defn runonce
    1.11    "Decorator.  returns a function which will run only once. Inspired

     2.1 --- a/src/rlm/rlm_commands.clj	Thu Jul 19 10:56:39 2012 -0500
     2.2 +++ b/src/rlm/rlm_commands.clj	Mon Jul 08 12:51:12 2013 -0400
     2.3 @@ -68,11 +68,11 @@
     2.4  ;; (defn keymap-normal []
     2.5  ;;   (rlm.shell-write/sw "xmodmap" "/home/r/.xmodmap.normal"))
     2.6  
     2.7 -(defn javadoc [target]
     2.8 -  (binding
     2.9 -      [clojure.java.browse/*open-url-script*
    2.10 -       "/home/r/proj/repl/get-webpage.pl"]
    2.11 -    (clojure.java.javadoc/javadoc target)))
    2.12 +;; (defn javadoc [target]
    2.13 +;;   (binding
    2.14 +;;       [clojure.java.browse/*open-url-script*
    2.15 +;;        "/home/r/proj/repl/get-webpage.pl"]
    2.16 +;;     (clojure.java.javadoc/javadoc target)))
    2.17       
    2.18  (defn help
    2.19    "load a bunch of really useful help functions"
    2.20 @@ -81,7 +81,7 @@
    2.21     '[rlm
    2.22       [function-utils :only [race race-pred defmix]]
    2.23       [rlm-commands :only
    2.24 -      [undef ns-reset ns-nuke reload re javadoc]]
    2.25 +      [undef ns-reset ns-nuke reload re]]
    2.26       [ns-rlm :only [ls]]
    2.27       ;;[play-all :only [play-all-music]]
    2.28       [shell-inspect :only [command-line?]]
    2.29 @@ -96,20 +96,26 @@
    2.30     
    2.31     ;; TODO find replacement for show
    2.32      '[clojure
    2.33 -      [repl :only [source]]])
    2.34 -  (clojure.java.javadoc/add-local-javadoc
    2.35 -   "/home/r/proj/jMonkeyEngine3/dist/javadoc")
    2.36 -  (clojure.java.javadoc/add-local-javadoc
    2.37 -   "/home/r/java/jdk6u30-docs/api")
    2.38 -  (clojure.java.javadoc/add-local-javadoc
    2.39 -   "/home/r/java/jdk6u30-docs/jdk/api")
    2.40 -  (clojure.java.javadoc/add-local-javadoc
    2.41 -   "/home/r/java/jdk6u30-docs/jre/api")
    2.42 -  (clojure.java.javadoc/add-local-javadoc
    2.43 -   "/home/r/proj/jmeCapture/docs")
    2.44 -  (clojure.java.javadoc/add-local-javadoc
    2.45 -   "/home/r/java/tritonus.sourceforge.net/apidoc")
    2.46 -  nil)
    2.47 +      [repl :only [source]]]
    2.48 +    'clojure.java.javadoc)
    2.49  
    2.50 - 
    2.51 +  (dorun
    2.52 +   (map
    2.53 +    clojure.java.javadoc/add-local-javadoc
    2.54 +         
    2.55 +    ["/home/r/proj/jMonkeyEngine3/dist/javadoc"
    2.56  
    2.57 +     ;; java standard library
    2.58 +     "/home/r/java/jdk-docs/javafx/api"
    2.59 +     "/home/r/java/jdk-docs/jdk/api"
    2.60 +     "/home/r/java/jdk-docs/jdk/jre/api"
    2.61 +     "/home/r/java/jdk-docs/jdk/jdk/api"
    2.62 +
    2.63 +     ;; cortex stuff
    2.64 +     "/home/r/proj/jmeCapture/docs"
    2.65 +     "/home/r/java/tritonus.sourceforge.net/apidoc"
    2.66 +
    2.67 +     ;; genesis stuff
    2.68 +     "/home/r/git/genesis/docs"
    2.69 +     "/home/r/git/propagators/docs"]
    2.70 +    )))

     3.1 --- a/src/rlm/visualize.clj	Thu Jul 19 10:56:39 2012 -0500
     3.2 +++ b/src/rlm/visualize.clj	Mon Jul 08 12:51:12 2013 -0400
     3.3 @@ -11,7 +11,7 @@
     3.4  
     3.5  (defmulti visual (fn [& args] (class (last args))))
     3.6  
     3.7 -(import '[org.scilab.forge.jlatexmath TeXConstants TeXFormula TeXIcon])
     3.8 +;;(import '[org.scilab.forge.jlatexmath TeXConstants TeXFormula TeXIcon])
     3.9  (import java.awt.Insets)
    3.10  (import javax.swing.JLabel)
    3.11  (import java.awt.Color)
    3.12 @@ -32,20 +32,20 @@
    3.13    (visual (ImagePlus. "visual" image)))
    3.14      
    3.15  
    3.16 -(defmethod visual TeXFormula
    3.17 -  [formula]
    3.18 -  (let [icon
    3.19 -	(doto (.createTeXIcon formula TeXConstants/STYLE_DISPLAY 30)
    3.20 -	  (.setInsets (Insets. 5 5 5 5)))
    3.21 -	image (BufferedImage. (.getIconWidth icon) (.getIconHeight icon)
    3.22 -			      BufferedImage/TYPE_INT_ARGB)
    3.23 -	g (.createGraphics image)
    3.24 -	jl (JLabel.)]
    3.25 -    (.setForeground jl (Color. 0 0 0))
    3.26 -    (.setColor g Color/white)
    3.27 -    (.fillRect g 0 0 (.getIconWidth icon) (.getIconHeight icon))
    3.28 -    (.paintIcon icon jl g 0 0)
    3.29 -    (visual image)))
    3.30 +;; (defmethod visual TeXFormula
    3.31 +;;   [formula]
    3.32 +;;   (let [icon
    3.33 +;; 	(doto (.createTeXIcon formula TeXConstants/STYLE_DISPLAY 30)
    3.34 +;; 	  (.setInsets (Insets. 5 5 5 5)))
    3.35 +;; 	image (BufferedImage. (.getIconWidth icon) (.getIconHeight icon)
    3.36 +;; 			      BufferedImage/TYPE_INT_ARGB)
    3.37 +;; 	g (.createGraphics image)
    3.38 +;; 	jl (JLabel.)]
    3.39 +;;     (.setForeground jl (Color. 0 0 0))
    3.40 +;;     (.setColor g Color/white)
    3.41 +;;     (.fillRect g 0 0 (.getIconWidth icon) (.getIconHeight icon))
    3.42 +;;     (.paintIcon icon jl g 0 0)
    3.43 +;;     (visual image)))
    3.44  	
    3.45      
    3.46