Tutorial auto colouring, Man page and Make fixes

Completely fixes #1557 and the underlying Doxygen changes that caused
it. Should make fish docs simpler and more robust, more consistent and
generally prettier.

todo:
- trap unmarked text as arguments in context
- test & fix sed portability - see in particular. (so far tested on BSD
(Mac) and GNU sed).
- test Makefile changes
- last round of aesthetic changes and getting that ascii fish in there…

1 files changed, 42 insertions, 37 deletions

diff --git a/Doxyfile.user b/Doxyfile.user
index 09683abd..b1319a78 100644
--- a/Doxyfile.user
+++ b/Doxyfile.user
@@ -230,43 +230,48 @@ TAB_SIZE               = 4
 
 # Enhance Fish docs output from Doxygen. (See fish_lexicon_filter.in)
 
-ALIASES                = "key{1}=<span class=\"key\"><b>\1</b></span>"
-ALIASES               += "key{2}=<span class=\"key\"><em>\1</em><span>-</span><b>\2</b></span>"
-ALIASES               += "key{3}=<span class=\"key\"><em>\1</em><span>-</span><b>\2</b></span>"
-ALIASES               += "cursor_key{2}=<span class=\"key\"><b>\1</b></span>"
-
-ALIASES               += "fish=\htmlonly[block] \n<pre class=\"fish\">"
-ALIASES               += "fish{1}=\htmlonly[block] \n<pre class=\"fish \1\">"
-ALIASES               += "endfish=</pre>\endhtmlonly \n"
-
-ALIASES               += "asis{1}=\1"
-ALIASES               += "blah{1}=<span class=\"comment\">\1</span>"
-ALIASES               += "cmnd{1}=<span class=\"command\">\1</span>"
-ALIASES               += "func{1}=<span class=\"function\">\1</span>"
-ALIASES               += "sbin{1}=<span class=\"binary\">\1</span>"
-ALIASES               += "args{1}=<span class=\"argument\">\1</span>"
-ALIASES               += "opts{1}=<span class=\"argument\">\1</span>"
-ALIASES               += "vars{1}=<span class=\"variable\">\1</span>"
-ALIASES               += "optr{1}=<span class=\"operator\">\1</span>"
-ALIASES               += "redr{1}=<span class=\"redirect\">\1</span>"
-ALIASES               += "fsfo{1}=<span class=\"file\">\1</span>"
-ALIASES               += "path{1}=<span class=\"path\">\1</span>"
-ALIASES               += "clrv{1}=<span class=\"variable\">\1</span>"
-
-ALIASES               += "strg{1}=<span class=\"string\">\1</span>"
-ALIASES               += "sglq{1}=<span class=\"string\">'\1'</span>"
-ALIASES               += "dblq{1}=<span class=\"string\">\"\1\"</span>"
-
-ALIASES               += "prmt{1}=<span class=\"prompt\"\1</span>"
-ALIASES               += "sgst{1}=<span class=\"suggest\"\1</span>"
-ALIASES               += "eror{1}=<span class=\"error\"\1</span>"
-ALIASES               += "curs{1}=<span class=\"cursor\"\1</span>"
-
-ALIASES               += "bold{1}=<strong>\1</strong>"
-ALIASES               += "emph{1}=<em>\1</em>"
-ALIASES               += "undr{1}=<u>\1</u>"
-ALIASES               += "span{2}=<span style=\"\1\">\2</span>"
-ALIASES               += "spcl{2}=<span class=\"\1\">\2</span>"
+ALIASES  = "key{1}=<span class=\"key\"><b>\1</b></span>"
+ALIASES += "key{2}=<span class=\"key\"><em>\1</em><span>-</span><b>\2</b></span>"
+ALIASES += "key{3}=<span class=\"key\"><em>\1</em><span>-</span><b>\2</b></span>"
+ALIASES += "cursor_key{2}=<span class=\"key\"><b>\1</b></span>"
+
+ALIASES += "fish=\htmlonly[block] \n<pre class=\"fish\">"
+ALIASES += "fish{1}=\htmlonly[block] \n<pre class=\"fish \1\">"
+ALIASES += "endfish=</pre>\endhtmlonly \n"
+
+ALIASES += "asis{1}=\1"
+ALIASES += "outp{1}=<span class=\"output\">\1</span>"
+ALIASES += "blah{1}=<span class=\"comment\">#\1</span>"
+ALIASES += "cmnd{1}=<span class=\"command\">\1</span>"
+ALIASES += "func{1}=<span class=\"function\">\1</span>"
+ALIASES += "sbin{1}=<span class=\"binary\">\1</span>"
+ALIASES += "args{1}=<span class=\"argument\">\1</span>"
+ALIASES += "opts{1}=<span class=\"argument\">\1</span>"
+ALIASES += "vars{1}=<span class=\"variable\">\1</span>"
+ALIASES += "optr{1}=<span class=\"operator\">\1</span>"
+ALIASES += "redr{1}=<span class=\"redirect\">\1</span>"
+ALIASES += "fsfo{1}=<span class=\"file\">\1</span>"
+ALIASES += "path{1}=<span class=\"path\">\1</span>"
+ALIASES += "clrv{1}=<span class=\"variable\">\1</span>"
+
+ALIASES += "strg{1}=<span class=\"string\">\1</span>"
+ALIASES += "sglq{1}=<span class=\"string\">'\1'</span>"
+ALIASES += "dblq{1}=<span class=\"string\">\"\1\"</span>"
+
+ALIASES += "prmt=<span class=\"prompt\">&gt;</span>"
+ALIASES += "prmt{1}=<span class=\"prompt\">\1&gt;</span>"
+ALIASES += "sgst{1}=<span class=\"suggest\">\1</span>"
+ALIASES += "mtch{1}=<span class=\"match\">\1</span>"
+ALIASES += "smtc{1}=<span class=\"search_match\">\1</span>"
+ALIASES += "eror{1}=<span class=\"error\">\1</span>"
+ALIASES += "curs=<span class=\"cursor\"> </span>"
+ALIASES += "curs{1}=<span class=\"cursor\">\1</span>"
+
+ALIASES += "bold{1}=<strong>\1</strong>"
+ALIASES += "emph{1}=<em>\1</em>"
+ALIASES += "undr{1}=<span class=\"underline\">\1</span>"
+ALIASES += "span{2}=<span style=\"\1\">\2</span>"
+ALIASES += "spcl{2}=<span class=\"\1\">\2</span>"
 
 # This tag can be used to specify a number of word-keyword mappings (TCL only).
 # A mapping has the form "name=value". For example adding "class=itcl::class"