 TUPLE: html-writer data ;
 INSTANCE: html-writer output-stream
 
-: <html-writer> ( -- html-writer )
-    html-writer new V{ } clone >>data ;
-
-: with-html-writer ( quot -- xml )
-    <html-writer> [ swap with-output-stream* ] keep data>> ; inline
-
 <PRIVATE
 
-TUPLE: html-sub-stream < style-stream parent ;
+: new-html-writer ( class -- html-writer )
+    new V{ } clone >>data ; inline
+
+TUPLE: html-sub-stream < html-writer style parent ;
 
 : new-html-sub-stream ( style stream class -- stream )
-    [ <html-writer> ] 3dip boa ; inline
+    new-html-writer
+        swap >>parent
+        swap >>style ; inline
 
 : end-sub-stream ( substream -- string style stream )
-    [ stream>> data>> ] [ style>> ] [ parent>> ] tri ;
+    [ data>> ] [ style>> ] [ parent>> ] tri ;
 
 : object-link-tag ( xml style -- xml )
     presented of [ url-of [ simple-link ] when* ] when* ;

! Copyright (C) 2004, 2009 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: accessors assocs combinators destructors fry html io
io.styles kernel macros make math math.parser sequences
splitting strings xml.syntax ;
IN: html.streams

GENERIC: url-of ( object -- url )

M: html-writer stream-write-table
    [
        table-style swap [
            [ data>> [XML <td valign="top" style=<->><-></td> XML] ] with map
            [XML <tr><-></tr> XML]
        ] with map
        [XML <table style="display: inline-table; border-collapse: collapse;"><-></table> XML]
    ] emit-html ;

M: html-writer dispose drop ;

: <html-writer> ( -- html-writer )
    html-writer new-html-writer ;

: with-html-writer ( quot -- xml )
    <html-writer> [ swap with-output-stream* ] keep data>> ; inline
