[bknr-cvs] r2212 - in branches/trunk-reorg: bknr/datastore/src bknr/datastore/src/utils bknr/projects/scrabble bknr/projects/scrabble/src bknr/projects/scrabble/website/de thirdparty/cxml-2007-08-05/xml

bknr at bknr.net bknr at bknr.net
Thu Oct 4 22:22:18 UTC 2007


Author: hhubner
Date: 2007-10-04 18:22:16 -0400 (Thu, 04 Oct 2007)
New Revision: 2212

Added:
   branches/trunk-reorg/bknr/projects/scrabble/src/start-webserver.lisp
   branches/trunk-reorg/bknr/projects/scrabble/website/de/charmap.xml
   branches/trunk-reorg/bknr/projects/scrabble/website/de/scrabble.html
   branches/trunk-reorg/bknr/projects/scrabble/website/de/scrabble.js
Removed:
   branches/trunk-reorg/bknr/datastore/src/utils/base64.lisp
   branches/trunk-reorg/bknr/projects/scrabble/website/de/test.html
Modified:
   branches/trunk-reorg/bknr/datastore/src/bknr-utils.asd
   branches/trunk-reorg/bknr/projects/scrabble/
   branches/trunk-reorg/bknr/projects/scrabble/src/make-letters.lisp
   branches/trunk-reorg/bknr/projects/scrabble/src/package.lisp
   branches/trunk-reorg/bknr/projects/scrabble/src/scrabble.asd
   branches/trunk-reorg/bknr/projects/scrabble/website/de/scrabble.css
   branches/trunk-reorg/thirdparty/cxml-2007-08-05/xml/xmlns-normalizer.lisp
Log:
Serves static pages through hunchentoot


Modified: branches/trunk-reorg/bknr/datastore/src/bknr-utils.asd
===================================================================
--- branches/trunk-reorg/bknr/datastore/src/bknr-utils.asd	2007-10-04 21:34:36 UTC (rev 2211)
+++ branches/trunk-reorg/bknr/datastore/src/bknr-utils.asd	2007-10-04 22:22:16 UTC (rev 2212)
@@ -31,7 +31,6 @@
 					       (:file "actor" :depends-on ("utils"))
 					       (:file "reader" :depends-on ("utils"))
 					       (:file "crypt-md5" :depends-on ("utils"))
-					       (:file "base64" :depends-on ("utils"))
 					       (:file "capability" :depends-on ("utils"))
 					       (:file "make-fdf-file" :depends-on ("utils"))
 					       (:file "date-calc")

