! Copyright (C) 2004, 2009 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel assocs io io.styles math math.order math.parser
-sequences strings make words combinators macros xml.syntax html fry
-destructors ;
+USING: accessors assocs combinators destructors fry html io
+io.backend io.pathnames io.styles kernel macros make math
+math.functions math.order math.parser namespaces sequences
+strings words splitting xml xml.syntax ;
IN: html.streams
GENERIC: url-of ( object -- url )
M: object url-of drop f ;
-TUPLE: html-writer data last-div ;
+TUPLE: html-writer data ;
+INSTANCE: html-writer output-stream
<PRIVATE
-! stream-nl after with-nesting or tabular-output is
-! ignored, so that HTML stream output looks like
-! UI pane output
-: last-div? ( stream -- ? )
- [ f ] change-last-div drop ;
-
-: not-a-div ( stream -- stream )
- f >>last-div ; inline
-
-: a-div ( stream -- stream )
- t >>last-div ; inline
-
: new-html-writer ( class -- html-writer )
new V{ } clone >>data ; inline
[ data>> ] [ style>> ] [ parent>> ] tri ;
: object-link-tag ( xml style -- xml )
- presented swap at [ url-of [ simple-link ] when* ] when* ;
+ presented of [ url-of [ simple-link ] when* ] when* ;
: href-link-tag ( xml style -- xml )
- href swap at [ simple-link ] when* ;
+ href of [ simple-link ] when* ;
: hex-color, ( color -- )
[ red>> ] [ green>> ] [ blue>> ] tri
- [ 255 * >integer >hex 2 CHAR: 0 pad-head % ] tri@ ;
+ [ 255 * round >integer >hex 2 CHAR: 0 pad-head % ] tri@ ;
: fg-css, ( color -- )
"color: #" % hex-color, "; " % ;
"font-family: " % % "; " % ;
MACRO: make-css ( pairs -- str )
- [ '[ _ swap at [ _ execute ] when* ] ] { } assoc>map
+ [ '[ _ of [ _ execute ] when* ] ] { } assoc>map
'[ [ _ cleave ] "" make ] ;
: span-css-style ( style -- str )
{
{ foreground fg-css, }
{ background bg-css, }
- { font font-css, }
+ { font-name font-css, }
{ font-style style-css, }
{ font-size size-css, }
} make-css ;
span-css-style
[ swap [XML <span style=<->><-></span> XML] ] unless-empty ; inline
-: emit-html ( quot stream -- )
+: emit-html ( stream quot -- )
dip data>> push ; inline
+: img-tag ( xml style -- xml )
+ image-style of [ nip simple-image ] when* ;
+
: format-html-span ( string style stream -- )
- [ [ span-tag ] [ href-link-tag ] [ object-link-tag ] tri ]
- emit-html ;
+ [
+ {
+ [ span-tag ]
+ [ href-link-tag ]
+ [ object-link-tag ]
+ [ img-tag ]
+ } cleave
+ ] emit-html ;
TUPLE: html-span-stream < html-sub-stream ;
M: html-span-stream dispose
- end-sub-stream not-a-div format-html-span ;
+ end-sub-stream format-html-span ;
: border-css, ( border -- )
"border: 1px solid #" % hex-color, "; " % ;
-: padding-css, ( padding -- ) "padding: " % # "px; " % ;
+: (padding-css,) ( horizontal vertical -- )
+ 2dup = [
+ drop "padding: " % # "px; " %
+ ] [
+ "padding: " % # "px " % # "px; " %
+ ] if ;
+
+: padding-css, ( padding -- )
+ first2 (padding-css,) ;
-CONSTANT: pre-css "white-space: pre; font-family: monospace;"
+: width-css, ( width -- )
+ "width: " % # "px; " % ;
: div-css-style ( style -- str )
+ [ span-css-style ]
[
{
{ page-color bg-css, }
{ border-color border-css, }
- { border-width padding-css, }
+ { inset padding-css, }
+ { wrap-margin width-css, }
} make-css
- ] [
- wrap-margin swap at
- [ pre-css append ] unless
- ] bi ;
+ ] bi "display: inline-block; " 3append ;
: div-tag ( xml style -- xml' )
div-css-style
TUPLE: html-block-stream < html-sub-stream ;
-M: html-block-stream dispose ( quot style stream -- )
- end-sub-stream a-div format-html-div ;
+M: html-block-stream dispose
+ end-sub-stream format-html-div ;
: border-spacing-css, ( pair -- )
- "padding: " % first2 max 2 /i # "px; " % ;
+ first2 [ 2 /i ] bi@ (padding-css,) ;
: table-style ( style -- str )
{
{ table-border border-css, }
{ table-gap border-spacing-css, }
- } make-css
- " border-collapse: collapse;" append ;
+ } make-css ;
PRIVATE>
M: html-writer stream-flush drop ;
M: html-writer stream-write1
- not-a-div [ 1string ] emit-html ;
+ [ 1string ] emit-html ;
M: html-writer stream-write
- not-a-div [ ] emit-html ;
+ [ ] emit-html ;
M: html-writer stream-format
format-html-span ;
M: html-writer stream-nl
- dup last-div? [ drop ] [ [ [XML <br/> XML] ] emit-html ] if ;
+ [ [XML <br/> XML] ] emit-html ;
M: html-writer make-span-stream
html-span-stream new-html-sub-stream ;
html-sub-stream new-html-sub-stream ;
M: html-writer stream-write-table
- a-div [
+ [
table-style swap [
[ data>> [XML <td valign="top" style=<->><-></td> XML] ] with map
[XML <tr><-></tr> XML]
] with map
- [XML <table><-></table> XML]
+ [XML <table style="display: inline-table; border-collapse: collapse;"><-></table> XML]
] emit-html ;
M: html-writer dispose drop ;