diff options
| author | Conal Elliott <conal@conal.net> | 2007-02-14 21:54:00 +0000 |
|---|---|---|
| committer | Conal Elliott <conal@conal.net> | 2007-02-14 21:54:00 +0000 |
| commit | cc5e79229d4da32eb512d3a6e307e86db11133c4 (patch) | |
| tree | 6071e7523f6bda06df03675a4bfa6c5fae7c8b2a | |
| parent | 5d3d5af3f860178fb7c2173a8312432a3f324bc1 (diff) | |
added substitution %{FILE///c}
| -rw-r--r-- | doc/haddock.xml | 20 | ||||
| -rw-r--r-- | src/Haddock/Backends/Html.hs | 3 |
2 files changed, 17 insertions, 6 deletions
diff --git a/doc/haddock.xml b/doc/haddock.xml index 16b8b05d..c36b707b 100644 --- a/doc/haddock.xml +++ b/doc/haddock.xml @@ -532,6 +532,13 @@ replace it with a character <replaceable>c</replaceable> use <literal>%{MODULE/./<replaceable>c</replaceable>}</literal>.</para> + <para>Similarly, for the <literal>%{FILE}</literal> substitution + you may want to replace the '<literal>/</literal>' character in + the file names with some other character (especially for links + to colourised entity source code with a shared css file). To replace + it with a character <replaceable>c</replaceable> use + <literal>%{FILE///<replaceable>c</replaceable>}</literal>/</para> + <para>One example of a tool that can generate syntax-highlighted HTML from your source code, complete with anchors suitable for use from haddock, is @@ -591,13 +598,14 @@ <literal>haddock --comments-base=<replaceable>url</replaceable> --comments-module=<replaceable>url</replaceable>/%M</literal></para> - <para>If your Wiki system doesn't like the '<literal>.</literal>' - character in Haskell module names, you can replace it with a - different character. For example to replace the - '<literal>.</literal>' characters with '<literal>_</literal>' use - <literal>haddock --comments-base=<replaceable>url</replaceable> + <para>If your Wiki system doesn't like the '<literal>.</literal>' character + in Haskell module names, you can replace it with a different character. For + example to replace the '<literal>.</literal>' characters with + '<literal>_</literal>' use <literal>haddock + --comments-base=<replaceable>url</replaceable> --comments-module=<replaceable>url</replaceable>/%{MODULE/./_}</literal> - </para> + Similarly, you can replace the '<literal>/</literal>' in a file name (may + be useful for entity comments, but probably not.) </para> </listitem> </varlistentry> diff --git a/src/Haddock/Backends/Html.hs b/src/Haddock/Backends/Html.hs index 8c73e0ff..52a80096 100644 --- a/src/Haddock/Backends/Html.hs +++ b/src/Haddock/Backends/Html.hs @@ -191,6 +191,9 @@ spliceURL maybe_file maybe_mod maybe_name url = run url run ('%':'{':'M':'O':'D':'U':'L':'E':'/':'.':'/':c:'}':rest) = map (\x -> if x == '.' then c else x) mod ++ run rest + run ('%':'{':'F':'I':'L':'E':'/':'/':'/':c:'}':rest) = + map (\x -> if x == '/' then c else x) file ++ run rest + run (c:rest) = c : run rest wikiButton :: WikiURLs -> Maybe Module -> HtmlTable |