# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1373302272 14400
# Node ID 1065e7d615a42e0ac5c0b4d575d3694f25cc5aea
# Parent  7240d7a5f959ed0a3fd42044472c8e2eb4ccf256
deactivate some cruft.

diff -r 7240d7a5f959 -r 1065e7d615a4 src/rlm/function_utils.clj
--- a/src/rlm/function_utils.clj	Thu Jul 19 10:56:39 2012 -0500
+++ b/src/rlm/function_utils.clj	Mon Jul 08 12:51:12 2013 -0400
@@ -83,7 +83,7 @@
 	name (with-meta name
                (assoc (meta name) :arglists `(quote ~arglists)
                       :doc doc-string))]   
-    `(def ~name (mix ~@functions))))
+    `(def ~name (race ~@functions))))
 
 (defn runonce
   "Decorator.  returns a function which will run only once. Inspired
diff -r 7240d7a5f959 -r 1065e7d615a4 src/rlm/rlm_commands.clj
--- a/src/rlm/rlm_commands.clj	Thu Jul 19 10:56:39 2012 -0500
+++ b/src/rlm/rlm_commands.clj	Mon Jul 08 12:51:12 2013 -0400
@@ -68,11 +68,11 @@
 ;; (defn keymap-normal []
 ;;   (rlm.shell-write/sw "xmodmap" "/home/r/.xmodmap.normal"))
 
-(defn javadoc [target]
-  (binding
-      [clojure.java.browse/*open-url-script*
-       "/home/r/proj/repl/get-webpage.pl"]
-    (clojure.java.javadoc/javadoc target)))
+;; (defn javadoc [target]
+;;   (binding
+;;       [clojure.java.browse/*open-url-script*
+;;        "/home/r/proj/repl/get-webpage.pl"]
+;;     (clojure.java.javadoc/javadoc target)))
      
 (defn help
   "load a bunch of really useful help functions"
@@ -81,7 +81,7 @@
    '[rlm
      [function-utils :only [race race-pred defmix]]
      [rlm-commands :only
-      [undef ns-reset ns-nuke reload re javadoc]]
+      [undef ns-reset ns-nuke reload re]]
      [ns-rlm :only [ls]]
      ;;[play-all :only [play-all-music]]
      [shell-inspect :only [command-line?]]
@@ -96,20 +96,26 @@
    
    ;; TODO find replacement for show
     '[clojure
-      [repl :only [source]]])
-  (clojure.java.javadoc/add-local-javadoc
-   "/home/r/proj/jMonkeyEngine3/dist/javadoc")
-  (clojure.java.javadoc/add-local-javadoc
-   "/home/r/java/jdk6u30-docs/api")
-  (clojure.java.javadoc/add-local-javadoc
-   "/home/r/java/jdk6u30-docs/jdk/api")
-  (clojure.java.javadoc/add-local-javadoc
-   "/home/r/java/jdk6u30-docs/jre/api")
-  (clojure.java.javadoc/add-local-javadoc
-   "/home/r/proj/jmeCapture/docs")
-  (clojure.java.javadoc/add-local-javadoc
-   "/home/r/java/tritonus.sourceforge.net/apidoc")
-  nil)
+      [repl :only [source]]]
+    'clojure.java.javadoc)
 
- 
+  (dorun
+   (map
+    clojure.java.javadoc/add-local-javadoc
+         
+    ["/home/r/proj/jMonkeyEngine3/dist/javadoc"
 
+     ;; java standard library
+     "/home/r/java/jdk-docs/javafx/api"
+     "/home/r/java/jdk-docs/jdk/api"
+     "/home/r/java/jdk-docs/jdk/jre/api"
+     "/home/r/java/jdk-docs/jdk/jdk/api"
+
+     ;; cortex stuff
+     "/home/r/proj/jmeCapture/docs"
+     "/home/r/java/tritonus.sourceforge.net/apidoc"
+
+     ;; genesis stuff
+     "/home/r/git/genesis/docs"
+     "/home/r/git/propagators/docs"]
+    )))
diff -r 7240d7a5f959 -r 1065e7d615a4 src/rlm/visualize.clj
--- a/src/rlm/visualize.clj	Thu Jul 19 10:56:39 2012 -0500
+++ b/src/rlm/visualize.clj	Mon Jul 08 12:51:12 2013 -0400
@@ -11,7 +11,7 @@
 
 (defmulti visual (fn [& args] (class (last args))))
 
-(import '[org.scilab.forge.jlatexmath TeXConstants TeXFormula TeXIcon])
+;;(import '[org.scilab.forge.jlatexmath TeXConstants TeXFormula TeXIcon])
 (import java.awt.Insets)
 (import javax.swing.JLabel)
 (import java.awt.Color)
@@ -32,20 +32,20 @@
   (visual (ImagePlus. "visual" image)))
     
 
-(defmethod visual TeXFormula
-  [formula]
-  (let [icon
-	(doto (.createTeXIcon formula TeXConstants/STYLE_DISPLAY 30)
-	  (.setInsets (Insets. 5 5 5 5)))
-	image (BufferedImage. (.getIconWidth icon) (.getIconHeight icon)
-			      BufferedImage/TYPE_INT_ARGB)
-	g (.createGraphics image)
-	jl (JLabel.)]
-    (.setForeground jl (Color. 0 0 0))
-    (.setColor g Color/white)
-    (.fillRect g 0 0 (.getIconWidth icon) (.getIconHeight icon))
-    (.paintIcon icon jl g 0 0)
-    (visual image)))
+;; (defmethod visual TeXFormula
+;;   [formula]
+;;   (let [icon
+;; 	(doto (.createTeXIcon formula TeXConstants/STYLE_DISPLAY 30)
+;; 	  (.setInsets (Insets. 5 5 5 5)))
+;; 	image (BufferedImage. (.getIconWidth icon) (.getIconHeight icon)
+;; 			      BufferedImage/TYPE_INT_ARGB)
+;; 	g (.createGraphics image)
+;; 	jl (JLabel.)]
+;;     (.setForeground jl (Color. 0 0 0))
+;;     (.setColor g Color/white)
+;;     (.fillRect g 0 0 (.getIconWidth icon) (.getIconHeight icon))
+;;     (.paintIcon icon jl g 0 0)
+;;     (visual image)))