[closure-cvs] CVS closure/src/gui
dlichteblau
dlichteblau at common-lisp.net
Sun Oct 7 21:44:37 UTC 2007
Update of /project/closure/cvsroot/closure/src/gui
In directory clnet:/tmp/cvs-serv19989/src/gui
Modified Files:
gui.lisp
Log Message:
Move the HTML parser and its dependencies into a separate system.
* INSTALL: Mention the dependency on Closure HTML.
* closure.asd (RUNES): Depend on closure-html. (CLOSURE): Removed
clex, lalr, net/mime, parse. Added renderer/pt.
* resources/resources.lisp: Removed DTD parsing.
* src/glisp/package.lisp: Import gstream symbols from html-glisp
for re-export.
* src/glisp/util.lisp (GSTREAM, USE-CHAR-FOR-BYTE-STREAM-FLAVOUR,
G/READ-BYTE, G/UNREAD-BYTE, G/WRITE-BYTE,
USE-BYTE-FOR-CHAR-STREAM-FLAVOUR, G/READ-CHAR, G/UNREAD-CHAR,
G/WRITE-CHAR, CL-STREAM, G/FINISH-OUTPUT, G/CLOSE, CL-BYTE-STREAM,
G/READ-BYTE-SEQUENCE, G/WRITE-BYTE-SEQUENCE, CL-CHAR-STREAM,
G/WRITE-STRING, G/READ-LINE, G/READ-LINE*, VECTOR-OUTPUT-STREAM,
G/MAKE-VECTOR-OUTPUT-STREAM, CL-BYTE-STREAM->GSTREAM,
CL-CHAR-STREAM->GSTREAM): Removed from this file, because this
code now lives in HTML-GLISP.
* src/gui/gui.lisp s/cl-user::*html-dtd*/closure-html:*html-dtd*.
(*html-dtd*): Removed defvar.
* src/net/package.lisp: Use closure-mime-types.
* src/parse/package.lisp: Removed.
* src/parse/pt.lisp: Removed.
* src/parse/sgml-dtd.lisp: Removed.
* src/parse/sgml-parse.lisp: Removed.
* resources/dtd/DTD-HTML-4.0: Removed.
* resources/dtd/DTD-HTML-4.0-Frameset: Removed.
* resources/dtd/DTD-HTML-4.0-Transitional: Removed.
* resources/dtd/Entities-Latin1: Removed.
* resources/dtd/Entities-Special: Removed.
* resources/dtd/Entities-Symbols: Removed.
* resources/dtd/HTML-3.0: Removed.
* resources/dtd/NETSCAPE-Bookmark-file-1: Removed.
* resources/dtd/catalog: Removed.
--- /project/closure/cvsroot/closure/src/gui/gui.lisp 2007/01/07 19:33:02 1.9
+++ /project/closure/cvsroot/closure/src/gui/gui.lisp 2007/10/07 21:44:37 1.10
@@ -401,8 +401,6 @@
;;; --------------------------------------------------------------------------------
-(defvar cl-user::*html-dtd* nil)
-
(defun init-closure ()
;; Init general closure stuff
#||
@@ -411,18 +409,18 @@
(setf *ht* (slurp-patterns "resources/patterns/english.ptn"))
(princ " done.") )
||#
- (unless cl-user::*html-dtd*
+ (unless closure-html:*html-dtd*
(cond
;; xxx hack
((probe-file (compile-file-pathname "html-dtd.lisp"))
(format T "~&;; Loading DTD ")
- (setf cl-user::*html-dtd* (sgml::undump-dtd "html-dtd"))
+ (setf closure-html:*html-dtd* (sgml::undump-dtd "html-dtd"))
(princ " done.")
(finish-output))
(t
(format T "~&;; Parsing DTD ")
(sgml:slurp-catalog (url:parse-url "file://closure/resources/dtd/catalog"))
- (setf cl-user::*html-dtd* (sgml:parse-dtd '(:public "-//W3C//DTD HTML 4.0 Frameset//EN")))
+ (setf closure-html:*html-dtd* (sgml:parse-dtd '(:public "-//W3C//DTD HTML 4.0 Frameset//EN")))
(princ " done.")
(finish-output))))
More information about the Closure-cvs
mailing list