Merge branch 'master' of github.com:biwascheme/biwascheme

Conflicts:
	Makefile
	src/deps/underscore.js
	src/deps/underscore.string.js

Author: Yutaka HARA

.gitignore

@@ -1,6 +1,3 @@
-release/biwascheme-min.js
-release/biwascheme.js
-release/console_biwascheme.js
-node_modules/biwascheme/lib/biwascheme.js
+release/
 src/version.js
 test/browser_functions/node_modules/

.npmignore

@@ -0,0 +1,8 @@
+.gitignore
+Makefile
+demo/
+releases/.gitkeep
+src/
+test/
+tuplespace/
+website/

History.txt

@@ -1,6 +1,17 @@
 (not yet)  v0.6.x
 
-  * new: add clojure-like JavaScript interop syntaxes
+  * new:
+      - add clojure-like JavaScript interop syntaxes
+      - upgraded from jQuery 1.6.2 to 1.7.1
+      - new functions:
+        - element-has-class-name?, element-add-class-name (fixed), element-remove-class-name, element-toggle-class-name
+        - js-load (in Node)
+      - switched inspected strings to be double-quoted instead of single-quoted
+
+  * fix:
+      - added underscore & underscore.string to deps (fixed unit tests & parts of webscheme lib)
+      - fixed HTML escaping
+      - fixed Node load function
 
 (not yet)  v0.6.2
 

Makefile

@@ -48,7 +48,7 @@ CONSOLE_FILES =                                   \
 
 all: build
 
-build: release/biwascheme.js release/biwascheme-min.js release/console_biwascheme.js node_modules/biwascheme/lib/biwascheme.js
+build: release/biwascheme.js release/biwascheme-min.js release/console_biwascheme.js release/node_biwascheme.js
 
 $(VERSION_FILE): $(VERSION_FILE_IN) $(BROWSER_FILES) $(CONSOLE_FILES) VERSION Makefile
 	cat $< | sed -e "s/@GIT_COMMIT@/`git log -1 --pretty=format:%H`/" | sed -e "s/@VERSION@/`cat VERSION`/" > $@
@@ -67,7 +67,7 @@ release/console_biwascheme.js: $(VERSION_FILE) $(CONSOLE_FILES) Makefile
 	cat $(CONSOLE_FILES) >> $@
 	@echo "Wrote " $@
 
-node_modules/biwascheme/lib/biwascheme.js: src/platforms/node/module_preamble.js release/console_biwascheme.js src/platforms/node/module_postamble.js
+release/node_biwascheme.js: src/platforms/node/module_preamble.js release/console_biwascheme.js src/platforms/node/module_postamble.js
 	cat src/platforms/node/module_preamble.js > $@
 	cat release/console_biwascheme.js >> $@
 	cat src/platforms/node/module_postamble.js >> $@

TODO.mkd

@@ -25,8 +25,6 @@ High priority
 - [r6rs] Errors and conditions
 - [r6rs] library definition and loading
 
-- upgrade jQuery to 1.7
-
 - (print (js-eval "null")) raises error (only on Node?)
   -- should think more about .to_display, .to_write, .toString, .inspect
      BiwaScheme.to_display : used by (display), etc.

node_modules/biwascheme/bin/biwas bin/biwas

@@ -1,5 +1,9 @@
 Install node.js (http://nodejs.org/) if you don't already have it.
 
+Install BiwaScheme & other dependencies:
+
+    $ npm install
+
 Start the server:
 
     $ ./start_server

biwascheme-0.5.7.tar.gz

@@ -28,7 +28,7 @@
 
     <div id="bs-console"></div>
 
-    <script src="biwascheme.js">
+    <script src="node_modules/biwascheme/release/biwascheme.js">
       (load "client.scm")
     </script>
   </body>