diff --git a/HsColour.hs b/HsColour.hs --- a/HsColour.hs +++ b/HsColour.hs @@ -1,27 +1,16 @@ module Main where import Language.Haskell.HsColour +import qualified Language.Haskell.HsColour as HSColour import Language.Haskell.HsColour.Colourise (readColourPrefs) - +import Language.Haskell.HsColour.Options import System import IO (hPutStrLn,hFlush,stdout,stderr,hSetBuffering,BufferMode(..)) import Monad (when) import List (intersperse) - -version = "1.10.1" +import Debug.Trace --- | Command-line options -data Option = - Help -- ^ print usage message - | Version -- ^ report version - | Information -- ^ report auxiliary information, e.g. CSS defaults - | Format Output -- ^ what type of output to produce - | LHS Bool -- ^ literate input (i.e. multiple embedded fragments) - | Anchors Bool -- ^ whether to add anchors - | Partial Bool -- ^ whether to produce a full document or partial - | Input FilePath -- ^ input source file - | Output FilePath -- ^ output source file - deriving Eq +version = "1.11" optionTable :: [(String,Option)] optionTable = [ ("help", Help) @@ -32,8 +21,9 @@ , ("tty", Format TTY) , ("latex", Format LaTeX) , ("mirc", Format MIRC) - , ("lit", LHS True) - , ("nolit", LHS False) + , ("lit", LHS Bird) + , ("lit-tex",LHS TeX) + , ("nolit", LHS NoLit) , ("anchor", Anchors True) , ("noanchor", Anchors False) , ("partial", Partial True) @@ -58,11 +48,11 @@ outFile = [ f | Output f <- good ] fileInteract = fileInteractOut outFile output = useDefault TTY id formats - ioWrapper = useDefault ttyInteract fileInteract [ f | Input f <- good ] + ioWrapper = useDefault ttyInteract fileInteract [ f | Input f <- good ] anchors = useDefault False id [ b | Anchors b <- good ] partial = useDefault False id [ b | Partial b <- good ] - lhs = useDefault False id [ b | LHS b <- good ] - title = useDefault "Haskell code" id [ f | Input f <- good ] + lhs = useDefault NoLit id [ b | LHS b <- good ] + title = useDefault "Haskell code" id [ f | Input f <- good ] when (not (null bad)) (errorOut ("Unrecognised option(s): "++unwords bad++"\n"++usage prog)) when (Help `elem` good) (do putStrLn (usage prog); exitSuccess) @@ -74,7 +64,7 @@ ++unwords (map show formats))) when (length outFile > 1) (errorOut ("Can only have one output file at a time.")) - ioWrapper (hscolour output pref anchors partial lhs title) + ioWrapper (HSColour.hscolour output pref anchors partial lhs title) hFlush stdout where diff --git a/Language/Haskell/HsColour.hs b/Language/Haskell/HsColour.hs --- a/Language/Haskell/HsColour.hs +++ b/Language/Haskell/HsColour.hs @@ -20,30 +20,30 @@ import qualified Language.Haskell.HsColour.CSS as CSS import qualified Language.Haskell.HsColour.LaTeX as LaTeX import qualified Language.Haskell.HsColour.MIRC as MIRC - --- | The supported output formats. -data Output = TTY -- ^ ANSI terminal codes - | LaTeX -- ^ TeX macros - | HTML -- ^ HTML with font tags - | CSS -- ^ HTML with CSS. - | MIRC -- ^ mIRC chat clients - deriving (Eq,Show) +import Data.List(mapAccumL, isPrefixOf) +import Data.Maybe +import Language.Haskell.HsColour.Output +import Language.Haskell.HsColour.Options (Literate(..)) +import Debug.Trace -- | Colourise Haskell source code with the given 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. - -> Bool -- ^ Whether input document is literate haskell or not + -> Literate -- ^ Whether input document is literate haskell or not -> String -- ^ Title for output. -> String -- ^ Haskell source code. -> String -- ^ Coloured Haskell source code. -hscolour output pref anchor partial literate title - | literate = concatMap chunk . joinL . map lhsClassify . inlines - | otherwise = hscolour' output pref anchor partial title +hscolour output pref anchor partial literate title = + case literate of + NoLit -> hscolour' output pref anchor partial title + Bird -> literateHandler (map lhsClassify) + TeX -> literateHandler (snd . mapAccumL decideTypeOfLine False) where - chunk (Literate c) = c - chunk (Code c) = hscolour' output pref anchor True title c + literateHandler f = concatMap chunk . joinL . f . inlines + chunk (Lit c) = c + chunk (Code c) = hscolour' output pref anchor True title c hscolour' :: Output -- ^ Output format. -> ColourPrefs -- ^ Colour preferences (for formats that support them). @@ -59,7 +59,7 @@ hscolour' CSS _ anchor partial top = CSS.hscolour anchor partial top -- | Separating literate files into code\/comment chunks. -data Literate = Code {unL :: String} | Literate {unL :: String} +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. @@ -75,13 +75,22 @@ -- Note, I just pass the > symbol to the colouriser, which assumes that -- it's token based and not parse-based!!! -lhsClassify :: String -> Literate +lhsClassify :: String -> Lit lhsClassify ('>':xs) = Code ('>':xs) -lhsClassify xs = Literate xs +lhsClassify xs = Lit xs -joinL :: [Literate] -> [Literate] -joinL [] = [] -joinL (Code c:Code c2:xs) = joinL (Code (c++c2):xs) -joinL (Literate c:Literate c2:xs) = joinL (Literate (c++c2):xs) -joinL (any:xs) = any: joinL xs +-- texstyle is a bool indicating whether we are currently inside a code block +decideTypeOfLine texStyle current_line + | isPrefix "\\begin{code}" = codeLine + | texStyle = if not is_end then codeLine else (False, Code (current_line )) + | otherwise = (False, Lit current_line) + where isPrefix = flip isPrefixOf current_line + codeLine = (True, Code (current_line)) + is_end = isPrefix "\\end{code}" + +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/Language/Haskell/HsColour/Options.hs b/Language/Haskell/HsColour/Options.hs new file mode 100644 --- /dev/null +++ b/Language/Haskell/HsColour/Options.hs @@ -0,0 +1,22 @@ +module Language.Haskell.HsColour.Options + ( Option(..) + , Output(..) + , Literate(..) + ) where + +import Language.Haskell.HsColour.Output + +-- | Command-line options +data Option = + Help -- ^ print usage message + | Version -- ^ report version + | Information -- ^ report auxiliary information, e.g. CSS defaults + | Format Output -- ^ what type of output to produce + | LHS Literate -- ^ literate input (i.e. multiple embedded fragments) + | Anchors Bool -- ^ whether to add anchors + | Partial Bool -- ^ whether to produce a full document or partial + | Input FilePath -- ^ input source file + | Output FilePath -- ^ output source file + deriving Eq + +data Literate = NoLit | Bird | TeX deriving Eq diff --git a/Language/Haskell/HsColour/Output.hs b/Language/Haskell/HsColour/Output.hs new file mode 100644 --- /dev/null +++ b/Language/Haskell/HsColour/Output.hs @@ -0,0 +1,9 @@ +module Language.Haskell.HsColour.Output where + +-- | The supported output formats. +data Output = TTY -- ^ ANSI terminal codes + | LaTeX -- ^ TeX macros + | HTML -- ^ HTML with font tags + | CSS -- ^ HTML with CSS. + | MIRC -- ^ mIRC chat clients + deriving (Eq,Show) diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ LIBRARY = hscolour -VERSION = 1.10.1 +VERSION = 1.11 DIRS = Language/Haskell/HsColour @@ -14,7 +14,9 @@ Language/Haskell/HsColour/HTML.hs \ Language/Haskell/HsColour/LaTeX.hs \ Language/Haskell/HsColour/TTY.hs \ - Language/Haskell/HsColour/MIRC.hs + Language/Haskell/HsColour/MIRC.hs \ + Language/Haskell/HsColour/Output.hs \ + Language/Haskell/HsColour/Options.hs AUX = README LICENCE* $(LIBRARY).cabal Setup.hs Makefile \ HsColour.hs hscolour.css .hscolour \ diff --git a/README b/README --- a/README +++ b/README @@ -1,6 +1,6 @@ HsColour: A Haskell source-code colouriser. ------------------------------------------- -Copyright: 2003-2008, Malcolm Wallace, University of York +Copyright: 2003-2009, Malcolm Wallace, University of York Licence: GPL Building: @@ -11,8 +11,8 @@ Usage: HsColour [-Ofile] [ -tty | -html | -css | -latex | -mirc ] - [ -lit | -anchor | -partial ] - [ -nolit | -noanchor| -nopartial ] + [ -lit | -lit-tex | -anchor | -partial ] + [ -nolit | -noanchor| -nopartial ] [file.hs] The program can colourise a Haskell source file for either terminal diff --git a/hscolour.cabal b/hscolour.cabal --- a/hscolour.cabal +++ b/hscolour.cabal @@ -1,6 +1,6 @@ Name: hscolour -Version: 1.10.1 -Copyright: Malcolm Wallace, University of York, 2003-2008, Bjorn Bringert 2006 +Version: 1.11 +Copyright: 2003-2009 Malcolm Wallace, University of York; 2006 Bjorn Bringert Maintainer: Malcolm Wallace Author: Malcolm Wallace Homepage: http://www.cs.york.ac.uk/fp/darcs/hscolour/ @@ -31,6 +31,8 @@ Language.Haskell.HsColour.General, Language.Haskell.HsColour.MIRC, Language.Haskell.HsColour.CSS + Language.Haskell.HsColour.Output + Language.Haskell.HsColour.Options data-files: hscolour.css --ghc-options: -O -W Build-Type: Simple diff --git a/index.html b/index.html --- a/index.html +++ b/index.html @@ -61,7 +61,7 @@ HsColour [ -help | -version | -print-css ] [ -oOUTPUT ] [ -tty | -html | -css | -latex | -mirc ] - [ -lit | -nolit ] + [ -lit | -lit-tex | -nolit ] [ -anchor | -noanchor | -partial | -nopartial ] [file.hs] @@ -90,7 +90,8 @@ then the -lit option will pass the literate parts untouched, and colourise only the code fragments (indicated by Bird-tracks - a > in the left-most column), as if each was called individually with --partial. +-partial. A literate file containing LaTeX rather than +Bird-style should use -lit-tex instead.

Configuration of colours

@@ -187,6 +188,7 @@

History

+
1.11
new literate input option -lit-tex
1.10.1
reports the correct version with the --version flag
1.10
the title of HTML output is now the filename
1.9
added the -mirc and -lit options, and -print-css
@@ -205,7 +207,7 @@

-This page last modified: 3rd Sept 2008
+This page last modified: 19th Jan 2009
Malcolm Wallace