[Move XMLMetaData pieces to more reasonable locations jeremy@n-heptane.com**20080714211202 This is just some reorganization as part of getting the patches into upstream. ] { hunk ./src/HSP.hs 3 - HSP, HSPT, HSPT', XMLMetaData(..), runHSP, evalHSP, runHSPT, evalHSPT, getEnv, - getParam, getIncNumber, doIO, catch, setMetaData, withMetaData, html4Strict, html4StrictFrag, + HSP, HSPT, HSPT', runHSP, evalHSP, runHSPT, evalHSPT, getEnv, + getParam, getIncNumber, doIO, catch, setMetaData, withMetaData, hunk ./src/HSP/HTML.hs 24 + -- * Predefined XMLMetaData + , html4Strict + , html4StrictFrag hunk ./src/HSP/HTML.hs 94 +renderElement :: Int -> XML -> String -> String hunk ./src/HSP/HTML.hs 138 +-- * Pre-defined XMLMetaData + +html4Strict :: Maybe XMLMetaData +html4Strict = Just $ + XMLMetaData { doctype = (True, "\n") + , contentType = "text/html" + , preferredRenderer = renderAsHTML + } + +html4StrictFrag :: Maybe XMLMetaData +html4StrictFrag = Just $ + XMLMetaData { doctype = (False, "\n") + , contentType = "text/html" + , preferredRenderer = renderAsHTML + } + hunk ./src/HSP/Monad.hs 20 - HSP, HSPT, HSPT', XMLMetaData(..), html4Strict, html4StrictFrag, + HSP, HSPT, HSPT', hunk ./src/HSP/Monad.hs 43 -import HSP.HTML hunk ./src/HSP/Monad.hs 55 -data XMLMetaData = XMLMetaData - { doctype :: (Bool, String) - , contentType :: String - , preferredRenderer :: XML -> String - } - -html4Strict :: Maybe XMLMetaData -html4Strict = Just $ - XMLMetaData { doctype = (True, "\n") - , contentType = "text/html" - , preferredRenderer = renderAsHTML - } - -html4StrictFrag :: Maybe XMLMetaData -html4StrictFrag = Just $ - XMLMetaData { doctype = (False, "\n") - , contentType = "text/html" - , preferredRenderer = renderAsHTML - } - hunk ./src/HSP/XML.hs 17 + XMLMetaData(..), hunk ./src/HSP/XML.hs 49 +-- |The XMLMetaData datatype +-- +-- Specify the DOCTYPE, content-type, and preferred render for XML data. +-- +-- See also: 'HSP.Monad.setMetaData' and 'HSP.Monad.withMetaData' +data XMLMetaData = XMLMetaData + { doctype :: (Bool, String) -- ^ (show doctype when rendering, DOCTYPE string) + , contentType :: String + , preferredRenderer :: XML -> String + } + }