[happstack-scaffolding-0.27.0: updated to hsp-0.9
Jeremy Shaw <jeremy@seereason.com>**20130718012513
 Ignore-this: 973de3a165df173babc768a0cc706053
] hunk ./happstack-scaffolding.cabal 2
-Version:          0.26.1
+Version:          0.27.0
hunk ./happstack-scaffolding.cabal 74
-                   HJScript,
+                   HJScript >= 0.7,
hunk ./happstack-scaffolding.cabal 77
-                   hsx >= 0.8,
hunk ./src/Scaffolding/AppConf.hs 1
-{-# LANGUAGE FlexibleContexts, GeneralizedNewtypeDeriving, PackageImports, RankNTypes, ScopedTypeVariables, StandaloneDeriving, TypeFamilies #-}
-{-# OPTIONS_GHC -F -pgmFtrhsx #-}
+{-# LANGUAGE FlexibleContexts, GeneralizedNewtypeDeriving, PackageImports, RankNTypes, ScopedTypeVariables, StandaloneDeriving, TypeFamilies, OverloadedStrings #-}
+{-# OPTIONS_GHC -F -pgmFhsx2hs #-}
hunk ./src/Scaffolding/AppConf.hs 18
+import qualified Data.Text.Lazy as TL
hunk ./src/Scaffolding/AppConf.hs 21
-import HSP (XMLGenT(..), GenXML, GenChildList, XMLGenerator, EmbedAsChild, EmbedAsAttr, Attr(..), asChild, asAttr, genElement)
+import HSP (XMLGenT(..), GenXML, GenChildList, XMLGenerator, EmbedAsChild, EmbedAsAttr, Attr(..), StringType, asChild, asAttr, genElement, fromStringLit)
hunk ./src/Scaffolding/AppConf.hs 23
-import Language.HJavaScript.Syntax (Block)
+-- import Language.HJavaScript.Syntax (Block)
hunk ./src/Scaffolding/AppConf.hs 39
-              , static     :: FilePath 
+              , static     :: FilePath
hunk ./src/Scaffolding/AppConf.hs 72
-       , Option [] ["static"]           (ReqArg (\h -> \c -> c {static = h}) "PATH") "The directory searched for static files" 
+       , Option [] ["static"]           (ReqArg (\h -> \c -> c {static = h}) "PATH") "The directory searched for static files"
hunk ./src/Scaffolding/AppConf.hs 94
-        (flags,_,[]) -> 
+        (flags,_,[]) ->
hunk ./src/Scaffolding/AppConf.hs 103
-           , EmbedAsAttr m (Attr String a)) =>
+           , EmbedAsAttr m (Attr TL.Text a)
+           , StringType m ~ TL.Text
+           ) =>
hunk ./src/Scaffolding/AppConf.hs 115
-      mkMenu (Menu (MenuItem name loc)) = <li><a href=loc><% name %></a></li>
+      mkMenu (Menu (MenuItem name loc)) = <li><a href=loc><% TL.pack name %></a></li>
hunk ./src/Scaffolding/Auth.hs 14
+import qualified Data.Text.Lazy as TL
hunk ./src/Scaffolding/Auth.hs 21
-import HJScript.Utils ()
+-- ximport HJScript.Utils ()
hunk ./src/Scaffolding/Auth.hs 23
-import qualified HSX.XMLGenerator as HSX
hunk ./src/Scaffolding/Auth.hs 42
-           HSX.XMLType (m weburl) ~ XML,
+           XMLType (m weburl) ~ XML,
hunk ./src/Scaffolding/Auth.hs 53
-           ToMessage (HSX.XMLType (m weburl)),
+           ToMessage (XMLType (m weburl)),
hunk ./src/Scaffolding/Auth.hs 55
-           EmbedAsAttr (m weburl) (Attr String weburl),
+           EmbedAsAttr (m weburl) (Attr TL.Text weburl),
hunk ./src/Scaffolding/Auth.hs 74
-              HSX.XMLType (m weburl) ~ XML,
+              XMLType (m weburl) ~ XML,
hunk ./src/Scaffolding/Auth.hs 78
-              EmbedAsAttr (m weburl) (Attr String weburl),
+              EmbedAsAttr (m weburl) (Attr TL.Text weburl),
hunk ./src/Scaffolding/Auth.hs 81
-              ToMessage (HSX.XMLType (m weburl)),
+              ToMessage (XMLType (m weburl)),
hunk ./src/Scaffolding/Auth.hs 106
-                  ToMessage (HSX.XMLType m),
-                  EmbedAsAttr m (Attr String (URL m)),
+                  ToMessage (XMLType m),
+                  EmbedAsAttr m (Attr TL.Text (URL m)),
hunk ./src/Scaffolding/Auth.hs 120
-    asChild html = asChild (CDATA False (renderHtml html))
+    asChild html = asChild (CDATA False (TL.pack $ renderHtml html))
hunk ./src/Scaffolding/Auth.hs 129
-                 EmbedAsAttr m (Attr String weburl),
-                 ToMessage (HSX.XMLType m)) =>
+                 EmbedAsAttr m (Attr TL.Text weburl),
+                 ToMessage (XMLType m)) =>
hunk ./src/Scaffolding/Auth.hs 136
-         (Just uid) -> 
+         (Just uid) ->
hunk ./src/Scaffolding/Auth.hs 151
-                ToMessage (HSX.XMLType (m weburl)),
+                ToMessage (XMLType (m weburl)),
hunk ./src/Scaffolding/Auth.hs 155
-                EmbedAsAttr (m weburl) (Attr String weburl),
-                EmbedAsAttr (m weburl) (Attr String (URL (m weburl))),
+                EmbedAsAttr (m weburl) (Attr TL.Text weburl),
+                EmbedAsAttr (m weburl) (Attr TL.Text (URL (m weburl))),
hunk ./src/Scaffolding/Auth.hs 166
-    do headersXML <- liftRoute $ map unUChild <$> (unXMLGenT $ asChild headers :: RouteT authurl v [HSX.ChildType (RouteT authurl v)])
-       bodyXML    <- liftRoute $ map unUChild <$> (unXMLGenT $ asChild body    :: RouteT authurl v [HSX.ChildType (RouteT authurl v)])
+    do headersXML <- liftRoute $ map unUChild <$> (unXMLGenT $ asChild headers :: RouteT authurl v [ChildType (RouteT authurl v)])
+       bodyXML    <- liftRoute $ map unUChild <$> (unXMLGenT $ asChild body    :: RouteT authurl v [ChildType (RouteT authurl v)])
hunk ./src/Scaffolding/Auth.hs 176
-       -> RouteT url1 m a 
+       -> RouteT url1 m a
hunk ./src/Scaffolding/Comment/CommentPage.hs 3
-{-# OPTIONS_GHC -F -pgmFtrhsx -Wall -Wwarn #-}
+{-# OPTIONS_GHC -F -pgmFhsx2hs -Wall -Wwarn #-}
hunk ./src/Scaffolding/Comment/CommentPage.hs 21
+import qualified Data.Text.Lazy as TL
hunk ./src/Scaffolding/Comment/CommentPage.hs 24
-import HSP (XMLGenerator, GenXML, EmbedAsChild(..), EmbedAsAttr(..), Attr(..), unXMLGenT, genElement, genEElement)
-import qualified HSX.XMLGenerator  as HSX
+import HSP (XMLGenerator, GenXML, EmbedAsChild(..), EmbedAsAttr(..), Attr(..), XMLType, StringType, unXMLGenT, genElement, genEElement, fromStringLit)
hunk ./src/Scaffolding/Comment/CommentPage.hs 41
-              ToMessage (HSX.XMLType m),
+              ToMessage (XMLType m),
hunk ./src/Scaffolding/Comment/CommentPage.hs 47
-              EmbedAsAttr m (Attr String (URL m)),
+              EmbedAsAttr m (Attr TL.Text (URL m)),
hunk ./src/Scaffolding/Comment/CommentPage.hs 67
+               StringType m ~ TL.Text,
hunk ./src/Scaffolding/Comment/CommentPage.hs 70
-               EmbedAsAttr m (Attr String (URL m)),
+               EmbedAsAttr m (Attr TL.Text (URL m)),
hunk ./src/Scaffolding/Comment/CommentPage.hs 89
-             <span><% fuzzyDiffTime (now `diffUTCTime` (commentDate comment)) %></span>
+             <span><% TL.pack $ fuzzyDiffTime (now `diffUTCTime` (commentDate comment)) %></span>
hunk ./src/Scaffolding/Comment/CommentPage.hs 106
-                -- HSX.XMLType m ~ TextHtml,
+                -- XMLType m ~ TextHtml,
hunk ./src/Scaffolding/Comment/CommentPage.hs 108
-                EmbedAsAttr m (Attr String (URL m)),
+                StringType m ~ TL.Text,
+                EmbedAsAttr m (Attr TL.Text (URL m)),
hunk ./src/Scaffolding/Comment/CommentPage.hs 124
-                ToMessage (HSX.XMLType m),
+                ToMessage (XMLType m),
+                StringType m ~ TL.Text,
hunk ./src/Scaffolding/Comment/CommentPage.hs 132
-                EmbedAsAttr m (Attr String (URL m)),
+                EmbedAsAttr m (Attr TL.Text (URL m)),
hunk ./src/Scaffolding/Comment/CommentPage.hs 146
-                template "comment id not found" () <p>Invalid comment id: <% show cid %> </p>
+                template "comment id not found" () <p>Invalid comment id: <% TL.pack $ show cid %> </p>
hunk ./src/Scaffolding/Comment/CommentPage.hs 161
-                               EmbedAsAttr m (Attr String (URL m)),
+                               EmbedAsAttr m (Attr TL.Text (URL m)),
hunk ./src/Scaffolding/Comment/CommentPage.hs 171
-        <h2 class=classes><% pluralize "Comment" (maybe 0 (Seq.length . comments) comments') %> on <% show $ prettyTopic co %></h2>
+        <h2 class=(TL.pack classes)><% TL.pack $ pluralize "Comment" (maybe 0 (Seq.length . comments) comments') %> on <% TL.pack $ show $ prettyTopic co %></h2>
hunk ./src/Scaffolding/Comment/CommentSpamPage.hs 3
-{-# OPTIONS_GHC -F -pgmFtrhsx -Wall -Wwarn #-}
+{-# OPTIONS_GHC -F -pgmFhsx2hs -Wall -Wwarn #-}
hunk ./src/Scaffolding/Comment/CommentSpamPage.hs 12
+import qualified Data.Text.Lazy as TL
hunk ./src/Scaffolding/Comment/CommentSpamPage.hs 14
-import HSP (Attr(..), EmbedAsAttr(..), EmbedAsChild(..), genElement)
-import qualified HSX.XMLGenerator as HSX
+import HSP (Attr(..), EmbedAsAttr(..), EmbedAsChild(..), XMLType, genElement, fromStringLit)
hunk ./src/Scaffolding/Comment/CommentSpamPage.hs 26
-                    ToMessage (HSX.XMLType m),
+                    ToMessage (XMLType m),
hunk ./src/Scaffolding/Comment/CommentSpamPage.hs 30
-                    EmbedAsAttr m (Attr String (URL m)),
+                    EmbedAsAttr m (Attr TL.Text (URL m)),
hunk ./src/Scaffolding/Comment/CommentSpamPage.hs 38
-       ok =<< template "Comment Flagged" () 
+       ok =<< template "Comment Flagged" ()
hunk ./src/Scaffolding/Comment/SubmitComment.hs 1
-{-# LANGUAGE DeriveDataTypeable, GeneralizedNewtypeDeriving, FlexibleContexts, FlexibleInstances, MultiParamTypeClasses, RecordWildCards, TypeFamilies, UndecidableInstances #-}
-{-# OPTIONS_GHC -F -pgmFtrhsx -Wall -Wwarn #-}
+{-# LANGUAGE DeriveDataTypeable, GeneralizedNewtypeDeriving, FlexibleContexts, FlexibleInstances, MultiParamTypeClasses, RecordWildCards, TypeFamilies, UndecidableInstances, OverloadedStrings #-}
+{-# OPTIONS_GHC -F -pgmFhsx2hs -Wall -Wwarn #-}
hunk ./src/Scaffolding/Comment/SubmitComment.hs 15
+import qualified Data.Text.Lazy as TL
hunk ./src/Scaffolding/Comment/SubmitComment.hs 19
-import HSP (Attr(..), EmbedAsAttr(..), EmbedAsChild(..), genElement)
-import qualified HSX.XMLGenerator as HSX
+import HSP (Attr(..), EmbedAsAttr(..), EmbedAsChild(..), XMLType, fromStringLit, genElement)
hunk ./src/Scaffolding/Comment/SubmitComment.hs 41
-                      EmbedAsAttr m (Attr String (URL m)),
-                      ToMessage (HSX.XMLType m),
+                      EmbedAsAttr m (Attr TL.Text (URL m)),
+                      ToMessage (XMLType m),
hunk ./src/Scaffolding/Comment/SubmitComment.hs 79
-      submitBtn = li $ submit "Submit Comment" `setAttrs` [("class" := "submit")]
+      submitBtn = li $ submit "Submit Comment" `setAttrs` [("class" := "submit") :: Attr TL.Text TL.Text]
hunk ./src/Scaffolding/HSP/Widget.hs 3
-{-# OPTIONS -F -pgmFtrhsx -Wwarn -fno-warn-orphans -fno-warn-name-shadowing -fno-warn-unused-matches #-}
+{-# OPTIONS -F -pgmFhsx2hs -Wwarn -fno-warn-orphans -fno-warn-name-shadowing -fno-warn-unused-matches #-}
hunk ./src/Scaffolding/HSP/Widget.hs 11
-import "mtl" Control.Monad.Identity (Identity)
+import "mtl" Control.Monad.Identity (Identity(runIdentity))
hunk ./src/Scaffolding/HSP/Widget.hs 15
-import HSP.Identity
-import HSP hiding (onClick)
-import HJScript -- (Array(Array), Args, Exp(..), HJScript, IsClass, JBool, JObject, JString, JType, ( # ), call, callProc, callMethod, callVoidMethod, evalHJScript, false, function, functionDecl, inVar, new, push, string, this)
-import HJScript.DOM ({-alert, document, window-})
+import qualified Data.Text.Lazy as TL
+import HSP.Monad
+import HSP.XMLGenerator hiding (onClick)
+import HSP.HTML4 (renderAsHTML)
+import qualified HSP.XML as HSP
+import HJScript (HJScript'(..), JShow, HasConstructor, Array(Array), Args, Exp(..), HJScript, IsClass, JBool, JInt, JObject(..), JString, JType, Var, Object(..), Rec(..), ( # ), (#!), (.=.), (.-.), (.+.), (?), (.==.), first, second, call, callProc, callMethod, callVoidMethod, evalHJScript, false, function, functionDecl, inVar, jShow, new, push, string, this, derefVar, procedureDecl, val, postinc, int, varWith, propertyVar, forIn, arrLength, delete, procedure, deref, true, false, foreach, for, outputBlock, jshow, runHJScript, doIfNoElse)
+-- import HJScript.DOM ({-alert, document, window-})
+import HJScript.XMLGenerator (fromStringLit)
hunk ./src/Scaffolding/HSP/Widget.hs 26
-import qualified HSX.XMLGenerator as HSX
+-- import qualified XMLGenerator as HSX
hunk ./src/Scaffolding/HSP/Widget.hs 29
-import HSP.Identity ({-evalIdentity-})
hunk ./src/Scaffolding/HSP/Widget.hs 36
-       HSX.XMLGen x,
-       HSX.SetAttr x (HSX.XMLType x),
-       HSX.AppendChild x (HSX.XMLType x),
-       HSX.EmbedAsChild x String,
-       HSX.EmbedAsChild x Text,
-       HSX.EmbedAsChild x Char,
-       HSX.EmbedAsAttr x (HSX.Attr String String),
-       HSX.EmbedAsAttr x (HSX.Attr String Int),
-       HSX.EmbedAsAttr x (HSX.Attr String Bool),
-       HSX.EmbedAsChild x XML,
+       XMLGen x,
+       SetAttr x (XMLType x),
+       AppendChild x (XMLType x),
+       EmbedAsChild x String,
+       EmbedAsChild x Text,
+       EmbedAsChild x Char,
+       EmbedAsAttr x (Attr String String),
+       EmbedAsAttr x (Attr String Int),
+       EmbedAsAttr x (Attr String Bool),
+       EmbedAsChild x HSP.XML,
hunk ./src/Scaffolding/HSP/Widget.hs 47
-       EmbedAsAttr x (Attr String Text),
+       StringType x ~ String,
hunk ./src/Scaffolding/HSP/Widget.hs 51
-flattenForm :: (Functor m, Monad m, MonadHeaders IO x) => Form m i e ([HJScript ()], [XMLGenT x (HSX.XMLType x)]) a -> Form m i e [XMLGenT x (HSX.XMLType x)] a
-flattenForm = 
-    mapView $ \(js, h:hs) -> 
+flattenForm :: (Functor m, Monad m, MonadHeaders IO x) => Form m i e ([HJScript ()], [XMLGenT x (XMLType x)]) a -> Form m i e [XMLGenT x (XMLType x)] a
+flattenForm =
+    mapView $ \(js, h:hs) ->
hunk ./src/Scaffolding/HSP/Widget.hs 126
-instance Show Id where              
+instance Show Id where
hunk ./src/Scaffolding/HSP/Widget.hs 153
-
+{-
hunk ./src/Scaffolding/HSP/Widget.hs 156
-  
+
hunk ./src/Scaffolding/HSP/Widget.hs 159
-
+-}
hunk ./src/Scaffolding/HSP/Widget.hs 178
-The writer portion hold the tuple, ([HJScript ()],[XMLGenT m (HSX.XMLType
+The writer portion hold the tuple, ([HJScript ()],[XMLGenT m (XMLType
hunk ./src/Scaffolding/HSP/Widget.hs 182
-
hunk ./src/Scaffolding/HSP/Widget.hs 184
-generate fresh variable names. 
+generate fresh variable names.
hunk ./src/Scaffolding/HSP/Widget.hs 192
--- This is just a 'class alias' so that we can have short type signatures           
-class (Functor m, XMLGenerator m, EmbedAsAttr m (Attr String Id), (NextId (Widget m))) => Widgets m
-instance Widgets Identity
+-- This is just a 'class alias' so that we can have short type signatures
+class (Functor m, XMLGenerator m, EmbedAsAttr m (Attr String Id), EmbedAsAttr m (Attr String String), (NextId (Widget m)), StringType m ~ String) => Widgets m
+-- instance Widgets Identity
hunk ./src/Scaffolding/HSP/Widget.hs 196
-instance Widgets (ServerPartT IO)
+-- instance Widgets (ServerPartT IO)
hunk ./src/Scaffolding/HSP/Widget.hs 203
-     
+
hunk ./src/Scaffolding/HSP/Widget.hs 206
-mapWidget :: ((a, (Id, Int), ([HJScript ()], [GenXML m])) -> (b, (Id, Int), ([HJScript ()], [XMLGenT n (HSX.XMLType n)]))) -> 
+mapWidget :: ((a, (Id, Int), ([HJScript ()], [GenXML m])) -> (b, (Id, Int), ([HJScript ()], [XMLGenT n (XMLType n)]))) ->
hunk ./src/Scaffolding/HSP/Widget.hs 211
-
+{-
hunk ./src/Scaffolding/HSP/Widget.hs 214
-showWidget widget = 
+showWidget widget =
hunk ./src/Scaffolding/HSP/Widget.hs 216
-      xmlStr = unlines $ map renderAsHTML (map evalIdentity xml)
+      xmlStr = unlines $ map (TL.unpack . renderAsHTML) (map (runIdentity . unXMLGenT) xml)
hunk ./src/Scaffolding/HSP/Widget.hs 222
-printWidget = putStrLn . showWidget     
-
+printWidget = putStrLn . showWidget
+-}
hunk ./src/Scaffolding/HSP/Widget.hs 233
-  Widget $ do (i, hjstate) <- get 
+  Widget $ do (i, hjstate) <- get
hunk ./src/Scaffolding/HSP/Widget.hs 248
-  
-instance NextId (Widget Identity) where  
+
+instance NextId (Widget Identity) where
+  nextId = nextId'
+
+instance NextId (Widget (ServerPartT IO)) where
hunk ./src/Scaffolding/HSP/Widget.hs 254
-  
-instance NextId (Widget (ServerPartT IO)) where  
-  nextId = nextId'  
-  
-instance NextId (Widget HJScript') where  
+
+instance NextId (Widget HJScript') where
hunk ./src/Scaffolding/HSP/Widget.hs 263
-nextId' = 
+nextId' =
hunk ./src/Scaffolding/HSP/Widget.hs 276
-jNextId' = 
+jNextId' =
hunk ./src/Scaffolding/HSP/Widget.hs 279
-{-     
+{-
hunk ./src/Scaffolding/HSP/Widget.hs 284
--}   
+-}
hunk ./src/Scaffolding/HSP/Widget.hs 289
-selectId :: (GetId i) => i -> JObject JQuery     
+selectId :: (GetId i) => i -> JObject JQuery
hunk ./src/Scaffolding/HSP/Widget.hs 317
-     
+
hunk ./src/Scaffolding/HSP/Widget.hs 350
--- | disconnect to 'Widgets'. Can be called from javascript.          
+-- | disconnect to 'Widgets'. Can be called from javascript.
hunk ./src/Scaffolding/HSP/Widget.hs 386
-    
+
hunk ./src/Scaffolding/HSP/Widget.hs 408
--- 
+--
hunk ./src/Scaffolding/HSP/Widget.hs 423
--- | create a dropdown menu. 
--- 
+-- | create a dropdown menu.
+--
hunk ./src/Scaffolding/HSP/Widget.hs 439
-             let optionElem (lbl, val) = 
+             let optionElem (lbl, val) =
hunk ./src/Scaffolding/HSP/Widget.hs 461
-input' genHtml getString = 
+input' genHtml getString =
hunk ./src/Scaffolding/HSP/Widget.hs 473
-input :: (NextId (Widget m), XMLGenerator m, Functor m, EmbedAsAttr m (Attr String Id), EmbedAsAttr m (Attr String a))
+input :: (NextId (Widget m), XMLGenerator m, Functor m, EmbedAsAttr m (Attr String Id), EmbedAsAttr m (Attr String String), EmbedAsAttr m (Attr String a), StringType m ~ String)
hunk ./src/Scaffolding/HSP/Widget.hs 484
-textarea :: (Functor m, XMLGenerator m, EmbedAsAttr m (Attr String Id), EmbedAsChild m a, NextId (Widget m))
+textarea :: (Functor m, XMLGenerator m, EmbedAsAttr m (Attr String Id), EmbedAsChild m a, NextId (Widget m), StringType m ~ String)
hunk ./src/Scaffolding/HSP/Widget.hs 496
-eventAlert :: forall a m. (JType a, JShow a, NextId (Widget m)) => Widget m (In a)          
+eventAlert :: forall a m. (JType a, JShow a, NextId (Widget m)) => Widget m (In a)
hunk ./src/Scaffolding/HSP/Widget.hs 506
-output :: forall a m. (JType a, JShow a, XMLGenerator m, EmbedAsAttr m (Attr String Id), NextId (Widget m)) => Widget m (In a)
+output :: forall a m. (JType a, JShow a, XMLGenerator m, EmbedAsAttr m (Attr String Id), NextId (Widget m), StringType m ~ String) => Widget m (In a)
hunk ./src/Scaffolding/HSP/Widget.hs 539
-         do sendMsg (Out jid) ((selectExpr e) # jAttr "value") 
+         do sendMsg (Out jid) ((selectExpr e) # jAttr "value")
hunk ./src/Scaffolding/HSP/Widget.hs 548
--- | a text input field 'JWidget'      
+-- | a text input field 'JWidget'
hunk ./src/Scaffolding/HSP/Widget.hs 569
-toggleWord :: forall a m. (XMLGenerator m, EmbedAsAttr m (Attr String Id), NextId (Widget m)) => String -> JInt -> Widget m (In (JToggle Int), Out (JToggle (Rec Int String)))
+toggleWord :: forall a m. (XMLGenerator m, EmbedAsChild m String, EmbedAsAttr m (Attr String Id), EmbedAsAttr m (Attr String String), NextId (Widget m), StringType m ~ String) => String -> JInt -> Widget m (In (JToggle Int), Out (JToggle (Rec Int String)))
hunk ./src/Scaffolding/HSP/Widget.hs 630
-paragraphWidget :: (XMLGenerator m, EmbedAsAttr m (Attr String Id), NextId (Widget m)) => [String] -> Widget m ((In (Array Int)), Out (JToggle (Rec Int String)))
+paragraphWidget :: (XMLGenerator m, EmbedAsChild m String, EmbedAsAttr m (Attr String Id), EmbedAsAttr m (Attr String String), NextId (Widget m), StringType m ~ String) => [String] -> Widget m ((In (Array Int)), Out (JToggle (Rec Int String)))
hunk ./src/Scaffolding/HSP/Widget.hs 661
-dynListWidget :: (Functor m, XMLGenerator m, EmbedAsAttr m (Attr String Id), NextId (Widget m)) => Widget m (In ElementNode)
+{-
+dynListWidget :: (Functor m, XMLGenerator m, EmbedAsAttr m (Attr String Id), EmbedAsAttr m (Attr String String), NextId (Widget m), StringType m ~ String) => Widget m (In ElementNode)
hunk ./src/Scaffolding/HSP/Widget.hs 674
-
+-}
hunk ./src/Scaffolding/HSP/Widget.hs 689
-widgetList :: (XMLGenerator m, EmbedAsAttr m (Attr String Id), NextId (Widget m)) => Widget m (In (JWidget (Out String)), Out String)
+widgetList :: (XMLGenerator m, EmbedAsAttr m (Attr String Id), NextId (Widget m), StringType m ~ String) => Widget m (In (JWidget (Out String)), Out String)
hunk ./src/Scaffolding/HSP/Widget.hs 696
-                  d <- <input type="submit" value="x" />                  
-                  li <- <li><% (jwidget # deref "xml" :: Exp ElementNode) %><% d %></li>                       
+                  d <- <input type="submit" value="x" />
+                  li <- <li><% (jwidget # deref "xml" :: Exp ElementNode) %><% d %></li>
hunk ./src/Scaffolding/HSP/Widget.hs 705
-                  -- connect the inner and out widgets                  
+                  -- connect the inner and out widgets
hunk ./src/Scaffolding/HSP/Widget.hs 711
-widgetList3 :: forall m a. (Show a, JType a, XMLGenerator m, EmbedAsAttr m (Attr String Id), NextId (Widget m)) => Widget m (In (JWidget (Out a)), Out (Array a))
+widgetList3 :: forall m a. (Show a, JType a, XMLGenerator m, EmbedAsAttr m (Attr String Id), EmbedAsAttr m (Attr String String), NextId (Widget m), StringType m ~ String) => Widget m (In (JWidget (Out a)), Out (Array a))
hunk ./src/Scaffolding/HSP/Widget.hs 726
-             sortUpdateCB <- function $ \(event :: JObject JEvent) -> 
+             sortUpdateCB <- function $ \(event :: JObject JEvent) ->
hunk ./src/Scaffolding/HSP/Widget.hs 755
-                  return false                  
+                  return false
hunk ./src/Scaffolding/HSP/Widget.hs 760
-widgetList2 :: forall a m. (XMLGenerator m, EmbedAsAttr m (Attr String Id), NextId (Widget m)) => Widget m (In (JToggle (Rec Int a)), In (JWidget (In (JToggle (Rec Int a)), Out (Array Int))), Out (Array Int))
+widgetList2 :: forall a m. (XMLGenerator m, EmbedAsAttr m (Attr String Id), NextId (Widget m), StringType m ~ String) => Widget m (In (JToggle (Rec Int a)), In (JWidget (In (JToggle (Rec Int a)), Out (Array Int))), Out (Array Int))
hunk ./src/Scaffolding/HSP/Widget.hs 768
-                  d <- <input type="submit" class="delete" value="x" />                  
+                  d <- <input type="submit" class="delete" value="x" />
hunk ./src/Scaffolding/HSP/Widget.hs 811
-               do 
+               do
hunk ./src/Scaffolding/HSP/Widget.hs 814
-     return (iId, wId, oId)     
+     return (iId, wId, oId)
hunk ./src/Scaffolding/HSP/Widget.hs 854
--- | similar to constructor' except the JWidget does not depend on the value of the input argument     
+-- | similar to constructor' except the JWidget does not depend on the value of the input argument
hunk ./src/Scaffolding/HSP/Widget.hs 862
-     return (iId, oId)     
+     return (iId, oId)
hunk ./src/Scaffolding/HSP/Widget.hs 864
--- | a wrapper around constructor'. Perhaps not a very useful one. Should at least be parameterized around 'a' instead of 'String'.          
+-- | a wrapper around constructor'. Perhaps not a very useful one. Should at least be parameterized around 'a' instead of 'String'.
hunk ./src/Scaffolding/HSP/Widget.hs 873
-outputToggle :: forall a m. (JType a, JShow a, XMLGenerator m, EmbedAsAttr m (Attr String Id), NextId (Widget m)) => Widget m (In (JToggle (Rec Int a)))
+outputToggle :: forall a m. (JType a, JShow a, XMLGenerator m, EmbedAsAttr m (Attr String Id), NextId (Widget m), StringType m ~ String) => Widget m (In (JToggle (Rec Int a)))
hunk ./src/Scaffolding/HSP/Widget.hs 889
-     
+
hunk ./src/Scaffolding/HSP/Widget.hs 891
-outputMultiToggle :: forall a m. (JType a, JShow a, XMLGenerator m, EmbedAsAttr m (Attr String Id), NextId (Widget m)) => Widget m (In (JToggle (Rec Int a)))
+outputMultiToggle :: forall a m. (JType a, JShow a, XMLGenerator m, EmbedAsAttr m (Attr String Id), EmbedAsAttr m (Attr String String), NextId (Widget m), StringType m ~ String) => Widget m (In (JToggle (Rec Int a)))
hunk ./src/Scaffolding/HSP/Widget.hs 940
-     
-     
+
+
hunk ./src/Scaffolding/HSP/Widget.hs 999
-               for (int 0) ((arrLength ks) .-. int 1) $ \i -> 
+               for (int 0) ((arrLength ks) .-. int 1) $ \i ->
hunk ./src/Scaffolding/HSP/Widget.hs 1006
-      oaThis = this 
+      oaThis = this
hunk ./src/Scaffolding/HSP/Widget.hs 1028
-          return (val currId)          
+          return (val currId)
hunk ./src/Scaffolding/HSP/Widget.hs 1033
-onReadyXML :: (XMLGenerator m) => [HJScript ()] -> GenXML m
+onReadyXML :: (XMLGenerator m, StringType m ~ TL.Text) => [HJScript ()] -> GenXML m
hunk ./src/Scaffolding/HSP/Widget.hs 1035
+  let fromStringLit = HSP.fromStringLit in
hunk ./src/Scaffolding/HSP/Widget.hs 1038
-      <% unlines $ map (show . snd . evalHJScript) onReadyJs %> 
+      <% TL.pack $ unlines $ map (show . snd . evalHJScript) onReadyJs %>
hunk ./src/Scaffolding/HSP/Widget.hs 1045
-onReadyXML' :: [HJScript ()] -> XML
-onReadyXML' = evalIdentity . onReadyXML
-
+onReadyXML' :: [HJScript ()] -> HSP.XML
+onReadyXML' = runIdentity . (unHSPT :: HSPT HSP.XML Identity HSP.XML -> Identity HSP.XML) . unXMLGenT . onReadyXML
hunk ./src/Scaffolding/HSP/Widget.hs 1051
-sink :: forall a m. (JType a, XMLGenerator m, EmbedAsAttr m (Attr String Id), NextId (Widget m)) => String -> String -> Widget m (In a)
+sink :: forall a m. (JType a, XMLGenerator m, EmbedAsAttr m (Attr String String), EmbedAsAttr m (Attr String Id), NextId (Widget m), StringType m ~ String) => String -> String -> Widget m (In a)
hunk ./src/Scaffolding/HSP/Widget.hs 1054
-     html $ <input type="hidden" name=n  id=(getId i) value=v />
+     html $ <input type="hidden" name=(n)  id=(getId i) value=(v) />
hunk ./src/Scaffolding/HSP/Widget.hs 1076
-widgetToForm :: 
+widgetToForm ::
hunk ./src/Scaffolding/HSP/Widget.hs 1078
+    , StringType m ~ String
hunk ./src/Scaffolding/HSP/Widget.hs 1083
+    , EmbedAsAttr m (Attr String String)
hunk ./src/Scaffolding/HSP/Widget.hs 1093
-    (inputString (\n mv -> snd $ runWidget (prefix ++ show n) 0 $ 
+    (inputString (\n mv -> snd $ runWidget (prefix ++ show n) 0 $
hunk ./src/Scaffolding/HSP/Widget.hs 1108
-widgetToForm :: 
+widgetToForm ::
hunk ./src/Scaffolding/HSP/Widget.hs 1150
-{-     
+{-
hunk ./src/Scaffolding/HSP/Widget.hs 1152
-addEvent handler = 
+addEvent handler =
hunk ./src/Scaffolding/HSP/Widget.hs 1157
-     
+
hunk ./src/Scaffolding/HSP/Widget.hs 1162
-               do args <- new Array () 
+               do args <- new Array ()
hunk ./src/Scaffolding/HSP/Widget.hs 1170
-     
-{-                                  
-     js $ do fn <- objectVal 
+
+{-
+     js $ do fn <- objectVal
hunk ./src/Scaffolding/HSP/Widget.hs 1177
--}     
-{-     
-     
-{-                  
+-}
+{-
+
+{-
hunk ./src/Scaffolding/HSP/Widget.hs 1206
-     js $ do fn <- function $ \(jEvent :: JObject JEvent) -> 
+     js $ do fn <- function $ \(jEvent :: JObject JEvent) ->
hunk ./src/Scaffolding/HSP/Widget.hs 1216
-     js $ do fn <- function $ \o -> 
+     js $ do fn <- function $ \o ->
hunk ./src/Scaffolding/HSP/Widget.hs 1218
-             bindSendText (i, fn)   
+             bindSendText (i, fn)
hunk ./src/Scaffolding/HSP/Widget.hs 1233
-     
+
hunk ./src/Scaffolding/HSP/Widget.hs 1240
-                  (e # jData (string "toggled")) ? 
+                  (e # jData (string "toggled")) ?
hunk ./src/Scaffolding/HSP/Widget.hs 1273
-{-          
+{-
hunk ./src/Scaffolding/HSP/Widget.hs 1277
-               arr # push (call extractFn (selectExpr (jThis))) 
+               arr # push (call extractFn (selectExpr (jThis)))
hunk ./src/Scaffolding/HSP/Widget.hs 1286
-          
-{-          
+
+{-
hunk ./src/Scaffolding/HSP/Widget.hs 1292
-          
+
hunk ./src/Scaffolding/HSP/Widget.hs 1300
-          
+
hunk ./src/Scaffolding/HSP/Widget.hs 1318
- receiveMessage (data) 
+ receiveMessage (data)
hunk ./src/Scaffolding/HSP/Widget.hs 1355
-     
+
hunk ./src/Scaffolding/HSP/Widget.hs 1367
-  js $ do sendMsg <- function $ \(event :: JObject JEvent, param :: Exp String) -> 
+  js $ do sendMsg <- function $ \(event :: JObject JEvent, param :: Exp String) ->
hunk ./src/Scaffolding/HSP/Widget.hs 1369
-               inObj  <- inVar (selectId iWidget) 
+               inObj  <- inVar (selectId iWidget)
hunk ./src/Scaffolding/HSP/Widget.hs 1378
-  -}        
+  -}
hunk ./src/Scaffolding/HSP/Widget.hs 1382
-input :: (XMLGenerator m, EmbedAsAttr m (Attr String Id)) => String -> Widget m (In Trigger, Out String)    
+input :: (XMLGenerator m, EmbedAsAttr m (Attr String Id)) => String -> Widget m (In Trigger, Out String)
hunk ./src/Scaffolding/HSP/Widget.hs 1413
-               do args <- new Array () 
+               do args <- new Array ()
hunk ./src/Scaffolding/HSP/Widget.hs 1425
-     
-mixedThis =     
+
+mixedThis =
hunk ./src/Scaffolding/HSP/Widget.hs 1430
-     
+
hunk ./src/Scaffolding/HSP/Widget.hs 1435
-     
-     
+
+
hunk ./src/Scaffolding/HSP/Widget.hs 1443
-assocConstructor = procedureDecl "Assoc" $ \() -> 
+assocConstructor = procedureDecl "Assoc" $ \() ->
hunk ./src/Scaffolding/HSP/Widget.hs 1448
-      aThis :: JObject (Assoc Int Int)      
-      aThis = this 
+      aThis :: JObject (Assoc Int Int)
+      aThis = this
hunk ./src/Scaffolding/HSP/Widget.hs 1460
-{- 
+{-
hunk ./src/Scaffolding/HSP/Widget.hs 1466
-  
-instance Enum Id where  
+
+instance Enum Id where
hunk ./src/Scaffolding/HSP/Widget.hs 1469
-  pred (Id (JInt i)) = Id (JInt (pred i))  
+  pred (Id (JInt i)) = Id (JInt (pred i))
hunk ./src/Scaffolding/HSP/Widget.hs 1475
-data Click              
+data Click
hunk ./src/Scaffolding/HSP/Widget.hs 1492
--}          
+-}
hunk ./src/Scaffolding/HSP/Widget.hs 1495
-widgetList = 
+widgetList =
hunk ./src/Scaffolding/HSP/Widget.hs 1514
-{-     
-itemWidget :: Widget m (Out (Widget m ()))     
-itemWidget 
+{-
+itemWidget :: Widget m (Out (Widget m ()))
+itemWidget
hunk ./src/Scaffolding/HSP/Widget.hs 1518
-{-     
+{-
hunk ./src/Scaffolding/HSP/Widget.hs 1520
-jSendMsg iId msg = 
+jSendMsg iId msg =
hunk ./src/Scaffolding/HSP/Widget.hs 1523
-     runExp $ selectExpr(document) # triggerHandler ((string "sendMsg_") .+. (jShow iId) , args)     
-  -}   
+     runExp $ selectExpr(document) # triggerHandler ((string "sendMsg_") .+. (jShow iId) , args)
+  -}
hunk ./src/Scaffolding/HSP/Widget.hs 1542
-      xmlToJs iId oId (Id src i) js [xml] = 
+      xmlToJs iId oId (Id src i) js [xml] =
hunk ./src/Scaffolding/HSP/Widget.hs 1559
-     return (In iId, oId)     
--}     
+     return (In iId, oId)
+-}
hunk ./src/Scaffolding/Pages/AppTemplate.hs 3
-{-# LANGUAGE FlexibleContexts, FlexibleInstances, PackageImports, RankNTypes, ScopedTypeVariables, 
-             TypeFamilies, UndecidableInstances #-}
-{-# OPTIONS -Wwarn -F -pgmFtrhsx -fno-warn-orphans -fno-warn-name-shadowing #-}
+{-# LANGUAGE FlexibleContexts, FlexibleInstances, PackageImports, RankNTypes, ScopedTypeVariables,
+             TypeFamilies, UndecidableInstances, OverloadedStrings #-}
+{-# OPTIONS -Wwarn -F -pgmFhsx2hs -fno-warn-orphans -fno-warn-name-shadowing #-}
hunk ./src/Scaffolding/Pages/AppTemplate.hs 19
+import qualified Data.Text.Lazy as TL
hunk ./src/Scaffolding/Pages/AppTemplate.hs 24
-import HJScript.Utils ()
-import HSP (XML, GenXML, XMLGenerator, unXMLGenT, EmbedAsChild, EmbedAsAttr, Attr(..), asChild, asAttr, genElement, genEElement)
+-- import HJScript.Utils ()
+import HSP (XML, GenXML, XMLGenerator, unXMLGenT, EmbedAsChild, EmbedAsAttr, Attr(..), StringType, XMLType, asChild, asAttr, genElement, genEElement, fromStringLit)
hunk ./src/Scaffolding/Pages/AppTemplate.hs 27
-import qualified HSX.XMLGenerator as HSX
-import Language.HJavaScript.Syntax (Block)
+-- import qualified HSX.XMLGenerator as HSX
+-- import Language.HJavaScript.Syntax (Block)
hunk ./src/Scaffolding/Pages/AppTemplate.hs 31
-import Scaffolding.HSP.Widget (WidgetGenerator, Widgets, Widget, Id, NextId(nextId), nextId')
+-- import Scaffolding.HSP.Widget (WidgetGenerator, Widgets, Widget, Id, NextId(nextId), nextId')
hunk ./src/Scaffolding/Pages/AppTemplate.hs 39
-       EmbedAsChild x (Block ()),
+--       EmbedAsChild x (Block ()),
hunk ./src/Scaffolding/Pages/AppTemplate.hs 44
-       EmbedAsAttr x (Attr String Id),
+--       EmbedAsAttr x (Attr String Id),
hunk ./src/Scaffolding/Pages/AppTemplate.hs 46
-       Widgets x) => MonadRender x
+       StringType x ~ TL.Text
+--       Widgets x
+       ) => MonadRender x
hunk ./src/Scaffolding/Pages/AppTemplate.hs 51
-             ToMessage (HSX.XMLType m),
+             ToMessage (XMLType m),
hunk ./src/Scaffolding/Pages/AppTemplate.hs 56
-             EmbedAsAttr m (Attr String (URL m)),
+             EmbedAsAttr m (Attr TL.Text (URL m)),
hunk ./src/Scaffolding/Pages/AppTemplate.hs 59
-             EmbedAsChild m (Block ()),
+--             EmbedAsChild m (Block ()),
hunk ./src/Scaffolding/Pages/AppTemplate.hs 61
-             MonadWriter [XML] m) =>
+             MonadWriter [XML] m,
+             StringType m ~ TL.Text
+             ) =>
hunk ./src/Scaffolding/Pages/AppTemplate.hs 78
-             , EmbedAsChild m (Block ())
+--             , EmbedAsChild m (Block ())
hunk ./src/Scaffolding/Pages/AppTemplate.hs 80
-             , EmbedAsAttr m (Attr String (URL m)) ) =>
+             , EmbedAsAttr m (Attr TL.Text (URL m))
+             , StringType m ~ TL.Text
+             ) =>
hunk ./src/Scaffolding/Pages/AppTemplate.hs 94
-lightTemplate :: ( ToMessage (HSX.XMLType m)
+lightTemplate :: ( ToMessage (XMLType m)
hunk ./src/Scaffolding/Pages/AppTemplate.hs 96
-                 , EmbedAsAttr m (Attr String (URL m))
+                 , EmbedAsAttr m (Attr TL.Text (URL m))
hunk ./src/Scaffolding/Pages/AppTemplate.hs 103
-                 , EmbedAsChild m (Block ())
-                 , EmbedAsChild m XML ) =>
+--                 , EmbedAsChild m (Block ())
+                 , EmbedAsChild m XML
+                 , StringType m ~ TL.Text
+                 ) =>
hunk ./src/Scaffolding/Pages/AppTemplate.hs 121
-                  , EmbedAsAttr m (Attr String (URL m))
+                  , EmbedAsAttr m (Attr TL.Text (URL m))
hunk ./src/Scaffolding/Pages/AppTemplate.hs 125
-                  , EmbedAsChild m (Block ())
-                  , EmbedAsChild m XML ) =>
+--                  , EmbedAsChild m (Block ())
+                  , EmbedAsChild m XML
+                  , StringType m ~ TL.Text
+                  ) =>
hunk ./src/Scaffolding/Pages/AppTemplate.hs 143
-          <script type="text/javascript" src="/jquery/jquery.js" ></script> 
+          <script type="text/javascript" src="/jquery/jquery.js" ></script>
hunk ./src/Scaffolding/Pages/AppTemplate.hs 149
-          <title><% title %></title>
+          <title><% TL.pack title %></title>
hunk ./src/Scaffolding/Pages/AppTemplate.hs 160
-             (EmbedAsAttr m (Attr [Char] [Char]),
+             (EmbedAsAttr m (Attr TL.Text TL.Text),
hunk ./src/Scaffolding/Pages/AppTemplate.hs 165
-              EmbedAsChild m (HSX.XMLType m)) =>
+              EmbedAsChild m (XMLType m),
+              StringType m ~ TL.Text) =>
hunk ./src/Scaffolding/Pages/AppTemplate.hs 171
-      <div id="two-column-left"> 
+      <div id="two-column-left">
hunk ./src/Scaffolding/Pages/AppTemplate.hs 173
-      </div> 
+      </div>
hunk ./src/Scaffolding/Pages/AppTemplate.hs 180
-instance MonadRender m => Widgets m
-instance MonadRender m => WidgetGenerator m
-instance MonadRender m => NextId (Widget m) where nextId = nextId'
+-- instance MonadRender m => Widgets m
+-- instance MonadRender m => WidgetGenerator m
+-- instance MonadRender m => NextId (Widget m) where nextId = nextId'
hunk ./src/Scaffolding/Pages/Common.hs 2
-{-# OPTIONS_GHC -F -pgmFtrhsx #-}
+{-# OPTIONS_GHC -F -pgmFhsx2hs #-}
hunk ./src/Scaffolding/Pages/Common.hs 4
-module Scaffolding.Pages.Common 
+module Scaffolding.Pages.Common
hunk ./src/Scaffolding/Pages/Common.hs 14
+import qualified Data.Text.Lazy as TL
hunk ./src/Scaffolding/Pages/Common.hs 17
-import HJScript.Utils ()
-import HSP hiding (escape)
-import qualified HSX.XMLGenerator as HSX
+-- import HJScript.Utils ()
+import HSP
hunk ./src/Scaffolding/Pages/Common.hs 28
-seeOtherXML loc = (seeOther loc =<< (<a href=loc><%  loc %></a>))
+seeOtherXML loc = (seeOther loc =<< (<a href=(TL.pack loc)><%  TL.pack loc %></a>))
hunk ./src/Scaffolding/Pages/Common.hs 30
-seeOtherResponse :: (Happstack m, MonadRender m, ToMessage (HSX.XMLType m)) => String -> m Response
+seeOtherResponse :: (Happstack m, MonadRender m, ToMessage (XMLType m)) => String -> m Response
hunk ./src/Scaffolding/Pages/Common.hs 35
-seeOtherURLParams url params res = 
+seeOtherURLParams url params res =
hunk ./src/Scaffolding/Pages/Common.hs 43
-makeForm :: (Happstack m, MonadRoute m, MonadRender m, ToMessage (HSX.XMLType m), EmbedAsChild m xml) =>
+makeForm :: (Happstack m, MonadRoute m, MonadRender m, ToMessage (XMLType m), EmbedAsChild m xml) =>
hunk ./src/Scaffolding/Pages/FormPart.hs 1
-{-# LANGUAGE FlexibleContexts #-}
-{-# OPTIONS_GHC -Wall -Werror -F -pgmFtrhsx #-}
+{-# LANGUAGE FlexibleContexts, TypeFamilies, OverloadedStrings #-}
+{-# OPTIONS_GHC -Wall -Werror -F -pgmFhsx2hs #-}
hunk ./src/Scaffolding/Pages/FormPart.hs 26
+import qualified Data.Text.Lazy as TL
hunk ./src/Scaffolding/Pages/FormPart.hs 29
-import HSP (XMLGenerator, XMLGenT(..), Attr(..), EmbedAsAttr(..), EmbedAsChild(..), SetAttr, GenXML, (<@), genElement, genEElement, unXMLGenT)
-import Happstack.Server.HSX       () -- instance (ServerMonad XMLGenT)
-import qualified HSX.XMLGenerator as HSX
+import HSP (XMLGenerator, XMLGenT(..), Attr(..), EmbedAsAttr(..), EmbedAsChild(..), SetAttr, GenXML, StringType, XMLType, (<@), genElement, genEElement, unXMLGenT, fromStringLit)
+import Happstack.Server.XMLGenT       () -- instance (ServerMonad XMLGenT)
hunk ./src/Scaffolding/Pages/FormPart.hs 32
-import Text.Digestive ((++>), Validator, Transformer, Form(..), FormRange(..), Result(..), 
+import Text.Digestive ((++>), Validator, Transformer, Form(..), FormRange(..), Result(..),
hunk ./src/Scaffolding/Pages/FormPart.hs 41
-  (EmbedAsChild m xml, EmbedAsAttr m (Attr String String), EmbedAsAttr m (Attr String Text), ToMessage b, Happstack m, Alternative m)
+  (EmbedAsChild m xml, EmbedAsAttr m (Attr TL.Text TL.Text), ToMessage b, Happstack m, Alternative m, StringType m ~ TL.Text)
hunk ./src/Scaffolding/Pages/FormPart.hs 48
-formPart prefix action handleSuccess mHandleFailure form =
-  XMLGenT $ 
+formPart prefix action' handleSuccess mHandleFailure form =
+  let action = TL.fromStrict action' in
+  XMLGenT $
hunk ./src/Scaffolding/Pages/FormPart.hs 53
-              unXMLGenT $ 
+              unXMLGenT $
hunk ./src/Scaffolding/Pages/FormPart.hs 71
-                          unXMLGenT $ 
+                          unXMLGenT $
hunk ./src/Scaffolding/Pages/FormPart.hs 79
-                  EmbedAsAttr m (Attr String String),
-                  EmbedAsAttr m (Attr String Text),
+                  EmbedAsAttr m (Attr TL.Text TL.Text),
+                  StringType m ~ TL.Text,
hunk ./src/Scaffolding/Pages/FormPart.hs 125
-nullToNothing = 
+nullToNothing =
hunk ./src/Scaffolding/Pages/FormPart.hs 130
-          
+
hunk ./src/Scaffolding/Pages/FormPart.hs 133
-                
-rowsToList :: (XMLGenerator x, Monoid b, Functor m, Monad m, EmbedAsChild x c, EmbedAsAttr x (Attr String a)) =>
+
+rowsToList :: (XMLGenerator x, Monoid b, Functor m, Monad m, EmbedAsChild x c, EmbedAsAttr x (Attr TL.Text a), StringType x ~ TL.Text) =>
hunk ./src/Scaffolding/Pages/FormPart.hs 137
-rowsToList class' rows 
+rowsToList class' rows
hunk ./src/Scaffolding/Pages/FormPart.hs 143
-rowsToColumn :: (EmbedAsChild x [Char], Monoid b, Functor m, Monad m) =>
-                [Form m i e [GenXML x] b] -> Form m i e [XMLGenT x (HSX.XMLType x)] b
+rowsToColumn :: (XMLGenerator x, StringType x ~ TL.Text, Monoid b, Functor m, Monad m) =>
+                [Form m i e [GenXML x] b] -> Form m i e [XMLGenT x (XMLType x)] b
hunk ./src/Scaffolding/Pages/FormPart.hs 148
-submitOnChange :: (EmbedAsAttr m (Attr String String), SetAttr m elem) => elem -> GenXML m
-submitOnChange elm = elm <@ ("onChange" := "submit()")
+submitOnChange :: (EmbedAsAttr m (Attr TL.Text TL.Text), SetAttr m elem) => elem -> GenXML m
+submitOnChange elm = elm <@ (("onChange" := "submit()")  :: Attr TL.Text TL.Text)
hunk ./src/Scaffolding/Pages/InternalServerError.hs 2
-{-# OPTIONS_GHC -F -pgmFtrhsx #-}
+{-# OPTIONS_GHC -F -pgmFhsx2hs #-}
hunk ./src/Scaffolding/Pages/InternalServerError.hs 7
+import qualified Data.Text.Lazy as TL
hunk ./src/Scaffolding/Pages/InternalServerError.hs 9
-import HSP (Attr(..), EmbedAsAttr(..), EmbedAsChild(..), genElement)
-import qualified HSX.XMLGenerator as HSX
+import HSP (Attr(..), EmbedAsAttr(..), EmbedAsChild(..), XMLType, genElement, fromStringLit)
hunk ./src/Scaffolding/Pages/InternalServerError.hs 15
-internalServerErrorPage :: (Happstack m, MonadRoute m, MonadUser m, MonadRender m, HasAppConf m, EmbedAsAttr m (Attr String (URL m)), ToMessage (HSX.XMLType m)) => String -> m Response
+internalServerErrorPage :: (Happstack m, MonadRoute m, MonadUser m, MonadRender m, HasAppConf m, EmbedAsAttr m (Attr TL.Text (URL m)), ToMessage (XMLType m)) => String -> m Response
hunk ./src/Scaffolding/Pages/InternalServerError.hs 17
-    do unauthorized =<< template "Internal Server Error" () 
+    do unauthorized =<< template "Internal Server Error" ()
hunk ./src/Scaffolding/Pages/InternalServerError.hs 20
-           <p><% msg %></p>
+           <p><% TL.pack msg %></p>
hunk ./src/Scaffolding/Pages/Unauthorized.hs 2
-{-# OPTIONS_GHC -F -pgmFtrhsx #-}
+{-# OPTIONS_GHC -F -pgmFhsx2hs #-}
hunk ./src/Scaffolding/Pages/Unauthorized.hs 7
+import qualified Data.Text.Lazy as TL
hunk ./src/Scaffolding/Pages/Unauthorized.hs 9
-import HSP (Attr(..), EmbedAsAttr(..), EmbedAsChild(..), genElement)
-import qualified HSX.XMLGenerator as HSX
+import HSP (Attr(..), EmbedAsAttr(..), EmbedAsChild(..), XMLType, genElement, fromStringLit)
hunk ./src/Scaffolding/Pages/Unauthorized.hs 16
-unauthorizedPage :: (Happstack m, MonadRoute m, MonadUser m, MonadRender m, HasAppConf m, EmbedAsAttr m (Attr String (URL m)), ToMessage (HSX.XMLType m)) =>
+unauthorizedPage :: (Happstack m, MonadRoute m, MonadUser m, MonadRender m, HasAppConf m, EmbedAsAttr m (Attr TL.Text (URL m)), ToMessage (XMLType m)) =>
hunk ./src/Scaffolding/Pages/Unauthorized.hs 19
-    do unauthorized =<< template "Unauthorized" () 
+    do unauthorized =<< template "Unauthorized" ()
hunk ./src/Scaffolding/Pages/Unauthorized.hs 22
-           <p><% msg %></p>
+           <p><% TL.pack msg %></p>
hunk ./src/Scaffolding/Pages/UnicodeKey.hs 2
-{-# LANGUAGE FlexibleContexts, FlexibleInstances, PackageImports, RankNTypes, ScopedTypeVariables, TypeFamilies, NoMonomorphismRestriction #-}
-{-# OPTIONS -Wwarn -F -pgmFtrhsx -fcontext-stack=40 -fno-warn-orphans -fno-warn-name-shadowing #-}
+{-# LANGUAGE FlexibleContexts, FlexibleInstances, PackageImports, RankNTypes, ScopedTypeVariables, TypeFamilies, NoMonomorphismRestriction, OverloadedStrings #-}
+{-# OPTIONS -Wwarn -F -pgmFhsx2hs -fcontext-stack=40 -fno-warn-orphans -fno-warn-name-shadowing #-}
hunk ./src/Scaffolding/Pages/UnicodeKey.hs 9
+import qualified Data.Text.Lazy as TL
hunk ./src/Scaffolding/Pages/UnicodeKey.hs 12
-import HJScript.Utils ()
+-- import HJScript.Utils ()
hunk ./src/Scaffolding/Pages/UnicodeKey.hs 14
-import qualified HSX.XMLGenerator as HSX
hunk ./src/Scaffolding/Pages/UnicodeKey.hs 22
-unicodeKeyPage :: (Happstack m, MonadRoute m, MonadUser m, MonadRender m, HasAppConf m, EmbedAsAttr m (Attr String (URL m)), ToMessage (HSX.XMLType m)) => m Response
+unicodeKeyPage :: (Happstack m, MonadRoute m, MonadUser m, MonadRender m, HasAppConf m, EmbedAsAttr m (Attr TL.Text (URL m)), ToMessage (XMLType m), StringType m ~ TL.Text) => m Response
hunk ./src/Scaffolding/Pages/UnicodeKey.hs 27
-      tuplesOfInterest' :: (XMLGenerator x) => [[ GenXML x ]]
+      tuplesOfInterest' :: (XMLGenerator x, StringType x ~ TL.Text) => [[ GenXML x ]]
hunk ./src/Scaffolding/Pages/UnicodeKey.hs 30
-                fmt (s,c) = <table> <tr> <td style="width: 4em"> <% show c %> </td> <td style="width: 1em"> <% (c:[]) %> </td> <td> <% s %> </td> </tr></table>
+                fmt (s,c) = <table> <tr> <td style="width: 4em"> <% TL.pack $ show c %> </td> <td style="width: 1em"> <% TL.singleton c %> </td> <td> <% TL.pack s %> </td> </tr></table>
hunk ./src/Scaffolding/Pages/UnicodeKey.hs 35
-      table :: (XMLGenerator x) => [[GenXML x]] -> GenXML x
+      table :: (XMLGenerator x, StringType x ~ TL.Text) => [[GenXML x]] -> GenXML x
hunk ./src/Scaffolding/ProfileData/Markup.hs 2
-{-# OPTIONS -F -pgmFtrhsx #-}
+{-# OPTIONS -F -pgmFhsx2hs #-}
hunk ./src/Scaffolding/ProfileData/Markup.hs 8
-import Data.Text (Text)
-import qualified Data.Text as T
+import qualified Data.Text.Lazy as TL
hunk ./src/Scaffolding/ProfileData/Markup.hs 10
-import HSP (GenXML, XMLGenerator, EmbedAsAttr(..), genElement, asChild, Attr((:=)), asAttr)
+import HSP (GenXML, XMLGenerator, EmbedAsAttr(..), StringType, genElement, asChild, Attr((:=)), asAttr, fromStringLit)
hunk ./src/Scaffolding/ProfileData/Markup.hs 16
-userMarkup :: (MonadRoute m, MonadUserName m, MkURL (URL m), MonadIO m, XMLGenerator m, EmbedAsAttr m (Attr String Text)) =>
+userMarkup :: (MonadRoute m, MonadUserName m, MkURL (URL m), MonadIO m, XMLGenerator m, EmbedAsAttr m (Attr TL.Text TL.Text), StringType m ~ TL.Text) =>
hunk ./src/Scaffolding/ProfileData/Markup.hs 21
-       <span><% link %>:<% either show T.unpack name %></span>
+       <span><% link %>:<% either (TL.pack . show) TL.fromStrict name %></span>
hunk ./src/Scaffolding/ProfileData/Markup.hs 23
-userLink :: (MonadRoute m, MonadUserName m, MkURL (URL m), XMLGenerator m, EmbedAsAttr m (Attr String Text)) =>
+userLink :: (MonadRoute m, MonadUserName m, MkURL (URL m), XMLGenerator m, EmbedAsAttr m (Attr TL.Text TL.Text), StringType m ~ TL.Text) =>
hunk ./src/Scaffolding/ProfileData/Markup.hs 27
-       <a href=url>U<% show (unUserId u) %></a>
+       <a href=(TL.fromStrict url)>U<% TL.pack $ show (unUserId u) %></a>
hunk ./src/Scaffolding/ProfileData/Pages.hs 2
-{-# OPTIONS_GHC -F -pgmFtrhsx -Wall -Wwarn #-}
+{-# OPTIONS_GHC -F -pgmFhsx2hs -Wall -Wwarn #-}
hunk ./src/Scaffolding/ProfileData/Pages.hs 15
+import qualified Data.Text.Lazy    as TL
hunk ./src/Scaffolding/ProfileData/Pages.hs 19
-import qualified HSX.XMLGenerator as HSX
hunk ./src/Scaffolding/ProfileData/Pages.hs 34
-editProfileDataPage :: forall m. (Happstack m, MonadRoute m, MonadUserName m, MkURL (URL m), MonadIO m, MonadRender m, HasAppConf m, EmbedAsAttr m (Attr String (URL m)), ToMessage (HSX.XMLType m)) =>
+editProfileDataPage :: forall m. (Happstack m, MonadRoute m, MonadUserName m, MkURL (URL m), MonadIO m, MonadRender m, HasAppConf m, EmbedAsAttr m (Attr TL.Text (URL m)), ToMessage (XMLType m)) =>
hunk ./src/Scaffolding/ProfileData/Pages.hs 72
-     ((,,,) <$> (li $ (label "your name: "  ++> inputText username)) 
-            <*> (li $ (label "your email: " ++> (inputText email `transform` nullToNothing)))
-            <*> (li $ (inputCheckBox optOut <++ label "opt-out of email list."))
-            <*> (li $ (inputCheckBox (Set.member ProfileData.User roles)  <++ label "add to User group."))
+     ((,,,) <$> (li $ (label (TL.pack "your name: ")  ++> inputText username))
+            <*> (li $ (label (TL.pack "your email: ") ++> (inputText email `transform` nullToNothing)))
+            <*> (li $ (inputCheckBox optOut <++ label (TL.pack "opt-out of email list.")))
+            <*> (li $ (inputCheckBox (Set.member ProfileData.User roles)  <++ label (TL.pack "add to User group.")))
hunk ./src/Scaffolding/ProfileData/Pages.hs 78
-editUserNamePage :: (Happstack m, MonadRoute m, MonadUserName m, MkURL (URL m), MonadRender m, HasAppConf m, EmbedAsAttr m (Attr String (URL m)), ToMessage (HSX.XMLType m)) =>
+editUserNamePage :: (Happstack m, MonadRoute m, MonadUserName m, MkURL (URL m), MonadRender m, HasAppConf m, EmbedAsAttr m (Attr TL.Text (URL m)), ToMessage (XMLType m), StringType m ~ TL.Text) =>
hunk ./src/Scaffolding/ProfileData/Pages.hs 99
-editUserNameForm :: (FormInput i f, XMLGenerator x, Functor m, Monad m) =>
+editUserNameForm :: (FormInput i f, XMLGenerator x, Functor m, Monad m, StringType x ~ TL.Text) =>
hunk ./src/Scaffolding/ProfileData/Pages.hs 101
-editUserNameForm mUsername = 
-    (label "your name: " ++> inputText mUsername) <* submit "change name"
+editUserNameForm mUsername =
+    (label (TL.pack "your name: ") ++> inputText mUsername) <* submit "change name"
hunk ./src/Scaffolding/ProfileData/Pages.hs 108
-               EmbedAsAttr m (Attr String (URL m)),
+               EmbedAsAttr m (Attr TL.Text (URL m)),
hunk ./src/Scaffolding/ProfileData/Pages.hs 110
+               StringType m ~ TL.Text,
hunk ./src/Scaffolding/ProfileData/Parts.hs 2
-module Scaffolding.ProfileData.Parts 
+module Scaffolding.ProfileData.Parts
hunk ./src/Scaffolding/ProfileData/Parts.hs 10
+import qualified Data.Text.Lazy as TL
hunk ./src/Scaffolding/ProfileData/Parts.hs 12
-import Happstack.Server 
-import HSP (EmbedAsAttr, Attr)
-import qualified HSX.XMLGenerator as HSX
+import Happstack.Server
+import HSP (EmbedAsAttr, Attr, XMLType)
hunk ./src/Scaffolding/ProfileData/Parts.hs 25
-           EmbedAsAttr m (Attr String (URL m)), ToMessage (HSX.XMLType m)) =>
+           EmbedAsAttr m (Attr TL.Text (URL m)), ToMessage (XMLType m)) =>