Deleted: branches/trunk-reorg/bknr/datastore/src/utils/base64.lisp
===================================================================
--- branches/trunk-reorg/bknr/datastore/src/utils/base64.lisp	2007-10-04 21:34:36 UTC (rev 2211)
+++ branches/trunk-reorg/bknr/datastore/src/utils/base64.lisp	2007-10-04 22:22:16 UTC (rev 2212)
@@ -1,75 +0,0 @@
-;;;; This file implements the Base64 transfer encoding algorithm as
-;;;; defined in RFC 1521 by Borensten & Freed, September 1993.
-;;;;
-;;;; Written by Juri Pakaste <juri at iki.fi>. It is in the public
-;;;; domain. Input is welcome.
-;;;;
-;;;; $Id$
-
-(defpackage "BASE64"
-  (:use "CL")
-  (:export #:base64-encode #:base64-decode))
-
-(in-package :base64)
-
-(defparameter *encode-table*
-  "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=")
-
-(defparameter *decode-table*
-  (let ((da (make-array (list 256)
-			:element-type 'integer
-			:initial-element 0)))
-    (loop for character across *encode-table*
-	  for index from 0 below 64
-	  do (setf (elt da (char-code character)) index))
-    da))
-
-(defun base64-encode (string)
-  (let ((result (make-array
-		 (list (* 4 (truncate (/ (+ 2 (length string)) 3))))
-		 :element-type 'base-char)))
-    (do ((sidx 0 (+ sidx 3))
-	 (didx 0 (+ didx 4))
-	 (chars 2 2)
-	 (value nil nil))
-	((>= sidx (length string)) t)
-      (setf value (ash (logand #xFF (char-code (char string sidx))) 8))
-      (dotimes (n 2)
-	(when (< (+ sidx n 1) (length string))
-	  (setf value
-		(logior value
-			(logand #xFF (char-code (char string (+ sidx n 1))))))
-	  (incf chars))
-	(when (= n 0)
-	  (setf value (ash value 8))))
-      (setf (elt result (+ didx 3))
-	    (elt *encode-table* (if (> chars 3) (logand value #x3F) 64)))
-      (setf value (ash value -6))
-      (setf (elt result (+ didx 2))
-	    (elt *encode-table* (if (> chars 2) (logand value #x3F) 64)))
-      (setf value (ash value -6))
-      (setf (elt result (+ didx 1))
-	    (elt *encode-table* (logand value #x3F)))
-      (setf value (ash value -6))
-      (setf (elt result didx)
-	    (elt *encode-table* (logand value #x3F))))
-    result))
-
-(defun base64-decode (string)
-  (let ((result (make-array (* 3 (truncate (/ (length string) 4)))
-			    :element-type 'base-char))
-	(ridx 0))
-    (loop for schar across string
-	  for svalue = (elt *decode-table* (char-code schar))
-	  with bitstore = 0
-	  with bitcount = 0
-	  do (unless (null svalue)
-	       (setf bitstore (logior (ash bitstore 6) svalue))
-	       (incf bitcount 6)
-	       (when (>= bitcount 8)
-		 (decf bitcount 8)
-		 (setf (elt result ridx)
-		       (code-char (logand (ash bitstore (- bitcount)) #xFF)))
-		 (incf ridx)
-		 (setf bitstore (logand bitstore #xFF)))))
-    (subseq result 0 ridx)))


Property changes on: branches/trunk-reorg/bknr/projects/scrabble
___________________________________________________________________
Name: svn:ignore
   + fonts


Modified: branches/trunk-reorg/bknr/projects/scrabble/src/make-letters.lisp
===================================================================
--- branches/trunk-reorg/bknr/projects/scrabble/src/make-letters.lisp	2007-10-04 21:34:36 UTC (rev 2211)
+++ branches/trunk-reorg/bknr/projects/scrabble/src/make-letters.lisp	2007-10-04 22:22:16 UTC (rev 2212)
@@ -21,24 +21,38 @@
 
 (defun make-letter-tile (char score)
   (with-canvas (:width 34 :height 34)
-    (let ((bold-font (get-font *bold-font*))
-          (regular-font (get-font *regular-font*))
-          (char-string (make-string 1 :initial-element char)))
+    (let* ((bold-font (get-font *bold-font*))
+	   (regular-font (get-font *regular-font*))
+	   (char-string (princ-to-string char))
+	   (pathname (make-pathname :name (if (and char (> (char-code char) 127))
+					      (char-name char)
+					      char-string)
+				    :type "png")))
       (set-rgb-fill 1.0 0.98 0.8)
       (rounded-rectangle 0 0 34 34 4 4)
       (fill-path)
-      (set-rgb-fill 0 0 0)
-      (set-font bold-font 27)
-      (draw-centered-string 13 7 char-string)
-      (set-font regular-font 11)
-      (draw-centered-string 26 3 (princ-to-string score))
-      (save-png (make-pathname :name char-string :type "png")))))
+      (when char
+	(set-rgb-fill 0 0 0)
+	(set-font bold-font 27)
+	(draw-centered-string 13 7 char-string)
+	(set-font regular-font 11)
+	(draw-centered-string 26 3 (princ-to-string score)))
+      (save-png pathname)
+      pathname)))
 
 (defun make-letter-tile-set (language)
-  (dolist (entry (gethash language *tile-sets*))
-    (destructuring-bind (letter score count) entry
-      (declare (ignore count))
-      (make-letter-tile letter score))))
+  (with-open-file (letter-map-file "charmap.xml"
+				   :direction :output
+				   :if-exists :supersede
+				   :external-format :utf-8)
+    (cxml:with-xml-output (cxml:make-character-stream-sink letter-map-file)
+      (cxml:with-element "chars"
+	(dolist (entry (gethash language *tile-sets*))
+	  (destructuring-bind (letter score count) entry
+	    (declare (ignore count))
+	    (cxml:with-element "char"
+	      (cxml:attribute "filename" (namestring (make-letter-tile letter score)))
+	      (cxml:text (princ-to-string letter)))))))))
 
 (defun make-special-tile (name color &key text star)
   (with-canvas (:width 40 :height 40)
@@ -63,10 +77,12 @@
   (make-special-tile :standard (getf *special-tile-colors* :standard) :star t))
 
 
-(defun make-tile-set (language)
-  (let ((*default-pathname-defaults* (merge-pathnames
-                                      (make-pathname :directory (list :relative
-                                                                      (string-downcase (symbol-name language)))))))
+(defun make-tile-set (directory language)
+  (let ((*default-pathname-defaults*
+	 (merge-pathnames (merge-pathnames (make-pathname
+					    :directory (list :relative (string-downcase (symbol-name language))))
+					   directory))))
     (ensure-directories-exist *default-pathname-defaults*)
     (make-letter-tile-set language)
-    (make-special-tile-set language)))
\ No newline at end of file
+    (make-special-tile-set language)))
+

Modified: branches/trunk-reorg/bknr/projects/scrabble/src/package.lisp
===================================================================
--- branches/trunk-reorg/bknr/projects/scrabble/src/package.lisp	2007-10-04 21:34:36 UTC (rev 2211)
+++ branches/trunk-reorg/bknr/projects/scrabble/src/package.lisp	2007-10-04 22:22:16 UTC (rev 2212)
@@ -8,4 +8,7 @@
 (defpackage :scrabble.graphics
   (:use :cl :alexandria :vecto :scrabble)
   (:shadowing-import-from :vecto "ROTATE"))
+  
+(defpackage :scrabble.web
+  (:use :cl :alexandria :hunchentoot :scrabble))
   
\ No newline at end of file

Modified: branches/trunk-reorg/bknr/projects/scrabble/src/scrabble.asd
===================================================================
--- branches/trunk-reorg/bknr/projects/scrabble/src/scrabble.asd	2007-10-04 21:34:36 UTC (rev 2211)
+++ branches/trunk-reorg/bknr/projects/scrabble/src/scrabble.asd	2007-10-04 22:22:16 UTC (rev 2212)
@@ -10,7 +10,7 @@
 (defsystem :scrabble
     :name "Scrabble"
     :licence "BSD"
-    :depends-on (:bknr-datastore :vecto :alexandria :anaphora)
+    :depends-on (:bknr-datastore :hunchentoot :cxml :vecto :alexandria :anaphora)
     :serial t
     :components ((:file "package")
                  (:file "scrabble")

Added: branches/trunk-reorg/bknr/projects/scrabble/src/start-webserver.lisp
===================================================================
--- branches/trunk-reorg/bknr/projects/scrabble/src/start-webserver.lisp	2007-10-04 21:34:36 UTC (rev 2211)
+++ branches/trunk-reorg/bknr/projects/scrabble/src/start-webserver.lisp	2007-10-04 22:22:16 UTC (rev 2212)
@@ -0,0 +1,19 @@
+
+(in-package :scrabble.web)
+
+(defparameter *website-directory*
+  (make-pathname :name nil :type nil :version nil
+		 :defaults (merge-pathnames #p"../website/" *load-truename*)))
+
+(defparameter *mochikit-directory*
+  (make-pathname :name nil :type nil :version nil
+		 :defaults (merge-pathnames #p"../../../../thirdparty/MochiKit/MochiKit/")))
+
+(when (and (boundp '*server*) *server)
+  (stop-server *server*))
+
+(setq *dispatch-table*
+      (list (create-folder-dispatcher-and-handler "/MochiKit/" *mochikit-directory*)
+	    (create-folder-dispatcher-and-handler "/scrabble/" *website-directory*)))
+
+(setq *server* (start-server :port 4242))
\ No newline at end of file

Added: branches/trunk-reorg/bknr/projects/scrabble/website/de/charmap.xml
===================================================================
--- branches/trunk-reorg/bknr/projects/scrabble/website/de/charmap.xml	2007-10-04 21:34:36 UTC (rev 2211)
+++ branches/trunk-reorg/bknr/projects/scrabble/website/de/charmap.xml	2007-10-04 22:22:16 UTC (rev 2212)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chars><char filename="A.png">A</char><char filename="B.png">B</char><char filename="C.png">C</char><char filename="D.png">D</char><char filename="E.png">E</char><char filename="F.png">F</char><char filename="G.png">G</char><char filename="H.png">H</char><char filename="I.png">I</char><char filename="J.png">J</char><char filename="K.png">K</char><char filename="L.png">L</char><char filename="M.png">M</char><char filename="N.png">N</char><char filename="O.png">O</char><char filename="P.png">P</char><char filename="Q.png">Q</char><char filename="R.png">R</char><char filename="S.png">S</char><char filename="T.png">T</char><char filename="U.png">U</char><char filename="V.png">V</char><char filename="W.png">W</char><char filename="X.png">X</char><char filename="Y.png">Y</char><char filename="Z.png">Z</char><char filename="LATIN_CAPITAL_LETTER_A_WITH_DIAERESIS.png">Ä</char><char filename="LATIN_CAPITAL_LETTER_O_WITH_DIAERESIS.png">Ö</char><char filename="LATIN_CAPITAL_LETTER_U_WITH_DIAERESIS.png">Ü</char><char filename="NIL.png">NIL</char></chars>
\ No newline at end of file

Modified: branches/trunk-reorg/bknr/projects/scrabble/website/de/scrabble.css
===================================================================
--- branches/trunk-reorg/bknr/projects/scrabble/website/de/scrabble.css	2007-10-04 21:34:36 UTC (rev 2211)
+++ branches/trunk-reorg/bknr/projects/scrabble/website/de/scrabble.css	2007-10-04 22:22:16 UTC (rev 2212)
@@ -1,3 +1,4 @@
+body { background-color: #004B36 }
 #playfield { position: absolute }
 #playfield div { position: absolute; width: 40px; height: 40px }
 #playfield img { position: absolute; top: 3px; left: 3px }

Added: branches/trunk-reorg/bknr/projects/scrabble/website/de/scrabble.html
===================================================================
--- branches/trunk-reorg/bknr/projects/scrabble/website/de/scrabble.html	2007-10-04 21:34:36 UTC (rev 2211)
+++ branches/trunk-reorg/bknr/projects/scrabble/website/de/scrabble.html	2007-10-04 22:22:16 UTC (rev 2212)
@@ -0,0 +1,236 @@
+<html>
+ <head>
+  <link rel="stylesheet" type="text/css" href="scrabble.css" />
+  <script type="text/javascript" src="/MochiKit/MochiKit.js"> </script>
+  <script type="text/javascript" src="scrabble.js"> </script>
+ </head>
+ <body onload="init()">
+  <div id='playfield'>
+   <div id='field-0-0'/></div>
+   <div id='field-0-1'/></div>
+   <div id='field-0-2'/></div>
+   <div id='field-0-3'/></div>
+   <div id='field-0-4'/></div>
+   <div id='field-0-5'/></div>
+   <div id='field-0-6'/></div>
+   <div id='field-0-7'/></div>
+   <div id='field-0-8'/></div>
+   <div id='field-0-9'/></div>
+   <div id='field-0-10'/></div>
+   <div id='field-0-11'/></div>
+   <div id='field-0-12'/></div>
+   <div id='field-0-13'/></div>
+   <div id='field-0-14'/></div>
+   <div id='field-1-0'/></div>
+   <div id='field-1-1'/></div>
+   <div id='field-1-2'/></div>
+   <div id='field-1-3'/></div>
+   <div id='field-1-4'/></div>
+   <div id='field-1-5'/></div>
+   <div id='field-1-6'/></div>
+   <div id='field-1-7'/></div>
+   <div id='field-1-8'/></div>
+   <div id='field-1-9'/></div>
+   <div id='field-1-10'/></div>
+   <div id='field-1-11'/></div>
+   <div id='field-1-12'/></div>
+   <div id='field-1-13'/></div>
+   <div id='field-1-14'/></div>
+   <div id='field-2-0'/></div>
+   <div id='field-2-1'/></div>
+   <div id='field-2-2'/></div>
+   <div id='field-2-3'/></div>
+   <div id='field-2-4'/></div>
+   <div id='field-2-5'/></div>
+   <div id='field-2-6'/></div>
+   <div id='field-2-7'/></div>
+   <div id='field-2-8'/></div>
+   <div id='field-2-9'/></div>
+   <div id='field-2-10'/></div>
+   <div id='field-2-11'/></div>
+   <div id='field-2-12'/></div>
+   <div id='field-2-13'/></div>
+   <div id='field-2-14'/></div>
+   <div id='field-3-0'/></div>
+   <div id='field-3-1'/></div>
+   <div id='field-3-2'/></div>
+   <div id='field-3-3'/></div>
+   <div id='field-3-4'/></div>
+   <div id='field-3-5'/></div>
+   <div id='field-3-6'/></div>
+   <div id='field-3-7'/></div>
+   <div id='field-3-8'/></div>
+   <div id='field-3-9'/></div>
+   <div id='field-3-10'/></div>
+   <div id='field-3-11'/></div>
+   <div id='field-3-12'/></div>
+   <div id='field-3-13'/></div>
+   <div id='field-3-14'/></div>
+   <div id='field-4-0'/></div>
+   <div id='field-4-1'/></div>
+   <div id='field-4-2'/></div>
+   <div id='field-4-3'/></div>
+   <div id='field-4-4'/></div>
+   <div id='field-4-5'/></div>
+   <div id='field-4-6'/></div>
+   <div id='field-4-7'/></div>
+   <div id='field-4-8'/></div>
+   <div id='field-4-9'/></div>
+   <div id='field-4-10'/></div>
+   <div id='field-4-11'/></div>
+   <div id='field-4-12'/></div>
+   <div id='field-4-13'/></div>
+   <div id='field-4-14'/></div>
+   <div id='field-5-0'/></div>
+   <div id='field-5-1'/></div>
+   <div id='field-5-2'/></div>
+   <div id='field-5-3'/></div>
+   <div id='field-5-4'/></div>
+   <div id='field-5-5'/></div>
+   <div id='field-5-6'/></div>
+   <div id='field-5-7'/></div>
+   <div id='field-5-8'/></div>
+   <div id='field-5-9'/></div>
+   <div id='field-5-10'/></div>
+   <div id='field-5-11'/></div>
+   <div id='field-5-12'/></div>
+   <div id='field-5-13'/></div>
+   <div id='field-5-14'/></div>
+   <div id='field-6-0'/></div>
+   <div id='field-6-1'/></div>
+   <div id='field-6-2'/></div>
+   <div id='field-6-3'/></div>
+   <div id='field-6-4'/></div>
+   <div id='field-6-5'/></div>
+   <div id='field-6-6'/></div>
+   <div id='field-6-7'/></div>
+   <div id='field-6-8'/></div>
+   <div id='field-6-9'/></div>
+   <div id='field-6-10'/></div>
+   <div id='field-6-11'/></div>
+   <div id='field-6-12'/></div>
+   <div id='field-6-13'/></div>
+   <div id='field-6-14'/></div>
+   <div id='field-7-0'/></div>
+   <div id='field-7-1'/></div>
+   <div id='field-7-2'/></div>
+   <div id='field-7-3'/></div>
+   <div id='field-7-4'/></div>
+   <div id='field-7-5'/></div>
+   <div id='field-7-6'/></div>
+   <div id='field-7-7'/></div>
+   <div id='field-7-8'/></div>
+   <div id='field-7-9'/></div>
+   <div id='field-7-10'/></div>
+   <div id='field-7-11'/></div>
+   <div id='field-7-12'/></div>
+   <div id='field-7-13'/></div>
+   <div id='field-7-14'/></div>
+   <div id='field-8-0'/></div>
+   <div id='field-8-1'/></div>
+   <div id='field-8-2'/></div>
+   <div id='field-8-3'/></div>
+   <div id='field-8-4'/></div>
+   <div id='field-8-5'/></div>
+   <div id='field-8-6'/></div>
+   <div id='field-8-7'/></div>
+   <div id='field-8-8'/></div>
+   <div id='field-8-9'/></div>
+   <div id='field-8-10'/></div>
+   <div id='field-8-11'/></div>
+   <div id='field-8-12'/></div>
+   <div id='field-8-13'/></div>
+   <div id='field-8-14'/></div>
+   <div id='field-9-0'/></div>
+   <div id='field-9-1'/></div>
+   <div id='field-9-2'/></div>
+   <div id='field-9-3'/></div>
+   <div id='field-9-4'/></div>
+   <div id='field-9-5'/></div>
+   <div id='field-9-6'/></div>
+   <div id='field-9-7'/></div>
+   <div id='field-9-8'/></div>
+   <div id='field-9-9'/></div>
+   <div id='field-9-10'/></div>
+   <div id='field-9-11'/></div>
+   <div id='field-9-12'/></div>
+   <div id='field-9-13'/></div>
+   <div id='field-9-14'/></div>
+   <div id='field-10-0'/></div>
+   <div id='field-10-1'/></div>
+   <div id='field-10-2'/></div>
+   <div id='field-10-3'/></div>
+   <div id='field-10-4'/></div>
+   <div id='field-10-5'/></div>
+   <div id='field-10-6'/></div>
+   <div id='field-10-7'/></div>
+   <div id='field-10-8'/></div>
+   <div id='field-10-9'/></div>
+   <div id='field-10-10'/></div>
+   <div id='field-10-11'/></div>
+   <div id='field-10-12'/></div>
+   <div id='field-10-13'/></div>
+   <div id='field-10-14'/></div>
+   <div id='field-11-0'/></div>
+   <div id='field-11-1'/></div>
+   <div id='field-11-2'/></div>
+   <div id='field-11-3'/></div>
+   <div id='field-11-4'/></div>
+   <div id='field-11-5'/></div>
+   <div id='field-11-6'/></div>
+   <div id='field-11-7'/></div>
+   <div id='field-11-8'/></div>
+   <div id='field-11-9'/></div>
+   <div id='field-11-10'/></div>
+   <div id='field-11-11'/></div>
+   <div id='field-11-12'/></div>
+   <div id='field-11-13'/></div>
+   <div id='field-11-14'/></div>
+   <div id='field-12-0'/></div>
+   <div id='field-12-1'/></div>
+   <div id='field-12-2'/></div>
+   <div id='field-12-3'/></div>
+   <div id='field-12-4'/></div>
+   <div id='field-12-5'/></div>
+   <div id='field-12-6'/></div>
+   <div id='field-12-7'/></div>
+   <div id='field-12-8'/></div>
+   <div id='field-12-9'/></div>
+   <div id='field-12-10'/></div>
+   <div id='field-12-11'/></div>
+   <div id='field-12-12'/></div>
+   <div id='field-12-13'/></div>
+   <div id='field-12-14'/></div>
+   <div id='field-13-0'/></div>
+   <div id='field-13-1'/></div>
+   <div id='field-13-2'/></div>
+   <div id='field-13-3'/></div>
+   <div id='field-13-4'/></div>
+   <div id='field-13-5'/></div>
+   <div id='field-13-6'/></div>
+   <div id='field-13-7'/></div>
+   <div id='field-13-8'/></div>
+   <div id='field-13-9'/></div>
+   <div id='field-13-10'/></div>
+   <div id='field-13-11'/></div>
+   <div id='field-13-12'/></div>
+   <div id='field-13-13'/></div>
+   <div id='field-13-14'/></div>
+   <div id='field-14-0'/></div>
+   <div id='field-14-1'/></div>
+   <div id='field-14-2'/></div>
+   <div id='field-14-3'/></div>
+   <div id='field-14-4'/></div>
+   <div id='field-14-5'/></div>
+   <div id='field-14-6'/></div>
+   <div id='field-14-7'/></div>
+   <div id='field-14-8'/></div>
+   <div id='field-14-9'/></div>
+   <div id='field-14-10'/></div>
+   <div id='field-14-11'/></div>
+   <div id='field-14-12'/></div>
+   <div id='field-14-13'/></div>
+   <div id='field-14-14'/></div>
+  </div>
+ </body>
+</html>
\ No newline at end of file

Added: branches/trunk-reorg/bknr/projects/scrabble/website/de/scrabble.js
===================================================================
--- branches/trunk-reorg/bknr/projects/scrabble/website/de/scrabble.js	2007-10-04 21:34:36 UTC (rev 2211)
+++ branches/trunk-reorg/bknr/projects/scrabble/website/de/scrabble.js	2007-10-04 22:22:16 UTC (rev 2212)
@@ -0,0 +1,22 @@
+// -*- Java -*- (really Javascript)
+
+function setLetter(x, y, letter) {
+    $('field-' + x + '-' + y).innerHTML = '<img src="' + letter + '.png"/>';
+}
+
+function setWord(x, y, word, down) {
+    for (i = 0; i < word.length; i++) {
+        setLetter(x, y, word.charAt(i));
+        if (down) {
+            y++;
+        } else {
+            x++;
+        }
+    };
+}
+
+function init() {
+    setWord(6, 6, "ICH");
+    setWord(7, 7, "LIEBE");
+    setWord(8, 8, "DICH");
+}

Deleted: branches/trunk-reorg/bknr/projects/scrabble/website/de/test.html
===================================================================
--- branches/trunk-reorg/bknr/projects/scrabble/website/de/test.html	2007-10-04 21:34:36 UTC (rev 2211)
+++ branches/trunk-reorg/bknr/projects/scrabble/website/de/test.html	2007-10-04 22:22:16 UTC (rev 2212)
@@ -1,268 +0,0 @@
-<head>
- <link rel="stylesheet" type="text/css" href="scrabble.css" />
-</head>
-<body bgcolor="#004B36">
-<img src="A.png"/>
-<img src="B.png"/>
-<img src="C.png"/>
-<img src="D.png"/>
-<img src="E.png"/>
-<img src="F.png"/>
-<img src="G.png"/>
-<img src="H.png"/>
-<img src="I.png"/>
-<img src="J.png"/>
-<img src="K.png"/>
-<img src="L.png"/>
-<img src="M.png"/>
-<img src="N.png"/>
-<img src="O.png"/>
-<img src="P.png"/>
-<img src="Q.png"/>
-<img src="R.png"/>
-<img src="S.png"/>
-<img src="T.png"/>
-<img src="U.png"/>
-<img src="V.png"/>
-<img src="W.png"/>
-<img src="X.png"/>
-<img src="Y.png"/>
-<img src="Z.png"/>
-<img src="Ä.png"/>
-<img src="Ö.png"/>
-<img src="Ü.png"/>
-<br>
-<img src="double-letter.png"/>
-<img src="double-word.png"/>
-<img src="triple-letter.png"/>
-<img src="triple-word.png"/>
-<img src="standard.png"/>
-<br/>
-<div id='playfield'>
- <div id='field-0-0'/></div>
- <div id='field-0-1'/></div>
- <div id='field-0-2'/></div>
- <div id='field-0-3'/></div>
- <div id='field-0-4'/></div>
- <div id='field-0-5'/></div>
- <div id='field-0-6'/></div>
- <div id='field-0-7'/></div>
- <div id='field-0-8'/></div>
- <div id='field-0-9'/></div>
- <div id='field-0-10'/></div>
- <div id='field-0-11'/></div>
- <div id='field-0-12'/></div>
- <div id='field-0-13'/></div>
- <div id='field-0-14'/></div>
- <div id='field-1-0'/></div>
- <div id='field-1-1'/></div>
- <div id='field-1-2'/></div>
- <div id='field-1-3'/></div>
- <div id='field-1-4'/></div>
- <div id='field-1-5'/></div>
- <div id='field-1-6'/></div>
- <div id='field-1-7'/></div>
- <div id='field-1-8'/></div>
- <div id='field-1-9'/></div>
- <div id='field-1-10'/></div>
- <div id='field-1-11'/></div>
- <div id='field-1-12'/></div>
- <div id='field-1-13'/></div>
- <div id='field-1-14'/></div>
- <div id='field-2-0'/><img src="I.png"/></div>
- <div id='field-2-1'/><img src="C.png"/></div>
- <div id='field-2-2'/><img src="H.png"/></div>
- <div id='field-2-3'/></div>
- <div id='field-2-4'/></div>
- <div id='field-2-5'/></div>
- <div id='field-2-6'/></div>
- <div id='field-2-7'/></div>
- <div id='field-2-8'/></div>
- <div id='field-2-9'/></div>
- <div id='field-2-10'/></div>
- <div id='field-2-11'/></div>
- <div id='field-2-12'/></div>
- <div id='field-2-13'/></div>
- <div id='field-2-14'/></div>
- <div id='field-3-0'/></div>
- <div id='field-3-1'/></div>
- <div id='field-3-2'/><img src="L.png"/></div>
- <div id='field-3-3'/><img src="I.png"/></div>
- <div id='field-3-4'/><img src="E.png"/></div>
- <div id='field-3-5'/><img src="B.png"/></div>
- <div id='field-3-6'/><img src="E.png"/></div>
- <div id='field-3-7'/></div>
- <div id='field-3-8'/></div>
- <div id='field-3-9'/></div>
- <div id='field-3-10'/></div>
- <div id='field-3-11'/></div>
- <div id='field-3-12'/></div>
- <div id='field-3-13'/></div>
- <div id='field-3-14'/></div>
- <div id='field-4-0'/></div>
- <div id='field-4-1'/></div>
- <div id='field-4-2'/><img src="D.png"/></div>
- <div id='field-4-3'/><img src="I.png"/></div>
- <div id='field-4-4'/><img src="C.png"/></div>
- <div id='field-4-5'/><img src="H.png"/></div>
- <div id='field-4-6'/></div>
- <div id='field-4-7'/></div>
- <div id='field-4-8'/></div>
- <div id='field-4-9'/></div>
- <div id='field-4-10'/></div>
- <div id='field-4-11'/></div>
- <div id='field-4-12'/></div>
- <div id='field-4-13'/></div>
- <div id='field-4-14'/></div>
- <div id='field-5-0'/></div>
- <div id='field-5-1'/></div>
- <div id='field-5-2'/></div>
- <div id='field-5-3'/></div>
- <div id='field-5-4'/></div>
- <div id='field-5-5'/></div>
- <div id='field-5-6'/></div>
- <div id='field-5-7'/></div>
- <div id='field-5-8'/></div>
- <div id='field-5-9'/></div>
- <div id='field-5-10'/></div>
- <div id='field-5-11'/></div>
- <div id='field-5-12'/></div>
- <div id='field-5-13'/></div>
- <div id='field-5-14'/></div>
- <div id='field-6-0'/></div>
- <div id='field-6-1'/></div>
- <div id='field-6-2'/></div>
- <div id='field-6-3'/></div>
- <div id='field-6-4'/></div>
- <div id='field-6-5'/></div>
- <div id='field-6-6'/></div>
- <div id='field-6-7'/></div>
- <div id='field-6-8'/></div>
- <div id='field-6-9'/></div>
- <div id='field-6-10'/></div>
- <div id='field-6-11'/></div>
- <div id='field-6-12'/></div>
- <div id='field-6-13'/></div>
- <div id='field-6-14'/></div>
- <div id='field-7-0'/></div>
- <div id='field-7-1'/></div>
- <div id='field-7-2'/></div>
- <div id='field-7-3'/></div>
- <div id='field-7-4'/></div>
- <div id='field-7-5'/></div>
- <div id='field-7-6'/></div>
- <div id='field-7-7'/></div>
- <div id='field-7-8'/></div>
- <div id='field-7-9'/></div>
- <div id='field-7-10'/></div>
- <div id='field-7-11'/></div>
- <div id='field-7-12'/></div>
- <div id='field-7-13'/></div>
- <div id='field-7-14'/></div>
- <div id='field-8-0'/></div>
- <div id='field-8-1'/></div>
- <div id='field-8-2'/></div>
- <div id='field-8-3'/></div>
- <div id='field-8-4'/></div>
- <div id='field-8-5'/></div>
- <div id='field-8-6'/></div>
- <div id='field-8-7'/></div>
- <div id='field-8-8'/></div>
- <div id='field-8-9'/></div>
- <div id='field-8-10'/></div>
- <div id='field-8-11'/></div>
- <div id='field-8-12'/></div>
- <div id='field-8-13'/></div>
- <div id='field-8-14'/></div>
- <div id='field-9-0'/></div>
- <div id='field-9-1'/></div>
- <div id='field-9-2'/></div>
- <div id='field-9-3'/></div>
- <div id='field-9-4'/></div>
- <div id='field-9-5'/></div>
- <div id='field-9-6'/></div>
- <div id='field-9-7'/></div>
- <div id='field-9-8'/></div>
- <div id='field-9-9'/></div>
- <div id='field-9-10'/></div>
- <div id='field-9-11'/></div>
- <div id='field-9-12'/></div>
- <div id='field-9-13'/></div>
- <div id='field-9-14'/></div>
- <div id='field-10-0'/></div>
- <div id='field-10-1'/></div>
- <div id='field-10-2'/></div>
- <div id='field-10-3'/></div>
- <div id='field-10-4'/></div>
- <div id='field-10-5'/></div>
- <div id='field-10-6'/></div>
- <div id='field-10-7'/></div>
- <div id='field-10-8'/></div>
- <div id='field-10-9'/></div>
- <div id='field-10-10'/></div>
- <div id='field-10-11'/></div>
- <div id='field-10-12'/></div>
- <div id='field-10-13'/></div>
- <div id='field-10-14'/></div>
- <div id='field-11-0'/></div>
- <div id='field-11-1'/></div>
- <div id='field-11-2'/></div>
- <div id='field-11-3'/></div>
- <div id='field-11-4'/></div>
- <div id='field-11-5'/></div>
- <div id='field-11-6'/></div>
- <div id='field-11-7'/></div>
- <div id='field-11-8'/></div>
- <div id='field-11-9'/></div>
- <div id='field-11-10'/></div>
- <div id='field-11-11'/></div>
- <div id='field-11-12'/></div>
- <div id='field-11-13'/></div>
- <div id='field-11-14'/></div>
- <div id='field-12-0'/></div>
- <div id='field-12-1'/></div>
- <div id='field-12-2'/></div>
- <div id='field-12-3'/></div>
- <div id='field-12-4'/></div>
- <div id='field-12-5'/></div>
- <div id='field-12-6'/></div>
- <div id='field-12-7'/></div>
- <div id='field-12-8'/></div>
- <div id='field-12-9'/></div>
- <div id='field-12-10'/></div>
- <div id='field-12-11'/></div>
- <div id='field-12-12'/></div>
- <div id='field-12-13'/></div>
- <div id='field-12-14'/></div>
- <div id='field-13-0'/></div>
- <div id='field-13-1'/></div>
- <div id='field-13-2'/></div>
- <div id='field-13-3'/></div>
- <div id='field-13-4'/></div>
- <div id='field-13-5'/></div>
- <div id='field-13-6'/></div>
- <div id='field-13-7'/></div>
- <div id='field-13-8'/></div>
- <div id='field-13-9'/></div>
- <div id='field-13-10'/></div>
- <div id='field-13-11'/></div>
- <div id='field-13-12'/></div>
- <div id='field-13-13'/></div>
- <div id='field-13-14'/></div>
- <div id='field-14-0'/></div>
- <div id='field-14-1'/></div>
- <div id='field-14-2'/></div>
- <div id='field-14-3'/></div>
- <div id='field-14-4'/></div>
- <div id='field-14-5'/></div>
- <div id='field-14-6'/></div>
- <div id='field-14-7'/></div>
- <div id='field-14-8'/></div>
- <div id='field-14-9'/></div>
- <div id='field-14-10'/></div>
- <div id='field-14-11'/></div>
- <div id='field-14-12'/></div>
- <div id='field-14-13'/></div>
- <div id='field-14-14'/></div>
-</div>
-</body>
\ No newline at end of file

Modified: branches/trunk-reorg/thirdparty/cxml-2007-08-05/xml/xmlns-normalizer.lisp
===================================================================
--- branches/trunk-reorg/thirdparty/cxml-2007-08-05/xml/xmlns-normalizer.lisp	2007-10-04 21:34:36 UTC (rev 2211)
+++ branches/trunk-reorg/thirdparty/cxml-2007-08-05/xml/xmlns-normalizer.lisp	2007-10-04 22:22:16 UTC (rev 2212)
@@ -131,6 +131,5 @@
   (sax:start-element (proxy-chained-handler handler) uri lname qname attrs))
 
 (defmethod sax:end-element ((handler namespace-normalizer) uri lname qname)
-  (declare (ignore qname))
   (pop (xmlns-stack handler))
   (sax:end-element (proxy-chained-handler handler) (or uri #"") lname qname))




More information about the Bknr-cvs mailing list