html.streams: fix tests.

flac
John Benediktsson 2020-03-01 18:32:35 -08:00 committed by Steve Ayerhart
parent 12118f02e2
commit e15d2775ae
No known key found for this signature in database
GPG Key ID: 5BFD39C5359E967D
2 changed files with 3 additions and 4 deletions

View File

@ -49,7 +49,7 @@ M: funky url-of "http://www.funky-town.com/" swap town>> append ;
] make-html-string ] make-html-string
] unit-test ] unit-test
{ "<div style=\"background-color: #ff00ff; white-space: pre; font-family: monospace; display: inline-block; \">cdr</div>" } { "<div style=\"background-color: #ff00ff; display: inline-block; \">cdr</div>" }
[ [
[ [
H{ { page-color T{ rgba f 1 0 1 1 } } } H{ { page-color T{ rgba f 1 0 1 1 } } }
@ -57,7 +57,7 @@ M: funky url-of "http://www.funky-town.com/" swap town>> append ;
] make-html-string ] make-html-string
] unit-test ] unit-test
{ "<div style=\"white-space: pre; font-family: monospace; display: inline-block; \"></div><br/>" } [ { "<div style=\"display: inline-block; \"></div><br/>" } [
[ H{ } [ ] with-nesting nl ] make-html-string [ H{ } [ ] with-nesting nl ] make-html-string
] unit-test ] unit-test

View File

@ -55,8 +55,7 @@ TUPLE: html-sub-stream < html-writer style parent ;
"font-size: " % # "pt; " % ; "font-size: " % # "pt; " % ;
: font-css, ( font -- ) : font-css, ( font -- )
[ "font-family: " % % "; " % ] "font-family: " % % "; " % ;
[ "monospace" = [ "white-space: pre-wrap; " % ] when ] bi ;
MACRO: make-css ( pairs -- str ) MACRO: make-css ( pairs -- str )
[ '[ _ of [ _ execute ] when* ] ] { } assoc>map [ '[ _ of [ _ execute ] when* ] ] { } assoc>map