html.templates: reverse order of style and scripts

[factor.git] / basis / html / templates / templates.factor

diff --git a/basis/html/templates/templates.factor b/basis/html/templates/templates.factor
index 9fe3b1bb7db1a26bfbcdd491c9ee3fefbdd01b78..89a9921a54121ce7806acf9da416342dcc5fbfc7 100644 (file)
--- a/basis/html/templates/templates.factor
+++ b/basis/html/templates/templates.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2008, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel fry io io.encodings.utf8 io.files
-debugger prettyprint continuations namespaces boxes sequences
-arrays strings html io.streams.string assocs
-quotations xml.data xml.writer xml.syntax ;
+USING: accessors arrays assocs boxes continuations debugger io
+io.encodings.utf8 io.files io.streams.string kernel namespaces
+prettyprint quotations sequences strings xml.data xml.syntax
+xml.writer ;
 IN: html.templates
 
 MIXIN: template
@@ -50,11 +50,10 @@ SYMBOL: title
 SYMBOL: style
 
 : add-style ( string -- )
-    "\n" style get push-all
-         style get push-all ;
+    style get push ;
 
 : get-style ( -- string )
-    style get >string ;
+    style get <reversed> "\n" join ;
 
 : write-style ( -- )
     get-style write ;
@@ -62,15 +61,27 @@ SYMBOL: style
 SYMBOL: script
 
 : add-script ( string -- )
-    "\n" script get push-all
-         script get push-all ;
+    script get push ;
 
 : get-script ( -- string )
-    script get >string ;
+    script get <reversed> "\n" join ;
 
 : write-script ( -- )
     get-script write ;
 
+SYMBOL: meta
+
+: add-meta ( name content -- )
+    2array meta get push ;
+
+: get-meta ( -- xml )
+    meta get [
+        [XML <meta name=<-> content=<->/> XML]
+    ] { } assoc>map ;
+
+: write-meta ( -- )
+    get-meta write-xml ;
+
 SYMBOL: atom-feeds
 
 : add-atom-feed ( title url -- )
@@ -102,8 +113,9 @@ M: f call-template* drop call-next-template ;
 : with-boilerplate ( child master -- )
     [
         title [ [ <box> ] unless* ] change
-        style [ [ SBUF" " clone ] unless* ] change
-        script [ [ SBUF" " clone ] unless* ] change
+        style [ [ V{ } clone ] unless* ] change
+        script [ [ V{ } clone ] unless* ] change
+        meta [ [ V{ } clone ] unless* ] change
         atom-feeds [ V{ } like ] change
 
         [