From eb56750b26ea67b5f1af6bbb3798ad72b6fe37af Mon Sep 17 00:00:00 2001 From: Alessandro Vermeulen Date: Mon, 1 Nov 2010 17:17:38 +0100 Subject: [PATCH] * Added missing files * Bit of a cleanup --- lhs2TeX-hl.cabal | 5 ++- src/Base/Cli.hs | 33 +++++++++++++++++++ src/Base/Common.hs | 4 +++ {Language => src/Language}/LaTeX.hs | 0 {Literate => src/Literate}/Agda.hs | 0 {Literate => src/Literate}/Haskell.hs | 0 {Literate => src/Literate}/SimpleInfo.hs | 0 .../LiterateHighlighter.hs | 0 8 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 src/Base/Cli.hs create mode 100644 src/Base/Common.hs rename {Language => src/Language}/LaTeX.hs (100%) rename {Literate => src/Literate}/Agda.hs (100%) rename {Literate => src/Literate}/Haskell.hs (100%) rename {Literate => src/Literate}/SimpleInfo.hs (100%) rename LiterateHighlighter.hs => src/LiterateHighlighter.hs (100%) diff --git a/lhs2TeX-hl.cabal b/lhs2TeX-hl.cabal index 0fe9b4a..84ae2af 100644 --- a/lhs2TeX-hl.cabal +++ b/lhs2TeX-hl.cabal @@ -23,4 +23,7 @@ Executable lhs2TeX-hl , MissingH >= 1.1.0.3 , syb >= 0.1.0.1 , cmdargs >= 0.1 - , Agda >= 2.2.6 \ No newline at end of file + , Agda >= 2.2.6 + hs-source-dirs: src + Other-Modules: Language.LaTeX, Literate.Agda, Literate.Haskell, + Literate.SimpleInfo, Base.Cli, Base.Common \ No newline at end of file diff --git a/src/Base/Cli.hs b/src/Base/Cli.hs new file mode 100644 index 0000000..7f06856 --- /dev/null +++ b/src/Base/Cli.hs @@ -0,0 +1,33 @@ +{-# LANGUAGE DeriveDataTypeable #-} +module Base.CLI (ProgramOptions(..), usage, standard, module System.Console.CmdArgs) where + +import System.Console.CmdArgs + +import Base.Common + +data ProgramOptions = ProgramOptions + { agda_mode :: Bool + , input :: [FilePath] + , output :: FilePath + } deriving (Show, Data, Typeable) + + + +usage :: String +usage = unlines + [ programName ++" "++ programVersion ++" - A lhs2TeX Syntax Coloring pre-processor" + , "Copyright 2010, Alessandro Vermeulen " ] + + + +-- | Standard command line options. +-- + +standard = cmdArgsMode $ ProgramOptions + { + agda_mode = def &= help "Run in agda-mode!" + , output = (def &= help "Output file") &= typFile + , input = (def &= args ) + } &= summary usage + + diff --git a/src/Base/Common.hs b/src/Base/Common.hs new file mode 100644 index 0000000..03594c9 --- /dev/null +++ b/src/Base/Common.hs @@ -0,0 +1,4 @@ +module Base.Common where + +programVersion = "0.1.1.0" +programName = "lhs2TeX-hl" \ No newline at end of file diff --git a/Language/LaTeX.hs b/src/Language/LaTeX.hs similarity index 100% rename from Language/LaTeX.hs rename to src/Language/LaTeX.hs diff --git a/Literate/Agda.hs b/src/Literate/Agda.hs similarity index 100% rename from Literate/Agda.hs rename to src/Literate/Agda.hs diff --git a/Literate/Haskell.hs b/src/Literate/Haskell.hs similarity index 100% rename from Literate/Haskell.hs rename to src/Literate/Haskell.hs diff --git a/Literate/SimpleInfo.hs b/src/Literate/SimpleInfo.hs similarity index 100% rename from Literate/SimpleInfo.hs rename to src/Literate/SimpleInfo.hs diff --git a/LiterateHighlighter.hs b/src/LiterateHighlighter.hs similarity index 100% rename from LiterateHighlighter.hs rename to src/LiterateHighlighter.hs