[[project @ 2005-07-27 21:16:20 by duncan_coutts]
duncan_coutts**20050727211620
 Add support for 'ordinary' html, rather than xhtml.
 Currently doesn't do much highliting.
] hunk ./ChangeLog 33
+
+	* docs/tools/AddLinks.hs: Add support for 'ordinary' html, rather than
+	xhtml. Currently doesn't do much highliting.
hunk ./docs/tools/AddLinks.hs 45
+                    ("html":_) -> HTML
hunk ./docs/tools/AddLinks.hs 93
-data DocType = LaTeX | XHTML
+data DocType = LaTeX | XHTML | HTML
hunk ./docs/tools/AddLinks.hs 110
+        substNormal  HTML ("<":"pre":">":('\n':s)
+                          :ts) = let (codeArea, ts') = findCodeArea dt (s:ts)
+                                  in "<pre>"
+                                   : substCodeArea dt codeArea
+                                  ++ "</pre>"
+                                   : substNormal dt ts'
hunk ./docs/tools/AddLinks.hs 120
+        findCodeArea  HTML ("</":"pre":">"               :ts) = ([], ts)
hunk ./docs/tools/AddLinks.hs 125
-        substCodeArea XHTML = map (\(s,c) -> renderTag c (addLinks dt s))
-                            . map (\s -> (s,classifyToken s)) . glue
-
+        substCodeArea XHTML = map (\s -> renderTag dt (classifyToken s) (addLinks dt s)) . glue
+        substCodeArea  HTML = map (\s -> renderTag dt (classifyToken s) (addLinks dt s)) . glue
hunk ./docs/tools/AddLinks.hs 136
+        addLinks  HTML str | Just modName <- conc str = "<a href=\""
+                                           ++ haddockUrl baseUrl modName str
+                                           ++ "\">" ++ str ++ "</a>"
hunk ./docs/tools/AddLinks.hs 233
-renderTag :: Classification -> String -> String
-renderTag Space = id
-renderTag Keyword    = tag "keyword"
-renderTag Keyglyph   = tag "keyglyph"
-renderTag Layout     = tag "layout"
-renderTag Comment    = tag "comment"
-renderTag ConId      = tag "conid"
-renderTag VarId      = tag "varid"
-renderTag ConOp      = tag "conop"
-renderTag VarOp      = tag "varop"
-renderTag String     = tag "string"
-renderTag Char       = tag "char"
-renderTag Number     = tag "number"
-renderTag Selection  = tag "selection"
+renderTag :: DocType -> Classification -> String -> String
+renderTag _ Space = id
+renderTag XHTML Keyword    = spanTag "keyword"
+renderTag XHTML Keyglyph   = spanTag "keyglyph"
+renderTag XHTML Layout     = spanTag "layout"
+renderTag XHTML Comment    = spanTag "comment"
+renderTag XHTML ConId      = spanTag "conid"
+renderTag XHTML VarId      = spanTag "varid"
+renderTag XHTML ConOp      = spanTag "conop"
+renderTag XHTML VarOp      = spanTag "varop"
+renderTag XHTML String     = spanTag "string"
+renderTag XHTML Char       = spanTag "char"
+renderTag XHTML Number     = spanTag "number"
+renderTag XHTML Selection  = spanTag "selection"
+
+renderTag HTML Keyword    = tag "strong"
+renderTag HTML Keyglyph   = tag "strong"
+renderTag HTML Layout     = id
+renderTag HTML Comment    = tag "emphasis"
+renderTag HTML ConId      = id
+renderTag HTML VarId      = id
+renderTag HTML ConOp      = id
+renderTag HTML VarOp      = id
+renderTag HTML String     = id
+renderTag HTML Char       = id
+renderTag HTML Number     = id
+renderTag HTML Selection  = id
+
+spanTag className s = "<span class=\"haskellcode-" ++ className ++ "\">" ++ s ++ "</span>"
hunk ./docs/tools/AddLinks.hs 263
-tag className s = "<span class=\"haskellcode-" ++ className ++ "\">" ++ s ++ "</span>"
+tag tagName s = "<" ++ tagName ++ ">" ++ s ++ "</" ++ tagName ++ ">"