steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

html.parser.printer: some fixes. 

Fix html-text. (may not be perfect, but "works" now)
Don't decrement indentations if we didn't increment them.
db4
John Benediktsson 2013-08-05 09:45:42 -07:00
parent 978009e484
commit 555ea83d89
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
extra/html/parser/printer/printer.factor
View File

@ -1,8 +1,6 @@
USING: accessors assocs html.parser html.parser.utils combinators USING: accessors assocs combinators html.parser
continuations hashtables html.parser.utils io kernel math namespaces sequences strings
hashtables.private io kernel make math unicode.categories ;
namespaces prettyprint quotations sequences splitting
strings unicode.categories ;
IN: html.parser.printer IN: html.parser.printer
TUPLE: html-printer ; TUPLE: html-printer ;
@ -38,7 +36,14 @@ ERROR: unknown-tag-error tag ;
: html-src. ( vector -- ) : html-src. ( vector -- )
T{ src-printer } html-printer [ print-tags ] with-variable ; T{ src-printer } html-printer [ print-tags ] with-variable ;
M: html-printer print-text-tag ( tag -- ) text>> write ; M: text-printer print-opening-tag
name>> "br" = [ nl ] when ;
M: text-printer print-closing-tag
name>> "p" = [ nl ] when ;
M: html-printer print-text-tag ( tag -- )
text>> write ;
M: html-printer print-comment-tag ( tag -- ) M: html-printer print-comment-tag ( tag -- )
"<!--" write text>> write "-->" write ; "<!--" write text>> write "-->" write ;
@ -83,8 +88,9 @@ M: html-prettyprinter print-opening-tag ( tag -- )
[ { "br" "img" } member? [ #indentations inc ] unless ] bi ; [ { "br" "img" } member? [ #indentations inc ] unless ] bi ;
M: html-prettyprinter print-closing-tag ( tag -- ) M: html-prettyprinter print-closing-tag ( tag -- )
#indentations dec [ tabs write "</" write name>> write ">\n" write ]
tabs write "</" write name>> write ">\n" write ; ! These tags usually don't have any closing tag associated with them.
[ { "br" "img" } member? [ #indentations dec ] unless ] bi ;
M: html-prettyprinter print-text-tag ( tag -- ) M: html-prettyprinter print-text-tag ( tag -- )
text>> [ blank? ] trim [ tabs write write "\n" write ] unless-empty ; text>> [ blank? ] trim [ tabs write write "\n" write ] unless-empty ;