diff --git a/HsColour.hs b/HsColour.hs --- a/HsColour.hs +++ b/HsColour.hs @@ -10,7 +10,7 @@ import List (intersperse, isSuffixOf) import Debug.Trace -version = "1.14" +version = "1.15" optionTable :: [(String,Option)] optionTable = [ ("help", Help) diff --git a/Language/Haskell/HsColour.hs b/Language/Haskell/HsColour.hs --- a/Language/Haskell/HsColour.hs +++ b/Language/Haskell/HsColour.hs @@ -38,27 +38,39 @@ -> String -- ^ Haskell source code. -> String -- ^ Coloured Haskell source code. hscolour output pref anchor partial title False = - hscolour' output pref anchor partial title + (if partial then id else top'n'tail output title) . + hscolour' output pref anchor hscolour output pref anchor partial title True = + (if partial then id else top'n'tail output title) . concatMap chunk . joinL . classify . inlines where - chunk (Code c) = hscolour' output pref anchor True title c + chunk (Code c) = hscolour' output pref anchor c chunk (Lit c) = c +-- | The actual colourising worker, despatched on the chosen output format. hscolour' :: Output -- ^ Output format. -> ColourPrefs -- ^ Colour preferences (for formats that support them) -> Bool -- ^ Whether to include anchors. - -> Bool -- ^ Whether output document is partial or complete. - -> String -- ^ Title for output. -> String -- ^ Haskell source code. -> String -- ^ Coloured Haskell source code. -hscolour' TTY pref _ _ _ = TTY.hscolour pref -hscolour' MIRC pref _ _ _ = MIRC.hscolour pref -hscolour' LaTeX pref _ partial _ = LaTeX.hscolour pref partial -hscolour' HTML pref anch partial top = HTML.hscolour pref anch partial top -hscolour' CSS _ anch partial top = CSS.hscolour anch partial top -hscolour' ICSS pref anch partial top = ICSS.hscolour pref anch partial top +hscolour' TTY pref _ = TTY.hscolour pref +hscolour' MIRC pref _ = MIRC.hscolour pref +hscolour' LaTeX pref _ = LaTeX.hscolour pref +hscolour' HTML pref anchor = HTML.hscolour pref anchor +hscolour' CSS _ anchor = CSS.hscolour anchor +hscolour' ICSS pref anchor = ICSS.hscolour pref anchor +-- | Choose the right headers\/footers, depending on the output format. +top'n'tail :: Output -- ^ Output format + -> String -- ^ Title for output + -> (String->String) -- ^ Output transformer +top'n'tail TTY _ = id +top'n'tail MIRC _ = id +top'n'tail LaTeX title = LaTeX.top'n'tail title +top'n'tail HTML title = HTML.top'n'tail title +top'n'tail CSS title = CSS.top'n'tail title +top'n'tail ICSS title = ICSS.top'n'tail title + -- | Separating literate files into code\/comment chunks. data Lit = Code {unL :: String} | Lit {unL :: String} deriving (Show) @@ -75,7 +87,7 @@ lines' (c:s) acc = lines' s (acc . (c:)) --- The code for classify is largely stolen from Language.Preprocessor.Unlit. +-- | The code for classify is largely stolen from Language.Preprocessor.Unlit. classify [] = [] classify (x:xs) | "\\begin{code}"`isPrefixOf`x = Lit x: allProg xs @@ -87,7 +99,7 @@ classify (('>':x):xs) = Code ('>':x) : classify xs classify (x:xs) = Lit x: classify xs --- Join up chunks of code/comment that are next to each other. +-- | Join up chunks of code\/comment that are next to each other. joinL :: [Lit] -> [Lit] joinL [] = [] joinL (Code c:Code c2:xs) = joinL (Code (c++c2):xs) diff --git a/Language/Haskell/HsColour/CSS.hs b/Language/Haskell/HsColour/CSS.hs --- a/Language/Haskell/HsColour/CSS.hs +++ b/Language/Haskell/HsColour/CSS.hs @@ -1,5 +1,5 @@ -- | Formats Haskell source code as HTML with CSS. -module Language.Haskell.HsColour.CSS (hscolour) where +module Language.Haskell.HsColour.CSS (hscolour,top'n'tail) where import Language.Haskell.HsColour.Anchors import Language.Haskell.HsColour.Classify as Classify @@ -8,15 +8,11 @@ -- | Formats Haskell source code as a complete HTML document with CSS. hscolour :: Bool -- ^ Whether to include anchors. - -> Bool -- ^ Whether output should be partial - -- (= no stylesheet link will be included.) - -> String -- ^ Title for HTML page. -> String -- ^ Haskell source code. -> String -- ^ An HTML document containing the coloured -- Haskell source code. -hscolour anchor partial title = - (if partial then id else top'n'tail title) - . pre +hscolour anchor = + pre . (if anchor then renderNewLinesAnchors . concatMap (renderAnchors renderToken) diff --git a/Language/Haskell/HsColour/HTML.hs b/Language/Haskell/HsColour/HTML.hs --- a/Language/Haskell/HsColour/HTML.hs +++ b/Language/Haskell/HsColour/HTML.hs @@ -1,8 +1,10 @@ -- | Formats Haskell source code using HTML with font tags. module Language.Haskell.HsColour.HTML - (hscolour, + ( hscolour + , top'n'tail -- * Internals - renderAnchors, renderComment, renderNewLinesAnchors, escape) where + , renderAnchors, renderComment, renderNewLinesAnchors, escape + ) where import Language.Haskell.HsColour.Anchors import Language.Haskell.HsColour.Classify as Classify @@ -14,13 +16,10 @@ -- | Formats Haskell source code using HTML with font tags. hscolour :: ColourPrefs -- ^ Colour preferences. -> Bool -- ^ Whether to include anchors. - -> Bool -- ^ Whether output should be partial. - -> String -- ^ Title for webpage output. -> String -- ^ Haskell source code. -> String -- ^ Coloured Haskell source code. -hscolour pref anchor partial title = - (if partial then id else top'n'tail title) - . pre +hscolour pref anchor = + pre . (if anchor then renderNewLinesAnchors . concatMap (renderAnchors (renderToken pref)) . insertAnchors diff --git a/Language/Haskell/HsColour/InlineCSS.hs b/Language/Haskell/HsColour/InlineCSS.hs --- a/Language/Haskell/HsColour/InlineCSS.hs +++ b/Language/Haskell/HsColour/InlineCSS.hs @@ -1,5 +1,5 @@ -- | Formats Haskell source code as HTML with inline CSS. -module Language.Haskell.HsColour.InlineCSS (hscolour) where +module Language.Haskell.HsColour.InlineCSS (hscolour,top'n'tail) where import Language.Haskell.HsColour.Anchors import Language.Haskell.HsColour.Classify as Classify @@ -10,15 +10,11 @@ -- | Formats Haskell source code as a complete HTML document with inline styling hscolour :: ColourPrefs -- ^ Preferences for styling. -> Bool -- ^ Whether to include anchors. - -> Bool -- ^ Whether output should be partial - -- (= no document headers will be included.) - -> String -- ^ Title for HTML page. -> String -- ^ Haskell source code. -> String -- ^ An HTML document containing the coloured -- Haskell source code. -hscolour prefs anchor partial title = - (if partial then id else top'n'tail title) - . pre +hscolour prefs anchor = + pre . (if anchor then renderNewLinesAnchors . concatMap (renderAnchors (renderToken prefs)) diff --git a/Language/Haskell/HsColour/LaTeX.hs b/Language/Haskell/HsColour/LaTeX.hs --- a/Language/Haskell/HsColour/LaTeX.hs +++ b/Language/Haskell/HsColour/LaTeX.hs @@ -1,5 +1,5 @@ -- | Formats Haskell source code using LaTeX macros. -module Language.Haskell.HsColour.LaTeX (hscolour) where +module Language.Haskell.HsColour.LaTeX (hscolour, top'n'tail) where import Language.Haskell.HsColour.Classify as Classify import Language.Haskell.HsColour.Colourise @@ -7,17 +7,13 @@ -- | Formats Haskell source code as a complete LaTeX document. hscolour :: ColourPrefs -- ^ Colour preferences. - -> Bool -- ^ Whether output should be partial (= no prologue). -> String -- ^ Haskell source code. -> String -- ^ A LaTeX document\/fragment containing the coloured -- Haskell source code. -hscolour pref partial = - ( if partial then id else top'n'tail) - . concatMap (renderToken pref) - . tokenise +hscolour pref = concatMap (renderToken pref) . tokenise -top'n'tail :: String -> String -top'n'tail = (latexPrefix++) . (++latexSuffix) +top'n'tail :: String -> String -> String +top'n'tail title = (latexPrefix title++) . (++latexSuffix) -- | Wrap each lexeme in the appropriate LaTeX macro. -- TODO: filter dangerous characters like "{}_$" @@ -88,7 +84,7 @@ latexColour White = "white" -- | Generic LaTeX document preamble. -latexPrefix = unlines +latexPrefix title = unlines ["\\documentclass[a4paper, 12pt]{article}" ,"\\usepackage[usenames]{color}" ,"\\usepackage{hyperref}" @@ -99,7 +95,10 @@ ,"\\newcommand{\\hsspace}{\\usebox{\\spaceb}}" ,"\\newcommand{\\hstab}{\\usebox{\\tabb}}" ,"\\newcommand{\\conceal}[1]{}" + ,"\\title{"++title++"}" + ,"%% Generated by HsColour" ,"\\begin{document}" + ,"\\maketitle" ,"\\noindent" ] diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ LIBRARY = hscolour -VERSION = 1.14 +VERSION = 1.15 DIRS = Language/Haskell/HsColour diff --git a/README b/README --- a/README +++ b/README @@ -30,15 +30,17 @@ classes). This enables you to make links to a specific location in the generated file with the standard "file.html#anchor" notation. -If you want to embed several individually colourised fragments into a -larger document, then use the -partial option , to omit the -HTML DOCTYPE header, CSS stylesheet link, or LaTeX prologue. +If an input file is literate, that is, it has a suffix ".lhs" or ".ly" +or ".lx", then only the code fragments will be colourised, leaving the +commentary untouched. You can explicitly override this +filename-guessing of literate status: use the -lit option to +force literate colouring, or -nolit to force all text to be +colourised. (-lit-tex is an obsolete synonym for -lit) -Alternatively, if you have a literate input source (e.g. .lhs file), -then the -lit option passes the literate parts untouched, -and colourises only the code fragments as if each was called -individually with -partial. The option -lit-tex is identical: it is -retained for backwards-compatibility only. +For more advanced usage, if you are building documents in parts, and you +want to embed several individually colourised fragments into a larger +document, use the -partial option with each fragment, to omit +the HTML DOCTYPE header, CSS stylesheet link, or LaTeX prologue. You can configure the colours for different lexical entities by editing a configuration file called .hscolour in the current directory. diff --git a/docs/hscolour/Language-Haskell-HsColour-CSS.html b/docs/hscolour/Language-Haskell-HsColour-CSS.html --- a/docs/hscolour/Language-Haskell-HsColour-CSS.html +++ b/docs/hscolour/Language-Haskell-HsColour-CSS.html @@ -90,8 +90,18 @@ >hscolour :: Bool -> Bool -> String -> String -> String :: Bool -> String -> Stringtop'n'tail :: String -> String -> String-> BoolWhether output should be partial - (= no stylesheet link will be included.) --> StringTitle for HTML page. --> StringHaskell source code. Formats Haskell source code as a complete HTML document with CSS.
top'n'tail :: String -> String -> StringSource
hscolour :: ColourPrefs -> Bool -> Bool -> String -> String -> String -> Bool -> String -> Stringtop'n'tail :: String -> String -> StringrenderAnchors :: ((-> BoolWhether output should be partial. --> StringTitle for webpage output. --> StringHaskell source code. Formats Haskell source code using HTML with font tags.
top'n'tail :: String -> String -> StringSource
hscolour :: ColourPrefs -> Bool -> Bool -> String -> String -> String -> Bool -> String -> Stringtop'n'tail :: String -> String -> String-> BoolWhether output should be partial - (= no document headers will be included.) --> StringTitle for HTML page. --> StringHaskell source code. Formats Haskell source code as a complete HTML document with inline styling
top'n'tail :: String -> String -> StringSource
hscolour :: ColourPrefs -> Bool -> String -> String -> String -> Stringtop'n'tail :: String -> String -> String-> BoolWhether output should be partial (= no prologue). --> StringHaskell source code. @@ -165,6 +168,28 @@ >Formats Haskell source code as a complete LaTeX document.
top'n'tail :: String -> String -> StringSource
-> String -- ^ Haskell source code. -> String -- ^ Coloured Haskell source code. hscolour output pref anchor partial title False = - hscolour' output pref anchor partial title -hscolour output pref anchor partial title True = - concatMap chunk . joinL . classify . inlines - where - chunk (Code c) = hscolour' output pref anchor True title c - chunk (Lit c) = c - -hscolour' :: Output -- ^ Output format. - -> ColourPrefs -- ^ Colour preferences (for formats that support them) - -> Bool -- ^ Whether to include anchors. - -> Bool -- ^ Whether output document is partial or complete. - -> String -- ^ Title for output. - -> String -- ^ Haskell source code. - -> String -- ^ Coloured Haskell source code. -hscolour' TTY pref _ _ _ = TTY.hscolour pref -hscolour' MIRC pref _ _ _ = MIRC.hscolour pref -hscolour' LaTeX pref _ partial _ = LaTeX.hscolour pref partial -hscolour' HTML pref anch partial top = HTML.hscolour pref anch partial top -hscolour' CSS _ anch partial top = CSS.hscolour anch partial top -hscolour' ICSS pref anch partial top = ICSS.hscolour pref anch partial top - --- | Separating literate files into code\/comment chunks. -data Lit = Code {unL :: String} | Lit {unL :: String} deriving (Show) - --- Re-implementation of 'lines', for better efficiency (but decreased laziness). --- Also, importantly, accepts non-standard DOS and Mac line ending characters. --- And retains the trailing '\n' character in each resultant string. -inlines :: String -> [String] -inlines s = lines' s id - where - lines' [] acc = [acc []] - lines' ('\^M':'\n':s) acc = acc ['\n'] : lines' s id -- DOS ---lines' ('\^M':s) acc = acc ['\n'] : lines' s id -- MacOS - lines' ('\n':s) acc = acc ['\n'] : lines' s id -- Unix - lines' (c:s) acc = lines' s (acc . (c:)) + (if partial then id else top'n'tail output title) . + hscolour' output pref anchor +hscolour output pref anchor partial title True = + (if partial then id else top'n'tail output title) . + concatMap chunk . joinL . classify . inlines + where + chunk (Code c) = hscolour' output pref anchor c + chunk (Lit c) = c + +-- | The actual colourising worker, despatched on the chosen output format. +hscolour' :: Output -- ^ Output format. + -> ColourPrefs -- ^ Colour preferences (for formats that support them) + -> Bool -- ^ Whether to include anchors. + -> String -- ^ Haskell source code. + -> String -- ^ Coloured Haskell source code. +hscolour' TTY pref _ = TTY.hscolour pref +hscolour' MIRC pref _ = MIRC.hscolour pref +hscolour' LaTeX pref _ = LaTeX.hscolour pref +hscolour' HTML pref anchor = HTML.hscolour pref anchor +hscolour' CSS _ anchor = CSS.hscolour anchor +hscolour' ICSS pref anchor = ICSS.hscolour pref anchor + +-- | Choose the right headers\/footers, depending on the output format. +top'n'tail :: Output -- ^ Output format + -> String -- ^ Title for output + -> (String->String) -- ^ Output transformer +top'n'tail TTY _ = id +top'n'tail MIRC _ = id +top'n'tail LaTeX title = LaTeX.top'n'tail title +top'n'tail HTML title = HTML.top'n'tail title +top'n'tail CSS title = CSS.top'n'tail title +top'n'tail ICSS title = ICSS.top'n'tail title + +-- | Separating literate files into code\/comment chunks. +data Lit = Code {unL :: String} | Lit {unL :: String} deriving (Show) - --- The code for classify is largely stolen from Language.Preprocessor.Unlit. -classify [] = [] -classify (x:xs) | "\\begin{code}"`isPrefixOf`x - = Lit x: allProg xs - where allProg [] = [] -- Should give an error message, - -- but I have no good position information. - allProg (x:xs) | "\\end{code}"`isPrefixOf`x - = Lit x: classify xs - allProg (x:xs) = Code x: allProg xs -classify (('>':x):xs) = Code ('>':x) : classify xs -classify (x:xs) = Lit x: classify xs +-- Re-implementation of 'lines', for better efficiency (but decreased laziness). +-- Also, importantly, accepts non-standard DOS and Mac line ending characters. +-- And retains the trailing '\n' character in each resultant string. +inlines :: String -> [String] +inlines s = lines' s id + where + lines' [] acc = [acc []] + lines' ('\^M':'\n':s) acc = acc ['\n'] : lines' s id -- DOS +--lines' ('\^M':s) acc = acc ['\n'] : lines' s id -- MacOS + lines' ('\n':s) acc = acc ['\n'] : lines' s id -- Unix + lines' (c:s) acc = lines' s (acc . (c:)) + --- Join up chunks of code/comment that are next to each other. -joinL :: [Lit] -> [Lit] -joinL [] = [] -joinL (Code c:Code c2:xs) = joinL (Code (c++c2):xs) -joinL (Lit c :Lit c2 :xs) = joinL (Lit (c++c2):xs) -joinL (any:xs) = any: joinL xs - +-- | The code for classify is largely stolen from Language.Preprocessor.Unlit. +classify [] = [] +classify (x:xs) | "\\begin{code}"`isPrefixOf`x + = Lit x: allProg xs + where allProg [] = [] -- Should give an error message, + -- but I have no good position information. + allProg (x:xs) | "\\end{code}"`isPrefixOf`x + = Lit x: classify xs + allProg (x:xs) = Code x: allProg xs +classify (('>':x):xs) = Code ('>':x) : classify xs +classify (x:xs) = Lit x: classify xs + +-- | Join up chunks of code\/comment that are next to each other. +joinL :: [Lit] -> [Lit] +joinL [] = [] +joinL (Code c:Code c2:xs) = joinL (Code (c++c2):xs) +joinL (Lit c :Lit c2 :xs) = joinL (Lit (c++c2):xs) +joinL (any:xs) = any: joinL xs + diff --git a/docs/hscolour/Language/Haskell/HsColour/CSS.html b/docs/hscolour/Language/Haskell/HsColour/CSS.html --- a/docs/hscolour/Language/Haskell/HsColour/CSS.html +++ b/docs/hscolour/Language/Haskell/HsColour/CSS.html @@ -6,7 +6,7 @@ 
-- | Formats Haskell source code as HTML with CSS.
-module Language.Haskell.HsColour.CSS (hscolour) where
+module Language.Haskell.HsColour.CSS (hscolour,top'n'tail) where
 
 import Language.Haskell.HsColour.Anchors
 import Language.Haskell.HsColour.Classify as Classify
@@ -15,69 +15,65 @@
 
 -- | Formats Haskell source code as a complete HTML document with CSS.
 hscolour :: Bool   -- ^ Whether to include anchors.
-         -> Bool   -- ^ Whether output should be partial
-                   --   (= no stylesheet link will be included.)
-         -> String -- ^ Title for HTML page.
-         -> String -- ^ Haskell source code.
-         -> String -- ^ An HTML document containing the coloured 
-                   --   Haskell source code.
-hscolour anchor partial title =
-  (if partial then id else top'n'tail title)
-  . pre
-  . (if anchor 
-        then renderNewLinesAnchors
-             . concatMap (renderAnchors renderToken)
-             . insertAnchors
-        else concatMap renderToken)
-  . tokenise
-
-top'n'tail :: String -> String -> String
-top'n'tail title  = (cssPrefix title ++) . (++cssSuffix)
-
-pre :: String -> String
-pre = ("<pre>"++) . (++"</pre>")
-
-renderToken :: (TokenType,String) -> String
-renderToken (cls,text) =
-        before ++ (if cls == Comment then renderComment text else escape text) ++ after
-    where
-        before = if null cls2 then "" else "<span class='" ++ cls2 ++ "'>"
-        after  = if null cls2 then "" else "</span>"
-        cls2 = cssClass cls
-
-
-cssClass Keyword  = "hs-keyword"
-cssClass Keyglyph = "hs-keyglyph"
-cssClass Layout   = "hs-layout"
-cssClass Comment  = "hs-comment"
-cssClass Conid    = "hs-conid"
-cssClass Varid    = "hs-varid"
-cssClass Conop    = "hs-conop"
-cssClass Varop    = "hs-varop"
-cssClass String   = "hs-str"
-cssClass Char     = "hs-chr"
-cssClass Number   = "hs-num"
-cssClass Cpp      = "hs-cpp"
-cssClass Error    = "hs-sel"
-cssClass Definition = "hs-definition"
-cssClass _        = ""
-
-
-cssPrefix title = unlines
-    ["<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">"
-    ,"<html>"
-    ,"<head>"
-    ,"<!-- Generated by HsColour, http://www.cs.york.ac.uk/fp/darcs/hscolour/ -->"
-    ,"<title>"++title++"</title>"
-    ,"<link type='text/css' rel='stylesheet' href='hscolour.css' />"
-    ,"</head>"
-    ,"<body>"
-    ]
-    
-cssSuffix = unlines
-    ["</body>"
-    ,"</html>"
-    ]
+         -> String -- ^ Haskell source code.
+         -> String -- ^ An HTML document containing the coloured 
+                   --   Haskell source code.
+hscolour anchor =
+  pre
+  . (if anchor 
+        then renderNewLinesAnchors
+             . concatMap (renderAnchors renderToken)
+             . insertAnchors
+        else concatMap renderToken)
+  . tokenise
+
+top'n'tail :: String -> String -> String
+top'n'tail title  = (cssPrefix title ++) . (++cssSuffix)
+
+pre :: String -> String
+pre = ("<pre>"++) . (++"</pre>")
+
+renderToken :: (TokenType,String) -> String
+renderToken (cls,text) =
+        before ++ (if cls == Comment then renderComment text else escape text) ++ after
+    where
+        before = if null cls2 then "" else "<span class='" ++ cls2 ++ "'>"
+        after  = if null cls2 then "" else "</span>"
+        cls2 = cssClass cls
+
+
+cssClass Keyword  = "hs-keyword"
+cssClass Keyglyph = "hs-keyglyph"
+cssClass Layout   = "hs-layout"
+cssClass Comment  = "hs-comment"
+cssClass Conid    = "hs-conid"
+cssClass Varid    = "hs-varid"
+cssClass Conop    = "hs-conop"
+cssClass Varop    = "hs-varop"
+cssClass String   = "hs-str"
+cssClass Char     = "hs-chr"
+cssClass Number   = "hs-num"
+cssClass Cpp      = "hs-cpp"
+cssClass Error    = "hs-sel"
+cssClass Definition = "hs-definition"
+cssClass _        = ""
+
+
+cssPrefix title = unlines
+    ["<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">"
+    ,"<html>"
+    ,"<head>"
+    ,"<!-- Generated by HsColour, http://www.cs.york.ac.uk/fp/darcs/hscolour/ -->"
+    ,"<title>"++title++"</title>"
+    ,"<link type='text/css' rel='stylesheet' href='hscolour.css' />"
+    ,"</head>"
+    ,"<body>"
+    ]
+    
+cssSuffix = unlines
+    ["</body>"
+    ,"</html>"
+    ]
diff --git a/docs/hscolour/Language/Haskell/HsColour/HTML.html b/docs/hscolour/Language/Haskell/HsColour/HTML.html --- a/docs/hscolour/Language/Haskell/HsColour/HTML.html +++ b/docs/hscolour/Language/Haskell/HsColour/HTML.html @@ -7,97 +7,96 @@ 
-- | Formats Haskell source code using HTML with font tags.
 module Language.Haskell.HsColour.HTML 
-    (hscolour, 
-     -- * Internals
-     renderAnchors, renderComment, renderNewLinesAnchors, escape) where
-
-import Language.Haskell.HsColour.Anchors
-import Language.Haskell.HsColour.Classify as Classify
-import Language.Haskell.HsColour.Colourise
-
-import Data.Char(isAlphaNum)
+    ( hscolour
+    , top'n'tail
+     -- * Internals
+    , renderAnchors, renderComment, renderNewLinesAnchors, escape
+    ) where
+
+import Language.Haskell.HsColour.Anchors
+import Language.Haskell.HsColour.Classify as Classify
+import Language.Haskell.HsColour.Colourise
 
-
--- | Formats Haskell source code using HTML with font tags.
-hscolour :: ColourPrefs -- ^ Colour preferences.
-         -> Bool        -- ^ Whether to include anchors.
-         -> Bool        -- ^ Whether output should be partial.
-         -> String      -- ^ Title for webpage output.
+import Data.Char(isAlphaNum)
+
+
+-- | Formats Haskell source code using HTML with font tags.
+hscolour :: ColourPrefs -- ^ Colour preferences.
+         -> Bool        -- ^ Whether to include anchors.
          -> String      -- ^ Haskell source code.
          -> String      -- ^ Coloured Haskell source code.
-hscolour pref anchor partial title = 
-    (if partial then id else top'n'tail title)
-    . pre
-    . (if anchor then renderNewLinesAnchors
-                      . concatMap (renderAnchors (renderToken pref))
-                      . insertAnchors
-                 else concatMap (renderToken pref))
-    . tokenise
-
-top'n'tail :: String -> String -> String
-top'n'tail title = (htmlHeader title ++) . (++htmlClose)
-
-pre :: String -> String
-pre = ("<pre>"++) . (++"</pre>")
-
-renderToken :: ColourPrefs -> (TokenType,String) -> String
-renderToken pref (t,s) = fontify (colourise pref t)
-                         (if t == Comment then renderComment s else escape s)
-
-renderAnchors :: ((TokenType,String)->String)
-                 -> Either String (TokenType,String) -> String
-renderAnchors _      (Left v) = "<a name=\""++v++"\"></a>"
-renderAnchors render (Right r) = render r
-
--- if there are http://links/ in a comment, turn them into
--- hyperlinks
-renderComment :: String -> String
-renderComment xs@('h':'t':'t':'p':':':'/':'/':_) =
-        renderLink a ++ renderComment b
-    where
-        -- see http://www.gbiv.com/protocols/uri/rfc/rfc3986.html#characters
-        isUrlChar x = isAlphaNum x || x `elem` ":/?#[]@!$&'()*+,;=-._~%"
-        (a,b) = span isUrlChar xs
-        renderLink link = "<a href=\"" ++ link ++ "\">" ++ escape link ++ "</a>"
-        
-renderComment (x:xs) = escape [x] ++ renderComment xs
-renderComment [] = []
-
-renderNewLinesAnchors :: String -> String
-renderNewLinesAnchors = unlines . map render . zip [1..] . lines
-    where render (line, s) = "<a name=\"line-" ++ show line ++ "\"></a>" ++ s
-
--- Html stuff
-fontify [] s     = s
-fontify (h:hs) s = font h (fontify hs s)
-
-font Normal         s = s
-font Bold           s = "<b>"++s++"</b>"
-font Dim            s = "<em>"++s++"</em>"
-font Underscore     s = "<u>"++s++"</u>"
-font Blink          s = "<blink>"++s++"</blink>"
-font ReverseVideo   s = s
-font Concealed      s = s
-font (Foreground c) s = "<font color="++show c++">"++s++"</font>"
-font (Background c) s = "<font bgcolor="++show c++">"++s++"</font>"
-font Italic         s = "<i>"++s++"</i>"
-
-escape ('<':cs) = "&lt;"++escape cs
-escape ('>':cs) = "&gt;"++escape cs
-escape ('&':cs) = "&amp;"++escape cs
-escape (c:cs)   = c: escape cs
-escape []       = []
-
-htmlHeader title = unlines
-  [ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">"
-  , "<html>"
-  , "<head>"
-  ,"<!-- Generated by HsColour, http://www.cs.york.ac.uk/fp/darcs/hscolour/ -->"
-  , "<title>"++title++"</title>"
-  , "</head>"
-  , "<body>"
-  ]
-htmlClose  = "\n</body>\n</html>"
+hscolour pref anchor = 
+    pre
+    . (if anchor then renderNewLinesAnchors
+                      . concatMap (renderAnchors (renderToken pref))
+                      . insertAnchors
+                 else concatMap (renderToken pref))
+    . tokenise
+
+top'n'tail :: String -> String -> String
+top'n'tail title = (htmlHeader title ++) . (++htmlClose)
+
+pre :: String -> String
+pre = ("<pre>"++) . (++"</pre>")
+
+renderToken :: ColourPrefs -> (TokenType,String) -> String
+renderToken pref (t,s) = fontify (colourise pref t)
+                         (if t == Comment then renderComment s else escape s)
+
+renderAnchors :: ((TokenType,String)->String)
+                 -> Either String (TokenType,String) -> String
+renderAnchors _      (Left v) = "<a name=\""++v++"\"></a>"
+renderAnchors render (Right r) = render r
+
+-- if there are http://links/ in a comment, turn them into
+-- hyperlinks
+renderComment :: String -> String
+renderComment xs@('h':'t':'t':'p':':':'/':'/':_) =
+        renderLink a ++ renderComment b
+    where
+        -- see http://www.gbiv.com/protocols/uri/rfc/rfc3986.html#characters
+        isUrlChar x = isAlphaNum x || x `elem` ":/?#[]@!$&'()*+,;=-._~%"
+        (a,b) = span isUrlChar xs
+        renderLink link = "<a href=\"" ++ link ++ "\">" ++ escape link ++ "</a>"
+        
+renderComment (x:xs) = escape [x] ++ renderComment xs
+renderComment [] = []
+
+renderNewLinesAnchors :: String -> String
+renderNewLinesAnchors = unlines . map render . zip [1..] . lines
+    where render (line, s) = "<a name=\"line-" ++ show line ++ "\"></a>" ++ s
+
+-- Html stuff
+fontify [] s     = s
+fontify (h:hs) s = font h (fontify hs s)
+
+font Normal         s = s
+font Bold           s = "<b>"++s++"</b>"
+font Dim            s = "<em>"++s++"</em>"
+font Underscore     s = "<u>"++s++"</u>"
+font Blink          s = "<blink>"++s++"</blink>"
+font ReverseVideo   s = s
+font Concealed      s = s
+font (Foreground c) s = "<font color="++show c++">"++s++"</font>"
+font (Background c) s = "<font bgcolor="++show c++">"++s++"</font>"
+font Italic         s = "<i>"++s++"</i>"
+
+escape ('<':cs) = "&lt;"++escape cs
+escape ('>':cs) = "&gt;"++escape cs
+escape ('&':cs) = "&amp;"++escape cs
+escape (c:cs)   = c: escape cs
+escape []       = []
+
+htmlHeader title = unlines
+  [ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">"
+  , "<html>"
+  , "<head>"
+  ,"<!-- Generated by HsColour, http://www.cs.york.ac.uk/fp/darcs/hscolour/ -->"
+  , "<title>"++title++"</title>"
+  , "</head>"
+  , "<body>"
+  ]
+htmlClose  = "\n</body>\n</html>"
diff --git a/docs/hscolour/Language/Haskell/HsColour/InlineCSS.html b/docs/hscolour/Language/Haskell/HsColour/InlineCSS.html --- a/docs/hscolour/Language/Haskell/HsColour/InlineCSS.html +++ b/docs/hscolour/Language/Haskell/HsColour/InlineCSS.html @@ -6,7 +6,7 @@ 
-- | Formats Haskell source code as HTML with inline CSS.
-module Language.Haskell.HsColour.InlineCSS (hscolour) where
+module Language.Haskell.HsColour.InlineCSS (hscolour,top'n'tail) where
 
 import Language.Haskell.HsColour.Anchors
 import Language.Haskell.HsColour.Classify as Classify
@@ -17,74 +17,70 @@
 -- | Formats Haskell source code as a complete HTML document with inline styling
 hscolour :: ColourPrefs	-- ^ Preferences for styling.
          -> Bool   -- ^ Whether to include anchors.
-         -> Bool   -- ^ Whether output should be partial
-                   --   (= no document headers will be included.)
-         -> String -- ^ Title for HTML page.
-         -> String -- ^ Haskell source code.
-         -> String -- ^ An HTML document containing the coloured 
-                   --   Haskell source code.
-hscolour prefs anchor partial title =
-  (if partial then id else top'n'tail title)
-  . pre
-  . (if anchor 
-        then renderNewLinesAnchors
-             . concatMap (renderAnchors (renderToken prefs))
-             . insertAnchors
-        else concatMap (renderToken prefs))
-  . tokenise
-
-top'n'tail :: String -> String -> String
-top'n'tail title  = (cssPrefix title ++) . (++cssSuffix)
+         -> String -- ^ Haskell source code.
+         -> String -- ^ An HTML document containing the coloured 
+                   --   Haskell source code.
+hscolour prefs anchor =
+  pre
+  . (if anchor 
+        then renderNewLinesAnchors
+             . concatMap (renderAnchors (renderToken prefs))
+             . insertAnchors
+        else concatMap (renderToken prefs))
+  . tokenise
+
+top'n'tail :: String -> String -> String
+top'n'tail title  = (cssPrefix title ++) . (++cssSuffix)
+
+pre :: String -> String
+pre =   ("<pre style=\"font-family:Consolas, Monaco, Monospace;\">"++)
+      . (++"</pre>")
 
-pre :: String -> String
-pre =   ("<pre style=\"font-family:Consolas, Monaco, Monospace;\">"++)
-      . (++"</pre>")
-
-renderToken :: ColourPrefs -> (TokenType,String) -> String
-renderToken prefs (cls,text) =
-  stylise (colourise prefs cls) $
-  if cls == Comment then renderComment text else escape text
-
-stylise :: [Highlight] -> String -> String
-stylise hs s = "<span style=\"" ++ concatMap style hs ++ "\">" ++s++ "</span>"
-
-cssPrefix title = unlines
-    ["<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">"
-    ,"<html>"
-    ,"<head>"
-    ,"<!-- Generated by HsColour, http://www.cs.york.ac.uk/fp/darcs/hscolour/ -->"
-    ,"<title>"++title++"</title>"
-    ,"</head>"
-    ,"<body style=\"background-color: #131313; color: #ffffff;\">"
-    ]
-    
-cssSuffix = unlines
-    ["</body>"
-    ,"</html>"
-    ]
-
-style :: Highlight -> String
-style Normal         = ""
-style Bold           = "font-weight: bold;"
-style Dim            = "font-weight: lighter;"
-style Underscore     = "text-decoration: underline;"
-style Blink          = "text-decoration:  blink;"
-style ReverseVideo   = ""
-style Concealed      = "text-decoration:  line-through;"
-style (Foreground c) = "color: "++csscolour c++";"
-style (Background c) = "background-colour: "++csscolour c++";"
-style Italic         = "font-style: italic;"
-
-csscolour :: Colour -> String
-csscolour Black   = "#000000"
-csscolour Red     = "#ff0000"
-csscolour Green   = "#00ff00"
-csscolour Yellow  = "#ffff00"
-csscolour Blue    = "#0000ff"
-csscolour Magenta = "#ff00ff"
-csscolour Cyan    = "#00ffff"
-csscolour White   = "#ffffff"
-
+renderToken :: ColourPrefs -> (TokenType,String) -> String
+renderToken prefs (cls,text) =
+  stylise (colourise prefs cls) $
+  if cls == Comment then renderComment text else escape text
+
+stylise :: [Highlight] -> String -> String
+stylise hs s = "<span style=\"" ++ concatMap style hs ++ "\">" ++s++ "</span>"
+
+cssPrefix title = unlines
+    ["<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">"
+    ,"<html>"
+    ,"<head>"
+    ,"<!-- Generated by HsColour, http://www.cs.york.ac.uk/fp/darcs/hscolour/ -->"
+    ,"<title>"++title++"</title>"
+    ,"</head>"
+    ,"<body style=\"background-color: #131313; color: #ffffff;\">"
+    ]
+    
+cssSuffix = unlines
+    ["</body>"
+    ,"</html>"
+    ]
+
+style :: Highlight -> String
+style Normal         = ""
+style Bold           = "font-weight: bold;"
+style Dim            = "font-weight: lighter;"
+style Underscore     = "text-decoration: underline;"
+style Blink          = "text-decoration:  blink;"
+style ReverseVideo   = ""
+style Concealed      = "text-decoration:  line-through;"
+style (Foreground c) = "color: "++csscolour c++";"
+style (Background c) = "background-colour: "++csscolour c++";"
+style Italic         = "font-style: italic;"
+
+csscolour :: Colour -> String
+csscolour Black   = "#000000"
+csscolour Red     = "#ff0000"
+csscolour Green   = "#00ff00"
+csscolour Yellow  = "#ffff00"
+csscolour Blue    = "#0000ff"
+csscolour Magenta = "#ff00ff"
+csscolour Cyan    = "#00ffff"
+csscolour White   = "#ffffff"
+
diff --git a/docs/hscolour/Language/Haskell/HsColour/LaTeX.html b/docs/hscolour/Language/Haskell/HsColour/LaTeX.html --- a/docs/hscolour/Language/Haskell/HsColour/LaTeX.html +++ b/docs/hscolour/Language/Haskell/HsColour/LaTeX.html @@ -6,7 +6,7 @@ 
-- | Formats Haskell source code using LaTeX macros.
-module Language.Haskell.HsColour.LaTeX (hscolour) where
+module Language.Haskell.HsColour.LaTeX (hscolour, top'n'tail) where
 
 import Language.Haskell.HsColour.Classify as Classify
 import Language.Haskell.HsColour.Colourise
@@ -14,107 +14,106 @@
 
 -- | Formats Haskell source code as a complete LaTeX document.
 hscolour :: ColourPrefs -- ^ Colour preferences.
-         -> Bool        -- ^ Whether output should be partial (= no prologue).
-         -> String      -- ^ Haskell source code.
-         -> String      -- ^ A LaTeX document\/fragment containing the coloured 
-                        --   Haskell source code.
-hscolour pref partial =
-  ( if partial then id else top'n'tail)
-  . concatMap (renderToken pref)
-  . tokenise
-
-top'n'tail :: String -> String
-top'n'tail  = (latexPrefix++) . (++latexSuffix)
-
--- | Wrap each lexeme in the appropriate LaTeX macro.
---   TODO: filter dangerous characters like "{}_$"
-renderToken :: ColourPrefs -> (TokenType,String) -> String
-renderToken pref (Space,text) = filterSpace text
-renderToken pref (cls,text)   =
-  let symb = case cls of
-              String -> "``" ++ (dropFirst '\"' $ dropLast '\"' $ text) ++ "''"
-              _      -> text
-      style = colourise pref cls
-      (pre, post) = unzip $ map latexHighlight style
-  in concat pre ++ filterSpecial symb ++ concat post
-
--- | Filter white space characters.
-filterSpace :: String
-            -> String
-filterSpace ('\n':ss) = '\\':'\\':(filterSpace ss)
-filterSpace (' ':ss)  = "\\hsspace "++(filterSpace ss)
-filterSpace ('\t':ss) = "\\hstab "++(filterSpace ss)
-filterSpace (c:ss)    = c:(filterSpace ss)
-filterSpace []        = []
-
--- | Filters the characters "#$%&~_^\{}" which are special
---   in LaTeX.
-filterSpecial :: String  -- ^ The string to filter. 
-              -> String  -- ^ The LaTeX-safe string.
-filterSpecial ('#':cs)  = '\\':'#':(filterSpecial cs)
-filterSpecial ('$':cs)  = '\\':'$':(filterSpecial cs)
-filterSpecial ('%':cs)  = '\\':'%':(filterSpecial cs)
-filterSpecial ('&':cs)  = '\\':'&':(filterSpecial cs)
-filterSpecial ('~':cs)  = "\\tilde{ }"++(filterSpecial cs)
-filterSpecial ('_':cs)  = '\\':'_':(filterSpecial cs)
-filterSpecial ('^':cs)  = "\\ensuremath{\\hat{ }}"++(filterSpecial cs)
-filterSpecial ('\\':cs) = "$\\backslash$"++(filterSpecial cs)
-filterSpecial ('{':cs)  = '\\':'{':(filterSpecial cs)
-filterSpecial ('}':cs)  = '\\':'}':(filterSpecial cs)
-filterSpecial ('|':cs)  = "\\ensuremath{|}"++(filterSpecial cs)
-filterSpecial ('<':'-':cs)  = "\\ensuremath{\\leftarrow}"++(filterSpecial cs)
-filterSpecial ('<':cs)  = "\\ensuremath{\\langle}"++(filterSpecial cs)
-filterSpecial ('-':'>':cs)  = "\\ensuremath{\\rightarrow}"++(filterSpecial cs)
-filterSpecial ('>':cs)  = "\\ensuremath{\\rangle}"++(filterSpecial cs)
-filterSpecial (c:cs)    = c:(filterSpecial cs)
-filterSpecial []        = []
-
-
--- | Constructs the appropriate LaTeX macro for the given style.
-latexHighlight :: Highlight -> (String, String)
-latexHighlight Normal         = ("{\\rm{}", "}")
-latexHighlight Bold           = ("{\\bf{}", "}")
-latexHighlight Dim            = ("", "")
-latexHighlight Underscore     = ("\\underline{", "}")
-latexHighlight Blink          = ("", "")
-latexHighlight ReverseVideo   = ("", "")
-latexHighlight Concealed      = ("\\conceal{", "}")
-latexHighlight (Foreground c) = ("\\textcolor{"++ latexColour c ++"}{", "}")
-latexHighlight (Background c) = ("\\colorbox{"++ latexColour c ++"}{", "}")
-latexHighlight Italic         = ("{\\it{}", "}")
-
--- | Translate a 'Colour' into a LaTeX colour name.
-latexColour :: Colour -> String
-latexColour Black   = "black"
-latexColour Red     = "red"
-latexColour Green   = "green"
-latexColour Yellow  = "yellow"
-latexColour Blue    = "blue"
-latexColour Magenta = "magenta"
-latexColour Cyan    = "cyan"
-latexColour White   = "white"
-
--- | Generic LaTeX document preamble.
-latexPrefix = unlines
-    ["\\documentclass[a4paper, 12pt]{article}"
-    ,"\\usepackage[usenames]{color}"
-    ,"\\usepackage{hyperref}"
-    ,"\\newsavebox{\\spaceb}"
-    ,"\\newsavebox{\\tabb}"
-    ,"\\savebox{\\spaceb}[1ex]{~}"
-    ,"\\savebox{\\tabb}[4ex]{~}"
-    ,"\\newcommand{\\hsspace}{\\usebox{\\spaceb}}"
-    ,"\\newcommand{\\hstab}{\\usebox{\\tabb}}"
-    ,"\\newcommand{\\conceal}[1]{}"
-    ,"\\begin{document}"
-    ,"\\noindent"
-    ]
-
--- | Generic LaTeX document postamble.
-latexSuffix = unlines
-    [""
-    ,"\\end{document}"
-    ]
+         -> String      -- ^ Haskell source code.
+         -> String      -- ^ A LaTeX document\/fragment containing the coloured 
+                        --   Haskell source code.
+hscolour pref = concatMap (renderToken pref) . tokenise
+
+top'n'tail :: String -> String -> String
+top'n'tail title = (latexPrefix title++) . (++latexSuffix)
+
+-- | Wrap each lexeme in the appropriate LaTeX macro.
+--   TODO: filter dangerous characters like "{}_$"
+renderToken :: ColourPrefs -> (TokenType,String) -> String
+renderToken pref (Space,text) = filterSpace text
+renderToken pref (cls,text)   =
+  let symb = case cls of
+              String -> "``" ++ (dropFirst '\"' $ dropLast '\"' $ text) ++ "''"
+              _      -> text
+      style = colourise pref cls
+      (pre, post) = unzip $ map latexHighlight style
+  in concat pre ++ filterSpecial symb ++ concat post
+
+-- | Filter white space characters.
+filterSpace :: String
+            -> String
+filterSpace ('\n':ss) = '\\':'\\':(filterSpace ss)
+filterSpace (' ':ss)  = "\\hsspace "++(filterSpace ss)
+filterSpace ('\t':ss) = "\\hstab "++(filterSpace ss)
+filterSpace (c:ss)    = c:(filterSpace ss)
+filterSpace []        = []
+
+-- | Filters the characters "#$%&~_^\{}" which are special
+--   in LaTeX.
+filterSpecial :: String  -- ^ The string to filter. 
+              -> String  -- ^ The LaTeX-safe string.
+filterSpecial ('#':cs)  = '\\':'#':(filterSpecial cs)
+filterSpecial ('$':cs)  = '\\':'$':(filterSpecial cs)
+filterSpecial ('%':cs)  = '\\':'%':(filterSpecial cs)
+filterSpecial ('&':cs)  = '\\':'&':(filterSpecial cs)
+filterSpecial ('~':cs)  = "\\tilde{ }"++(filterSpecial cs)
+filterSpecial ('_':cs)  = '\\':'_':(filterSpecial cs)
+filterSpecial ('^':cs)  = "\\ensuremath{\\hat{ }}"++(filterSpecial cs)
+filterSpecial ('\\':cs) = "$\\backslash$"++(filterSpecial cs)
+filterSpecial ('{':cs)  = '\\':'{':(filterSpecial cs)
+filterSpecial ('}':cs)  = '\\':'}':(filterSpecial cs)
+filterSpecial ('|':cs)  = "\\ensuremath{|}"++(filterSpecial cs)
+filterSpecial ('<':'-':cs)  = "\\ensuremath{\\leftarrow}"++(filterSpecial cs)
+filterSpecial ('<':cs)  = "\\ensuremath{\\langle}"++(filterSpecial cs)
+filterSpecial ('-':'>':cs)  = "\\ensuremath{\\rightarrow}"++(filterSpecial cs)
+filterSpecial ('>':cs)  = "\\ensuremath{\\rangle}"++(filterSpecial cs)
+filterSpecial (c:cs)    = c:(filterSpecial cs)
+filterSpecial []        = []
+
+
+-- | Constructs the appropriate LaTeX macro for the given style.
+latexHighlight :: Highlight -> (String, String)
+latexHighlight Normal         = ("{\\rm{}", "}")
+latexHighlight Bold           = ("{\\bf{}", "}")
+latexHighlight Dim            = ("", "")
+latexHighlight Underscore     = ("\\underline{", "}")
+latexHighlight Blink          = ("", "")
+latexHighlight ReverseVideo   = ("", "")
+latexHighlight Concealed      = ("\\conceal{", "}")
+latexHighlight (Foreground c) = ("\\textcolor{"++ latexColour c ++"}{", "}")
+latexHighlight (Background c) = ("\\colorbox{"++ latexColour c ++"}{", "}")
+latexHighlight Italic         = ("{\\it{}", "}")
+
+-- | Translate a 'Colour' into a LaTeX colour name.
+latexColour :: Colour -> String
+latexColour Black   = "black"
+latexColour Red     = "red"
+latexColour Green   = "green"
+latexColour Yellow  = "yellow"
+latexColour Blue    = "blue"
+latexColour Magenta = "magenta"
+latexColour Cyan    = "cyan"
+latexColour White   = "white"
+
+-- | Generic LaTeX document preamble.
+latexPrefix title = unlines
+    ["\\documentclass[a4paper, 12pt]{article}"
+    ,"\\usepackage[usenames]{color}"
+    ,"\\usepackage{hyperref}"
+    ,"\\newsavebox{\\spaceb}"
+    ,"\\newsavebox{\\tabb}"
+    ,"\\savebox{\\spaceb}[1ex]{~}"
+    ,"\\savebox{\\tabb}[4ex]{~}"
+    ,"\\newcommand{\\hsspace}{\\usebox{\\spaceb}}"
+    ,"\\newcommand{\\hstab}{\\usebox{\\tabb}}"
+    ,"\\newcommand{\\conceal}[1]{}"
+    ,"\\title{"++title++"}"
+    ,"%% Generated by HsColour"
+    ,"\\begin{document}"
+    ,"\\maketitle"
+    ,"\\noindent"
+    ]
+
+-- | Generic LaTeX document postamble.
+latexSuffix = unlines
+    [""
+    ,"\\end{document}"
+    ]
diff --git a/docs/hscolour/doc-index-T.html b/docs/hscolour/doc-index-T.html --- a/docs/hscolour/doc-index-T.html +++ b/docs/hscolour/doc-index-T.html @@ -161,6 +161,42 @@ >Language.Haskell.HsColour.Classifytop'n'tail1 (Function)Language.Haskell.HsColour.CSS2 (Function)Language.Haskell.HsColour.HTML3 (Function)Language.Haskell.HsColour.InlineCSS4 (Function)Language.Haskell.HsColour.LaTeX Download a tarfile package from: ftp://ftp.cs.york.ac.uk/pub/haskell/contrib/ - - http://www.cs.york.ac.uk/fp/darcs/hscolour/hscolour-1.14.tar.gz - - http://www.cs.york.ac.uk/fp/darcs/hscolour/hscolour-1.14.zip + + http://www.cs.york.ac.uk/fp/darcs/hscolour/hscolour-1.15.tar.gz + + http://www.cs.york.ac.uk/fp/darcs/hscolour/hscolour-1.15.zip
  • Or use the darcs repository at
    darcs get http://www.cs.york.ac.uk/fp/darcs/hscolour
  • Sources and history are browsable on-line through @@ -200,6 +200,7 @@

    History

    +
    1.15
    makes -nopartial the default for literate files
    1.14
    merges the -lit and -lit-tex options, adds -lit guessing, and permits multiple input files
    1.13
    added the new -icss output format, and italic highlights
    @@ -224,7 +225,7 @@

    -This page last modified: 21st August 2009
    +This page last modified: 24th August 2009
    Malcolm Wallace