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.help b/Doxyfile.help
index 74673382..7b905572 100644
--- a/Doxyfile.help
+++ b/Doxyfile.help
@@ -230,43 +230,48 @@ TAB_SIZE               = 4
 
 # Simplify Fish output from Doxygen for man pages. (see fish_lexicon_filter)
 
-ALIASES                = "key{1}=<b>\1</b>"
-ALIASES               += "key{2}=<b>\1</b>-<em>\2</em>"
-ALIASES               += "key{3}=<b>\1</b>-<em>\3</em>"
-ALIASES               += "cursor_key{2}=<b>\2</b>"
-
-ALIASES               += "fish=<pre>"
-ALIASES               += "fish{1}=<pre>"
-ALIASES               += "endfish=</pre>"
-
-ALIASES               += "asis{1}=\1"
-ALIASES               += "blah{1}=\1"
-ALIASES               += "cmnd{1}=\b \1"
-ALIASES               += "func{1}=\b \1"
-ALIASES               += "sbin{1}=\b \1"
-ALIASES               += "args{1}=\1"
-ALIASES               += "opts{1}=\1"
-ALIASES               += "vars{1}=\1"
-ALIASES               += "optr{1}=\1"
-ALIASES               += "redr{1}=\1"
-ALIASES               += "fsfo{1}=\1"
-ALIASES               += "path{1}=\1"
-ALIASES               += "clrv{1}=\1"
-
-ALIASES               += "strg{1}=\1"
-ALIASES               += "sglq{1}=\'\1\'"
-ALIASES               += "dblq{1}=\"\1\""
-
-ALIASES               += "prmt{1}=\1"
-ALIASES               += "sgst{1}=\1"
-ALIASES               += "eror{1}=<b>\1</b>"
-ALIASES               += "curs{1}=\1"
-
-ALIASES               += "bold{1}=<b>\1</b>"
-ALIASES               += "emph{1}=<em>\1</em>"
-ALIASES               += "undr{1}=<em>\1</em>"
-ALIASES               += "span{2}=\1"
-ALIASES               += "spcl{2}=\1"
+ALIASES  = "key{1}=<b>\1</b>"
+ALIASES += "key{2}=<b>\1</b>-<em>\2</em>"
+ALIASES += "key{3}=<b>\1</b>-<em>\3</em>"
+ALIASES += "cursor_key{2}=<b>\2</b>"
+
+ALIASES += "fish=<pre>"
+ALIASES += "fish{1}=<pre>"
+ALIASES += "endfish=</pre>"
+
+ALIASES += "asis{1}=\1"
+ALIASES += "outp{1}=\1"
+ALIASES += "blah{1}= \1"
+ALIASES += "cmnd{1}=<b>\1</b>"
+ALIASES += "func{1}=<b>\1</b>"
+ALIASES += "sbin{1}=<b>\1</b>"
+ALIASES += "args{1}=\1"
+ALIASES += "opts{1}=\1"
+ALIASES += "vars{1}=\1"
+ALIASES += "optr{1}=\1"
+ALIASES += "redr{1}=\1"
+ALIASES += "fsfo{1}=\1"
+ALIASES += "path{1}=\1"
+ALIASES += "clrv{1}=\1"
+
+ALIASES += "strg{1}=\1"
+ALIASES += "sglq{1}='\1'"
+ALIASES += "dblq{1}=\"\1\""
+
+ALIASES += "prmt=&gt;"
+ALIASES += "prmt{1}=\1&gt;"
+ALIASES += "sgst{1}=\1"
+ALIASES += "mtch{1}=<em>\1</em>"
+ALIASES += "smtc{1}=<em>\1</em>"
+ALIASES += "eror{1}=<b>\1</b>"
+ALIASES += "curs=_"
+ALIASES += "curs{1}=\1"
+
+ALIASES += "bold{1}=<b>\1</b>"
+ALIASES += "emph{1}=<em>\1</em>"
+ALIASES += "undr{1}=<em>\1</em>"
+ALIASES += "span{2}=\2"
+ALIASES += "spcl{2}=\2"
 
 # 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"