[climacs-cvs] CVS update: climacs/html-syntax.lisp climacs/packages.lisp climacs/pane.lisp climacs/syntax.lisp

[Robert Strandh]

Update of /project/climacs/cvsroot/climacs
In directory common-lisp.net:/tmp/cvs-serv31557

Modified Files:
	html-syntax.lisp packages.lisp pane.lisp syntax.lisp 
Log Message:
Minor fixes

Date: Tue Mar 15 13:51:40 2005
Author: rstrandh

Index: climacs/html-syntax.lisp
diff -u climacs/html-syntax.lisp:1.14 climacs/html-syntax.lisp:1.15
--- climacs/html-syntax.lisp:1.14	Tue Mar 15 06:39:24 2005
+++ climacs/html-syntax.lisp	Tue Mar 15 13:51:39 2005
@@ -112,6 +112,8 @@
 (defclass word (html-element) ())
 (defclass delimiter (html-element) ())
 
+(defclass html-lexer (incremental-lexer) ())     
+
 (defmethod next-lexeme ((lexer html-lexer) scan)
   (flet ((fo () (forward-object scan)))
     (let ((object (object-after scan)))
@@ -126,8 +128,6 @@
 		  (make-instance 'word))
 		 (t
 		  (fo) (make-instance 'delimiter))))))))
-
-(defclass html-lexer (incremental-lexer) ())     
 
 (define-syntax html-syntax ("HTML" (basic-syntax))
   ((lexer :reader lexer)


Index: climacs/packages.lisp
diff -u climacs/packages.lisp:1.57 climacs/packages.lisp:1.58
--- climacs/packages.lisp:1.57	Tue Mar 15 06:39:24 2005
+++ climacs/packages.lisp	Tue Mar 15 13:51:39 2005
@@ -105,6 +105,7 @@
 	   #:parse-stack-next #:parse-stack-symbol
 	   #:parse-stack-parse-trees #:map-over-parse-trees
            #:syntax-line-indentation
+	   #:redisplay-pane-with-syntax
 	   #:beginning-of-paragraph #:end-of-paragraph))
 
 (defpackage :climacs-cl-syntax
@@ -141,7 +142,6 @@
            #:query-replace-state #:string1 #:string2
            #:query-replace-mode
 	   #:with-undo
-	   #:redisplay-pane-with-syntax
 	   #:url))
 
 (defpackage :climacs-html-syntax


Index: climacs/pane.lisp
diff -u climacs/pane.lisp:1.21 climacs/pane.lisp:1.22
--- climacs/pane.lisp:1.21	Sun Mar 13 21:51:48 2005
+++ climacs/pane.lisp	Tue Mar 15 13:51:39 2005
@@ -477,8 +477,6 @@
 			  (+ cursor-x 2) (+ cursor-y (* 0.8 height))
 			  :ink cursor-ink)))))  
 
-(defgeneric redisplay-pane-with-syntax (pane syntax current-p))
-
 (defmethod redisplay-pane-with-syntax ((pane climacs-pane) (syntax basic-syntax) current-p)
   (display-cache pane (if current-p +red+ +blue+)))
 


Index: climacs/syntax.lisp
diff -u climacs/syntax.lisp:1.38 climacs/syntax.lisp:1.39
--- climacs/syntax.lisp:1.38	Tue Mar 15 06:39:24 2005
+++ climacs/syntax.lisp	Tue Mar 15 13:51:39 2005
@@ -456,3 +456,10 @@
 		     (return-from map-over-parse-trees nil))
 		   (incomplete-items state))
 	  (funcall function (state-contains-target-p state))))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;
+;;; Display
+
+(defgeneric redisplay-pane-with-syntax (pane syntax current-p))
+