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

html.parser.printer: some improvements to text-printer. 

- collapse spaces except within preformatted tags
- ignore <script> and <style> tags
- don't print dtd tags
char-rename
John Benediktsson 2016-11-13 12:38:09 -08:00
parent 56079afcfb
commit aeeaaec17d
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
USING: accessors assocs combinators fry html.parser USING: accessors assocs combinators fry html.parser
html.parser.utils io io.streams.string kernel math namespaces html.parser.utils io io.streams.string kernel math namespaces
sequences strings unicode ; regexp sequences strings unicode ;
IN: html.parser.printer IN: html.parser.printer
SYMBOL: indentation " " indentation set-global SYMBOL: indentation " " indentation set-global
@ -51,13 +51,18 @@ ERROR: unknown-tag-error tag ;
: html-src ( vector -- string ) : html-src ( vector -- string )
[ html-src. ] with-string-writer ; [ html-src. ] with-string-writer ;
SYMBOLS: preformatted? script? style? ;
M: text-printer print-opening-tag M: text-printer print-opening-tag
name>> { name>> {
{ "br" [ nl indent ] } { "br" [ nl indent ] }
! { "ol" [ nl indent ] } { "ol" [ nl indent ] }
! { "ul" [ nl indent ] } { "ul" [ nl indent ] }
{ "li" [ " * " write ] } { "li" [ " * " write ] }
{ "blockquote" [ #indentations inc indent ] } { "blockquote" [ #indentations inc indent ] }
{ "pre" [ preformatted? on ] }
{ "script" [ script? on ] }
{ "style" [ style? on ] }
[ drop ] [ drop ]
} case ; } case ;
@ -71,44 +76,56 @@ M: text-printer print-closing-tag
[ [
{ "ul" "ol" "li" "tr" } member? [ nl indent ] when { "ul" "ol" "li" "tr" } member? [ nl indent ] when
] ]
[ "td" = [ bl ] when ] [ { "th" "td" } member? [ bl ] when ]
[ "pre" = [ preformatted? off ] when ]
[ "script" = [ script? off ] when ]
[ "style" = [ style? off ] when ]
} cleave ; } cleave ;
M: text-printer print-comment-tag drop ; M: text-printer print-comment-tag drop ;
M: html-printer print-text-tag ( tag -- ) M: text-printer print-dtd-tag drop ;
: collapse-spaces ( text -- text' )
preformatted? get [ R/ \s+/ " " re-replace ] unless ;
M: text-printer print-text-tag
script? get style? get or
[ drop ] [ text>> collapse-spaces write ] if ;
M: html-printer print-text-tag
text>> write ; text>> write ;
M: html-printer print-comment-tag ( tag -- ) M: html-printer print-comment-tag
"<!--" write text>> write "-->" write ; "<!--" write text>> write "-->" write ;
M: html-printer print-dtd-tag ( tag -- ) M: html-printer print-dtd-tag
"<!" write text>> write ">" write ; "<!" write text>> write ">" write ;
: print-attributes ( hashtable -- ) : print-attributes ( hashtable -- )
[ [ bl write "=" write ] [ ?quote write ] bi* ] assoc-each ; [ [ bl write "=" write ] [ ?quote write ] bi* ] assoc-each ;
M: src-printer print-opening-tag ( tag -- ) M: src-printer print-opening-tag
"<" write "<" write
[ name>> write ] [ attributes>> print-attributes ] bi [ name>> write ] [ attributes>> print-attributes ] bi
">" write ; ">" write ;
M: src-printer print-closing-tag ( tag -- ) M: src-printer print-closing-tag
"</" write name>> write ">" write ; "</" write name>> write ">" write ;
: prettyprint-html ( vector -- ) : prettyprint-html ( vector -- )
T{ html-prettyprinter } html-printer [ print-tags ] with-variable ; T{ html-prettyprinter } html-printer [ print-tags ] with-variable ;
M: html-prettyprinter print-opening-tag ( tag -- ) M: html-prettyprinter print-opening-tag
name>> name>>
[ indent "<" write write ">\n" write ] [ indent "<" write write ">\n" write ]
! These tags usually don't have any closing tag associated with them. ! These tags usually don't have any closing tag associated with them.
[ { "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
! These tags usually don't have any closing tag associated with them. ! These tags usually don't have any closing tag associated with them.
[ { "br" "img" } member? [ #indentations dec ] unless ] [ { "br" "img" } member? [ #indentations dec ] unless ]
[ indent "</" write name>> write ">\n" write ] bi ; [ indent "</" write name>> write ">\n" write ] bi ;
M: html-prettyprinter print-text-tag ( tag -- ) M: html-prettyprinter print-text-tag
text>> [ blank? ] trim [ indent write "\n" write ] unless-empty ; text>> [ blank? ] trim [ indent write "\n" write ] unless-empty ;