dan/haunt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

html: Remove 'raw' element type.

Browse Source 
* haunt/html.scm (sxml->html): Remove 'raw' element renderer.
* haunt/reader.scm (read-html-post): Parse to SXML, rather than reading
  a raw string.
This commit is contained in:
David Thompson
2015-10-02 20:47:37 -04:00
parent c67e8e924c
commit 33702f3777
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
haunt/html.scm
View File

@@ -113,9 +113,6 @@ list ATTRS and the child nodes in BODY."
(() *unspecified*) (() *unspecified*)
(('doctype type) (('doctype type)
(doctype->html type port)) (doctype->html type port))
;; Unescaped, raw HTML output.
(('raw html)
(display html port))
(((? symbol? tag) ('@ attrs ...) body ...) (((? symbol? tag) ('@ attrs ...) body ...)
(element->html tag attrs body port)) (element->html tag attrs body port))
(((? symbol? tag) body ...) (((? symbol? tag) body ...)

5
haunt/reader.scm
View File

@@ -31,6 +31,7 @@
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (ice-9 regex) #:use-module (ice-9 regex)
#:use-module (ice-9 rdelim) #:use-module (ice-9 rdelim)
#:use-module (sxml simple)
#:use-module (haunt post) #:use-module (haunt post)
#:use-module (haunt utils) #:use-module (haunt utils)
#:export (make-reader #:export (make-reader
@@ -110,7 +111,9 @@ post."
((eof-object? line) ((eof-object? line)
(error "end of file while reading metadata: " (port-filename port))) (error "end of file while reading metadata: " (port-filename port)))
((string=? line "---") ((string=? line "---")
(values metadata `(raw ,(read-string port)))) (values metadata
(match (xml->sxml port)
(('*TOP* sxml) sxml))))
(else (else
(match (map string-trim-both (string-split-at line #\:)) (match (map string-trim-both (string-split-at line #\:))
(((= string->symbol key) value) (((= string->symbol key) value)