diff options
| -rw-r--r-- | src/Haddock/Backends/LaTeX.hs | 3 | ||||
| -rw-r--r-- | src/Main.hs | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/Haddock/Backends/LaTeX.hs b/src/Haddock/Backends/LaTeX.hs index c187f104..ee304073 100644 --- a/src/Haddock/Backends/LaTeX.hs +++ b/src/Haddock/Backends/LaTeX.hs @@ -24,7 +24,7 @@ import GHC import OccName import Name ( nameOccName ) import RdrName ( rdrNameOcc ) -import FastString ( unpackFS, unpackLitString ) +import FastString ( unpackFS, unpackLitString, zString ) import qualified Data.Map as Map import System.Directory @@ -168,6 +168,7 @@ string_txt :: TextDetails -> String -> String string_txt (Chr c) s = c:s string_txt (Str s1) s2 = s1 ++ s2 string_txt (PStr s1) s2 = unpackFS s1 ++ s2 +string_txt (ZStr s1) s2 = zString s1 ++ s2 string_txt (LStr s1 _) s2 = unpackLitString s1 ++ s2 diff --git a/src/Main.hs b/src/Main.hs index beb01b86..dedc23dc 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -222,7 +222,7 @@ render dflags flags qual ifaces installedIfaces srcMap = do sourceUrls' = (srcBase, srcModule, srcMap') libDir <- getHaddockLibDir flags - prologue <- getPrologue flags + prologue <- getPrologue dflags flags themes <- getThemes libDir flags >>= either bye return when (Flag_GenIndex `elem` flags) $ do @@ -410,13 +410,13 @@ updateHTMLXRefs packages = do mapping' = [ (moduleName m, html) | (m, html) <- mapping ] -getPrologue :: [Flag] -> IO (Maybe (Doc RdrName)) -getPrologue flags = +getPrologue :: DynFlags -> [Flag] -> IO (Maybe (Doc RdrName)) +getPrologue dflags flags = case [filename | Flag_Prologue filename <- flags ] of [] -> return Nothing [filename] -> do str <- readFile filename - case parseParas (tokenise (defaultDynFlags (panic "No settings")) str + case parseParas (tokenise dflags str (1,0) {- TODO: real position -}) of Nothing -> throwE $ "failed to parse haddock prologue from file: " ++ filename Just doc -> return (Just doc) |