Merge branch 'master' of http://dharmatech.onigirihouse.com/factor

core/prettyprint/backend/backend-docs.factor

@@ -18,10 +18,6 @@ HELP: ch>ascii-escape
 { $values { "ch" "a character" } { "str" string } }
 { $description "Converts a character to an escape code." } ;
 
-HELP: ch>unicode-escape
-{ $values { "ch" "a character" } { "str" string } }
-{ $description "Converts a character to a Unicode escape code (" { $snippet "\\u123456"} ")." } ;
-
 HELP: unparse-ch
 { $values { "ch" "a character" } }
 { $description "Adds the character to the sequence being constructed (see " { $link "namespaces-make" } "). If the character can appear in a string literal, it is added directly, otherwise an escape code is added." } ;

extra/html/parser/analyzer/analyzer.factor

@@ -1,4 +1,5 @@
-USING: assocs html.parser kernel math sequences strings ;
+USING: assocs html.parser kernel math sequences strings unicode.categories
+       unicode.case ;
 IN: html.parser.analyzer
 
 : remove-blank-text ( vector -- vector' )

extra/html/parser/parser.factor

@@ -1,6 +1,6 @@
 USING: arrays html.parser.utils hashtables io kernel
 namespaces prettyprint quotations
-sequences splitting state-parser strings ;
+sequences splitting state-parser strings unicode.categories unicode.case ;
 IN: html.parser
 
 TUPLE: tag name attributes text matched? closing? ;

extra/tar/tar.factor

@@ -1,8 +1,7 @@
-<<<<<<< HEAD:extra/tar/tar.factor
 USING: combinators io io.files io.streams.duplex
 io.streams.string kernel math math.parser continuations
-namespaces pack prettyprint sequences strings system ;
-USING: hexdump tools.interpreter ;
+namespaces pack prettyprint sequences strings system
+hexdump tools.interpreter ;
 IN: tar
 
 : zero-checksum 256 ;

extra/webapps/planet/planet.factor

@@ -2,7 +2,7 @@ USING: sequences rss arrays concurrency kernel sorting
 html.elements io assocs namespaces math threads vocabs html
 furnace http.server.templating calendar math.parser splitting
 continuations debugger system http.server.responders
-xml.writer ;
+xml.writer prettyprint ;
 IN: webapps.planet
 
 : print-posting-summary ( posting -- )