Update of /project/closure/cvsroot/closure/src/css
In directory common-lisp.net:/tmp/cvs-serv17135
Modified Files:
css-selector.lisp
Log Message:
revert rev 1.5!
(Sorry! That was never meant to be checked in. Serves me right for not
deleting the CVS directory before importing into subversion...)
Date: Wed May 4 21:30:48 2005
Author: dlichteblau
Index: closure/src/css/css-selector.lisp
diff -u closure/src/css/css-selector.lisp:1.5 closure/src/css/css-selector.lisp:1.6
--- closure/src/css/css-selector.lisp:1.5 Wed May 4 21:24:13 2005
+++ closure/src/css/css-selector.lisp Wed May 4 21:30:48 2005
@@ -1,4 +1,4 @@
-;;; -*- Mode: Lisp; Syntax: Common-Lisp; Encoding: utf-8; -*-
+;;; -*- Mode: Lisp; Syntax: Common-Lisp; Package: CSS; Readtable: GLISP; Encoding: utf-8; -*-
;;; ---------------------------------------------------------------------------
;;; Title: CSS selectors
;;; [Split off from css-parse.lisp]
@@ -28,7 +28,7 @@
;;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-(in-package :css)
+(in-package :CSS)
(defun create-style-sheet (super-sheet &key (name "Anonymous style sheet")
base-url
@@ -435,6 +435,19 @@
(and r
(cons (cons 'or (car r)) (cdr r)))))
+(defun parse-media-type (string)
+ ;; xxx unicode!
+ (let ((r (parse-media-type-2
+ (tokenize
+ (slurp
+ (cl-char-stream->gstream
+ (make-string-input-stream string)))))))
+ (cond ((and r (null (cdr r)))
+ (car r))
+ (t
+ (warn "Bad media type: ~S." string)
+ nil))))
+
(defun parse-import-rule (seq)
(let ((toks (tokenize seq))
(media-type :all))
@@ -637,7 +650,7 @@
(tagbody
loob
(let ((a (q/simple-selector)))
- (q/s*)
+ (q/S*)
(push a res)
(cond ((member (q/tok) '(:ident :hash :|.| :|[| :|:| :|*|))
(push 'ancestor res)
@@ -796,14 +809,6 @@
(setf res (map 'vector #'+ res (css2-selector-specificity (cdr p)))))))
res))
-(defun parse-style-sheet (str)
- (with-input-from-string (s str)
- (parse-style-sheet* (slurp s) 0 nil)))
-
-(defun parse-assignment-list-string (str)
- (with-input-from-string (s str)
- (parse-assignment-list (slurp s))))
-
(defun parse-style-sheet* (seq &optional (start 0) (import-ok? t))
(let (p0 p1)
(when (setq p0 (position-if-not #'white-space-p* seq :start start))
@@ -818,8 +823,8 @@
nil)
(t
(multiple-value-bind (sel-list condition)
- (parse-css2-selector-list seq p0 p1)
- (cond (condition
+ (ignore-errors (parse-css2-selector-list seq p0 p1))
+ (cond (condition
(warn "CSS selector list does not parse: `~A'."
(as-string (subseq seq p0 p1)))
(setq sel-list nil)))
@@ -853,13 +858,13 @@
(defparameter *media-types*
'(:screen :all))
-(defmethod is-of-media-type-p ((medium t) (media-type (eql :all))) t)
+(defmethod is-of-media-type-p ((medium T) (media-type (eql :all))) t)
(defmethod is-of-media-type-p ((medium (eql :screen)) (media-type (eql :screen))) t)
-(defmethod is-of-media-type-p ((medium t) (media-type t))
+(defmethod is-of-media-type-p ((medium T) (media-type T))
nil)
-(defmethod is-of-media-type-p ((medium t) (media-type cons))
+(defmethod is-of-media-type-p ((medium T) (media-type cons))
(ecase (car media-type)
((OR)
(some (curry #'is-of-media-type-p medium) media-type))