From d282bc462578a6e47747c78d2d42883530f0d11e Mon Sep 17 00:00:00 2001
From: Mark Griffiths <mark@thebespokepixel.com>
Date: Fri, 1 Aug 2014 03:37:32 +0100
Subject: Documentation update

Rework for Doxygen >1.8. Moved large parts of the documentation to a
simplified format, making use of Markdown enhancements and fixing bad
long options.
---
 Makefile.in | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 78 insertions(+), 4 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 4995dddc..c8467092 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -148,6 +148,11 @@ HDR_FILES := $(HDR_FILES_SRC:.hdr.in=.hdr)
 
 HELP_SRC := $(wildcard doc_src/*.txt)
 
+#
+# HTML includes needed for HTML help
+#
+
+HTML_SRC := doc_src/user_doc.header.html doc_src/user_doc.footer.html doc_src/user_doc.css
 
 #
 # Files in the test directory
@@ -252,11 +257,20 @@ prof: all
 # Depend on the sources (*.hdr.in) and manually make the
 # intermediate *.hdr and doc.h files if needed
 # The sed command deletes everything including and after the first -, for simpler version numbers
+# Cleans up the user_doc/html directory once Doxygen is done.
 
-user_doc: $(HDR_FILES_SRC) Doxyfile.user user_doc.head.html $(HELP_SRC) doc.h $(HDR_FILES)
-	(cat Doxyfile.user ; echo PROJECT_NUMBER=$(FISH_BUILD_VERSION) | sed "s/-.*//") | doxygen - && touch user_doc
-
+user_doc: $(HDR_FILES_SRC) Doxyfile.user $(HTML_SRC) $(HELP_SRC) doc.h $(HDR_FILES) doc_src/fish_lexicon_filter
+	(cat Doxyfile.user; echo INPUT_FILTER=doc_src/fish_lexicon_filter; \
+	echo PROJECT_NUMBER=$(FISH_BUILD_VERSION) | sed "s/-.*//") | doxygen - && touch user_doc; \
+	cd user_doc/html; rm -f bc_s.png bdwn.png closed.png ftv2*.png nav*.png open.png sync_*.png tab*.* doxygen.* dynsections.js jquery.js pages.html
 
+#
+# Build the help CSS files, using fish_lexicon_filter
+#
+doc_src/user_doc.css: doc_src/user_doc.css.in doc_src/fish_lexicon_filter
+	-rm $@
+	cd doc_src; \
+	cat user_doc.css.in >> user_doc.css
 
 #
 # Source code documentation. Also includes user documentation.
@@ -328,11 +342,70 @@ toc.txt: $(HDR_FILES:index.hdr=index.hdr.in)
 doc_src/index.hdr: toc.txt doc_src/index.hdr.in
 	cat $@.in | awk '{if ($$0 ~ /@toc@/){ system("cat toc.txt");} else{ print $$0;}}' >$@
 
+#
+# To enable the lexicon filter, we first need to be aware of what fish
+# considers to be a command, function, or external binary. We use
+# command_list_toc.txt for the base commands. Scan the share/functions
+# directory for other functions, some of which are mentioned in the docs, and
+# use /share/completions to find a good selection of binaries. Additionally,
+# colour defaults from __fish_config_interactive to set the docs colours when
+# used in a 'cli' style context.
+#
+
+lexicon.txt: doc_src/commands.hdr $(FUNCTIONS_DIR_FILES) $(COMPLETIONS_DIR_FILES) share/functions/__fish_config_interactive.fish
+	-rm lexicon.tmp lexicon_catalog.tmp lexicon_catalog.txt $@
+	# Scan sources for commands/functions/binaries/colours. If GNU sed was portable, this could be much smarter.
+	sed <command_list_toc.txt >>lexicon.tmp -n \
+		-e "s|^.*>\([a-z][a-z_]*\)</a>|'\1'|w lexicon_catalog.tmp" \
+		-e "s|'\(.*\)'|cmnd \1|p"; mv lexicon_catalog.tmp lexicon_catalog.txt; \
+	printf "%s\n" $(COMPLETIONS_DIR_FILES) | sed -n \
+		-e "s|[^ ]*/\([a-z][a-z_-]*\).fish|'\1'|p" | fgrep -vx -f lexicon_catalog.txt | sed >>lexicon.tmp -n \
+		-e 'w lexicon_catalog.tmp' \
+		-e "s|'\(.*\)'|sbin \1|p"; cat lexicon_catalog.tmp >> lexicon_catalog.txt; \
+	printf "%s\n" $(FUNCTIONS_DIR_FILES) | sed -n \
+		-e "s|[^ ]*/\([a-z][a-z_-]*\).fish|'\1'|p" | fgrep -vx -f lexicon_catalog.txt | sed >>lexicon.tmp -n \
+		-e 'w lexicon_catalog.tmp' \
+		-e "s|'\(.*\)'|func \1|p"; \
+	sed <share/functions/__fish_config_interactive.fish >>lexicon.tmp -n \
+		-e '/set_default/s/.*\(fish_[a-z][a-z_]*\).*$$/clrv \1/p' \
+		-e '$$G;s/.*\n/==end==/p'; \
+	sed <share/functions/__fish_config_interactive.fish >>lexicon.tmp -n \
+		-e '1G;s/.*\n/==styles==/p' \
+		-e '/set_default/s/.*fish_color\(_[a-z][a-z_]*\)/style\1/' \
+		-e '/^style_/s/_\([^ ]*\) --\([^ ]*\).*$$/ \1 \2/p' \
+		-e '/^style_/s/_\([^ ]* [^- ]*\) --\([^ ]*\).*$$/ \1 \2/p' \
+		-e '/^style_/s/_\([^ ]* [^- ]*\).*$$/ \1/p'; \
+	mv lexicon.tmp lexicon.txt; rm -f lexicon_catalog.tmp lexicon_catalog.txt;
+
+#
+# Compile Doxygen Input Filter from the lexicon. This is an executable sed
+# script as Doxygen opens it via popen()(3) Input (doc.h) is piped through and
+# matching words inside /fish../endfish blocks are marked up, contextually,
+# with custom Doxygen commands in the form of @word_type{content}. These are
+# trapped by ALIASES in the various Doxyfiles, allowing the content to be
+# transformed depending on output type (HTML, man page, developer docs). In
+# HTML, a style context can be applied through the /fish{style} block and
+# providing suitable CSS in user_doc.css.in
+#
+
+doc_src/fish_lexicon_filter: lexicon.txt doc_src/fish_lexicon_filter.in
+	-rm $@.tmp $@
+	# Clean the filter input comments and set the shebang as sed can reside in
+	# /bin or /usr/bin and some versions dont allow more than one comment!.
+	sed <$@.in >$@.tmp -e 's|@sed@|'"`command -v sed`"'|' -e '/^[ ]*#[^!]/d'
+	# Scan through the lexicon, transforming each line to something usefue to Doxygen.
+	sed <lexicon.txt >>$@.tmp -n \
+		-e 's|^\([a-z][a-z][a-z][a-z]\) \([a-z_-]*\)$$|s,[[:<:]]\2[[:>:]],@\1{\2},g|p' \
+		-e '/==end==/G;s/.*\n/b tidy/p' \
+		-e '/==styles==/G;s/.*\n/:styles/p' \
+		-e 's|^\(style [^ ]*\) \(.*\)$$|s,\1,\2,|p' \
+		-e '$$G;s/.*\n/b processstyle/p'; \
+	mv $@.tmp $@; if test -x $@; then true; else chmod a+x $@; fi
 
 #
 # doc.h is a compilation of the various snipptes of text used both for
 # the user documentation and for internal help functions into a single
-# file that can be parsed dy Doxygen to generate the user
+# file that can be parsed by Doxygen to generate the user
 # documentation.
 #
 
@@ -748,6 +821,7 @@ clean:
 	rm -f $(PROGRAMS) fish_tests key_reader
 	rm -f command_list.txt command_list_toc.txt toc.txt
 	rm -f doc_src/index.hdr doc_src/commands.hdr
+	rm -f doc_src/fish_lexicon_filter lexicon.txt doc_src/user_doc.css
 	rm -f FISH-BUILD-VERSION-FILE
 	if test "$(HAVE_DOXYGEN)" = 1; then \
 		rm -rf doc user_doc share/man; \
-- 
cgit v1.2.3


From 1052eeee8cdc3e929b6031f94f8bff955e8bff4d Mon Sep 17 00:00:00 2001
From: Mark Griffiths <mark@thebespokepixel.com>
Date: Fri, 1 Aug 2014 13:25:41 +0100
Subject: Simplify styling

---
 Doxyfile.help                  |   1 +
 Doxyfile.user                  |   1 +
 Makefile.in                    |  17 +--
 doc_src/alias.txt              |   2 +-
 doc_src/and.txt                |   2 +-
 doc_src/begin.txt              |   2 +-
 doc_src/bg.txt                 |   2 +-
 doc_src/bind.txt               |   2 +-
 doc_src/block.txt              |   2 +-
 doc_src/break.txt              |   2 +-
 doc_src/breakpoint.txt         |   2 +-
 doc_src/builtin.txt            |   2 +-
 doc_src/case.txt               |   2 +-
 doc_src/cd.txt                 |   2 +-
 doc_src/commandline.txt        |   2 +-
 doc_src/contains.txt           |   2 +-
 doc_src/continue.txt           |   2 +-
 doc_src/count.txt              |   2 +-
 doc_src/dirh.txt               |   2 +-
 doc_src/dirs.txt               |   2 +-
 doc_src/echo.txt               |   2 +-
 doc_src/else.txt               |   2 +-
 doc_src/emit.txt               |   2 +-
 doc_src/end.txt                |   2 +-
 doc_src/eval.txt               |   2 +-
 doc_src/exec.txt               |   2 +-
 doc_src/exit.txt               |   2 +-
 doc_src/fg.txt                 |   2 +-
 doc_src/fish.txt               |   2 +-
 doc_src/fish_indent.txt        |   2 +-
 doc_src/fish_lexicon_filter.in |  57 +--------
 doc_src/fish_prompt.txt        |   2 +-
 doc_src/fish_right_prompt.txt  |   2 +-
 doc_src/for.txt                |   2 +-
 doc_src/funced.txt             |   2 +-
 doc_src/funcsave.txt           |   2 +-
 doc_src/function.txt           |   2 +-
 doc_src/functions.txt          |   2 +-
 doc_src/help.txt               |   2 +-
 doc_src/if.txt                 |   2 +-
 doc_src/index.hdr.in           |  11 +-
 doc_src/isatty.txt             |   2 +-
 doc_src/jobs.txt               |   2 +-
 doc_src/math.txt               |   2 +-
 doc_src/mimedb.txt             |   2 +-
 doc_src/nextd.txt              |   2 +-
 doc_src/not.txt                |   2 +-
 doc_src/open.txt               |   2 +-
 doc_src/or.txt                 |   2 +-
 doc_src/popd.txt               |   2 +-
 doc_src/prevd.txt              |   2 +-
 doc_src/psub.txt               |   2 +-
 doc_src/pushd.txt              |   2 +-
 doc_src/pwd.txt                |   2 +-
 doc_src/random.txt             |   2 +-
 doc_src/read.txt               |   2 +-
 doc_src/return.txt             |   2 +-
 doc_src/set.txt                |   2 +-
 doc_src/set_color.txt          |   2 +-
 doc_src/source.txt             |   2 +-
 doc_src/status.txt             |   2 +-
 doc_src/switch.txt             |   2 +-
 doc_src/test.txt               |   2 +-
 doc_src/trap.txt               |   2 +-
 doc_src/type.txt               |   2 +-
 doc_src/ulimit.txt             |   2 +-
 doc_src/umask.txt              |   2 +-
 doc_src/user_doc.css           | 261 +++++++++++++++++++++++++++++++++++++++++
 doc_src/user_doc.css.in        | 261 -----------------------------------------
 doc_src/vared.txt              |   2 +-
 doc_src/while.txt              |   2 +-
 71 files changed, 341 insertions(+), 396 deletions(-)
 create mode 100644 doc_src/user_doc.css
 delete mode 100644 doc_src/user_doc.css.in

(limited to 'Makefile.in')

diff --git a/Doxyfile.help b/Doxyfile.help
index 1c34667c..beda7bbb 100644
--- a/Doxyfile.help
+++ b/Doxyfile.help
@@ -244,6 +244,7 @@ ALIASES               += "blah{1}=\1"
 ALIASES               += "cmnd{1}=\1"
 ALIASES               += "func{1}=\1"
 ALIASES               += "sbin{1}=\1"
+ALIASES               += "args{1}=\1"
 ALIASES               += "opts{1}=\1"
 ALIASES               += "vars{1}=\1"
 ALIASES               += "optr{1}=\1"
diff --git a/Doxyfile.user b/Doxyfile.user
index f877c3b7..3f5f6149 100644
--- a/Doxyfile.user
+++ b/Doxyfile.user
@@ -244,6 +244,7 @@ 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>"
diff --git a/Makefile.in b/Makefile.in
index c8467092..ca4a33ab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -367,14 +367,7 @@ lexicon.txt: doc_src/commands.hdr $(FUNCTIONS_DIR_FILES) $(COMPLETIONS_DIR_FILES
 		-e 'w lexicon_catalog.tmp' \
 		-e "s|'\(.*\)'|func \1|p"; \
 	sed <share/functions/__fish_config_interactive.fish >>lexicon.tmp -n \
-		-e '/set_default/s/.*\(fish_[a-z][a-z_]*\).*$$/clrv \1/p' \
-		-e '$$G;s/.*\n/==end==/p'; \
-	sed <share/functions/__fish_config_interactive.fish >>lexicon.tmp -n \
-		-e '1G;s/.*\n/==styles==/p' \
-		-e '/set_default/s/.*fish_color\(_[a-z][a-z_]*\)/style\1/' \
-		-e '/^style_/s/_\([^ ]*\) --\([^ ]*\).*$$/ \1 \2/p' \
-		-e '/^style_/s/_\([^ ]* [^- ]*\) --\([^ ]*\).*$$/ \1 \2/p' \
-		-e '/^style_/s/_\([^ ]* [^- ]*\).*$$/ \1/p'; \
+		-e '/set_default/s/.*\(fish_[a-z][a-z_]*\).*$$/clrv \1/p'; \
 	mv lexicon.tmp lexicon.txt; rm -f lexicon_catalog.tmp lexicon_catalog.txt;
 
 #
@@ -395,11 +388,7 @@ doc_src/fish_lexicon_filter: lexicon.txt doc_src/fish_lexicon_filter.in
 	sed <$@.in >$@.tmp -e 's|@sed@|'"`command -v sed`"'|' -e '/^[ ]*#[^!]/d'
 	# Scan through the lexicon, transforming each line to something usefue to Doxygen.
 	sed <lexicon.txt >>$@.tmp -n \
-		-e 's|^\([a-z][a-z][a-z][a-z]\) \([a-z_-]*\)$$|s,[[:<:]]\2[[:>:]],@\1{\2},g|p' \
-		-e '/==end==/G;s/.*\n/b tidy/p' \
-		-e '/==styles==/G;s/.*\n/:styles/p' \
-		-e 's|^\(style [^ ]*\) \(.*\)$$|s,\1,\2,|p' \
-		-e '$$G;s/.*\n/b processstyle/p'; \
+		-e 's|^\([a-z][a-z][a-z][a-z]\) \([a-z_-]*\)$$|s,[[:<:]]\2[[:>:]],@\1{\2},g|p';
 	mv $@.tmp $@; if test -x $@; then true; else chmod a+x $@; fi
 
 #
@@ -821,7 +810,7 @@ clean:
 	rm -f $(PROGRAMS) fish_tests key_reader
 	rm -f command_list.txt command_list_toc.txt toc.txt
 	rm -f doc_src/index.hdr doc_src/commands.hdr
-	rm -f doc_src/fish_lexicon_filter lexicon.txt doc_src/user_doc.css
+	rm -f doc_src/fish_lexicon_filter lexicon.txt
 	rm -f FISH-BUILD-VERSION-FILE
 	if test "$(HAVE_DOXYGEN)" = 1; then \
 		rm -rf doc user_doc share/man; \
diff --git a/doc_src/alias.txt b/doc_src/alias.txt
index cc8b7fdc..c1450cc4 100644
--- a/doc_src/alias.txt
+++ b/doc_src/alias.txt
@@ -1,7 +1,7 @@
 \section alias alias - create a function
 
 \subsection alias-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 alias NAME DEFINITION
 alias NAME=DEFINITION
 \endfish
diff --git a/doc_src/and.txt b/doc_src/and.txt
index de5bb1eb..9d71d67c 100644
--- a/doc_src/and.txt
+++ b/doc_src/and.txt
@@ -1,7 +1,7 @@
 \section and and - conditionally execute a command
 
 \subsection and-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 COMMAND1; and COMMAND2
 \endfish
 
diff --git a/doc_src/begin.txt b/doc_src/begin.txt
index aee50f5c..6807fac4 100644
--- a/doc_src/begin.txt
+++ b/doc_src/begin.txt
@@ -1,7 +1,7 @@
 \section begin begin - start a new block of code
 
 \subsection begin-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 begin; [COMMANDS...;] end
 \endfish
 
diff --git a/doc_src/bg.txt b/doc_src/bg.txt
index 403f2e4a..d05bf54d 100644
--- a/doc_src/bg.txt
+++ b/doc_src/bg.txt
@@ -1,7 +1,7 @@
 \section bg bg - send jobs to background
 
 \subsection bg-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 bg [PID...]
 \endfish
 
diff --git a/doc_src/bind.txt b/doc_src/bind.txt
index 442d7e99..9607c8b0 100644
--- a/doc_src/bind.txt
+++ b/doc_src/bind.txt
@@ -1,7 +1,7 @@
 \section bind bind - handle fish key bindings
 
 \subsection bind-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 bind [OPTIONS] SEQUENCE COMMAND
 \endfish
 
diff --git a/doc_src/block.txt b/doc_src/block.txt
index 19ccb29b..f3f741f1 100644
--- a/doc_src/block.txt
+++ b/doc_src/block.txt
@@ -1,7 +1,7 @@
 \section block block - temporarily block delivery of events
 
 \subsection block-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 block [OPTIONS...]
 \endfish
 
diff --git a/doc_src/break.txt b/doc_src/break.txt
index 3109fe9c..2056b054 100644
--- a/doc_src/break.txt
+++ b/doc_src/break.txt
@@ -1,7 +1,7 @@
 \section break break - stop the current inner loop
 
 \subsection break-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 LOOP_CONSTRUCT; [COMMANDS...] break; [COMMANDS...] end
 \endfish
 
diff --git a/doc_src/breakpoint.txt b/doc_src/breakpoint.txt
index bff8fc5a..348c779d 100644
--- a/doc_src/breakpoint.txt
+++ b/doc_src/breakpoint.txt
@@ -1,7 +1,7 @@
 \section breakpoint breakpoint - Launch debug mode
 
 \subsection breakpoint-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 breakpoint
 \endfish
 
diff --git a/doc_src/builtin.txt b/doc_src/builtin.txt
index 8f480b47..2d915fc3 100644
--- a/doc_src/builtin.txt
+++ b/doc_src/builtin.txt
@@ -1,7 +1,7 @@
 \section builtin builtin - run a builtin command
 
 \subsection builtin-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 builtin BUILTINNAME [OPTIONS...]
 \endfish
 
diff --git a/doc_src/case.txt b/doc_src/case.txt
index aab24d53..b0500650 100644
--- a/doc_src/case.txt
+++ b/doc_src/case.txt
@@ -1,7 +1,7 @@
 \section case case - conditionally execute a block of commands
 
 \subsection case-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 switch VALUE; [case [WILDCARD...]; [COMMANDS...]; ...] end
 \endfish
 
diff --git a/doc_src/cd.txt b/doc_src/cd.txt
index 968333f3..200d9767 100644
--- a/doc_src/cd.txt
+++ b/doc_src/cd.txt
@@ -1,7 +1,7 @@
 \section cd cd - change directory
 
 \subsection cd-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 cd [DIRECTORY]
 \endfish
 
diff --git a/doc_src/commandline.txt b/doc_src/commandline.txt
index c61b51da..b3eaba5a 100644
--- a/doc_src/commandline.txt
+++ b/doc_src/commandline.txt
@@ -1,7 +1,7 @@
 \section commandline commandline - set or get the current command line buffer
 
 \subsection commandline-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 commandline [OPTIONS] [CMD]
 \endfish
 
diff --git a/doc_src/contains.txt b/doc_src/contains.txt
index 3671c8a3..2ec6e092 100644
--- a/doc_src/contains.txt
+++ b/doc_src/contains.txt
@@ -1,7 +1,7 @@
 \section contains contains - test if a word is present in a list
 
 \subsection contains-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 contains [OPTIONS] KEY [VALUES...]
 \endfish
 
diff --git a/doc_src/continue.txt b/doc_src/continue.txt
index e79c8f35..cb92c9cf 100644
--- a/doc_src/continue.txt
+++ b/doc_src/continue.txt
@@ -1,7 +1,7 @@
 \section continue continue - skip the remainder of the current iteration of the current inner loop
 
 \subsection continue-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 LOOP_CONSTRUCT; [COMMANDS...;] continue; [COMMANDS...;] end
 \endfish
 
diff --git a/doc_src/count.txt b/doc_src/count.txt
index 1af00e00..bf66d207 100644
--- a/doc_src/count.txt
+++ b/doc_src/count.txt
@@ -1,7 +1,7 @@
 \section count count - count the number of elements of an array
 
 \subsection count-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 count $VARIABLE
 \endfish
 
diff --git a/doc_src/dirh.txt b/doc_src/dirh.txt
index 38160b86..00bd581f 100644
--- a/doc_src/dirh.txt
+++ b/doc_src/dirh.txt
@@ -1,7 +1,7 @@
 \section dirh dirh - print directory history
 
 \subsection dirh-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 dirh
 \endfish
 
diff --git a/doc_src/dirs.txt b/doc_src/dirs.txt
index f8744071..c15834c5 100644
--- a/doc_src/dirs.txt
+++ b/doc_src/dirs.txt
@@ -1,7 +1,7 @@
 \section dirs dirs - print directory stack
 
 \subsection dirs-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 dirs
 \endfish
 
diff --git a/doc_src/echo.txt b/doc_src/echo.txt
index edb3c963..4ce96cb4 100644
--- a/doc_src/echo.txt
+++ b/doc_src/echo.txt
@@ -1,7 +1,7 @@
 \section echo echo - display a line of text
 
 \subsection echo-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 echo [STRING]
 \endfish
 
diff --git a/doc_src/else.txt b/doc_src/else.txt
index 069a13bd..a22cfcdb 100644
--- a/doc_src/else.txt
+++ b/doc_src/else.txt
@@ -1,7 +1,7 @@
 \section else else - execute command if a condition is not met
 
 \subsection else-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 if CONDITION; COMMANDS_TRUE...; [else; COMMANDS_FALSE...;] end
 \endfish
 
diff --git a/doc_src/emit.txt b/doc_src/emit.txt
index cfcc107f..d8f17b45 100644
--- a/doc_src/emit.txt
+++ b/doc_src/emit.txt
@@ -1,7 +1,7 @@
 \section emit emit - Emit a generic event
 
 \subsection emit-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 emit EVENT_NAME [ARGUMENTS...]
 \endfish
 
diff --git a/doc_src/end.txt b/doc_src/end.txt
index be971e95..aca29495 100644
--- a/doc_src/end.txt
+++ b/doc_src/end.txt
@@ -1,7 +1,7 @@
 \section end end - end a block of commands.
 
 \subsection end-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 begin; [COMMANDS...] end
 if CONDITION; COMMANDS_TRUE...; [else; COMMANDS_FALSE...;] end
 while CONDITION; COMMANDS...; end
diff --git a/doc_src/eval.txt b/doc_src/eval.txt
index 22f92164..c966b576 100644
--- a/doc_src/eval.txt
+++ b/doc_src/eval.txt
@@ -1,7 +1,7 @@
 \section eval eval - evaluate the specified commands
 
 \subsection eval-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 eval [COMMANDS...]
 \endfish
 
diff --git a/doc_src/exec.txt b/doc_src/exec.txt
index 75effda1..4bcd3999 100644
--- a/doc_src/exec.txt
+++ b/doc_src/exec.txt
@@ -1,7 +1,7 @@
 \section exec exec - execute command in current process
 
 \subsection exec-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 exec COMMAND [OPTIONS...]
 \endfish
 
diff --git a/doc_src/exit.txt b/doc_src/exit.txt
index ae607a4c..fcec4b92 100644
--- a/doc_src/exit.txt
+++ b/doc_src/exit.txt
@@ -1,7 +1,7 @@
 \section exit exit - exit the shell
 
 \subsection exit-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 exit [STATUS]
 \endfish
 
diff --git a/doc_src/fg.txt b/doc_src/fg.txt
index 0e45df04..e9f23bc5 100644
--- a/doc_src/fg.txt
+++ b/doc_src/fg.txt
@@ -1,7 +1,7 @@
 \section fg fg - bring job to foreground
 
 \subsection fg-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 fg [PID]
 \endfish
 
diff --git a/doc_src/fish.txt b/doc_src/fish.txt
index 27235f57..80e7e4e5 100644
--- a/doc_src/fish.txt
+++ b/doc_src/fish.txt
@@ -1,7 +1,7 @@
 \section fish fish - the friendly interactive shell
 
 \subsection fish-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 fish [-h] [-v] [-c command] [FILE [ARGUMENTS...]]
 \endfish
 
diff --git a/doc_src/fish_indent.txt b/doc_src/fish_indent.txt
index 761134ec..51cb5fa6 100644
--- a/doc_src/fish_indent.txt
+++ b/doc_src/fish_indent.txt
@@ -1,7 +1,7 @@
 \section fish_indent fish_indent - indenter and prettifier
 
 \subsection fish_indent-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 fish_indent [options]
 \endfish
 
diff --git a/doc_src/fish_lexicon_filter.in b/doc_src/fish_lexicon_filter.in
index 60cde9be..47ee345e 100644
--- a/doc_src/fish_lexicon_filter.in
+++ b/doc_src/fish_lexicon_filter.in
@@ -57,53 +57,10 @@
     # End block
     /\\endfish/b
 }
-/style/b styles
 #.
 # This is not the pattern we're looking for
 b
 #.
-# Sets CSS styles according to fish defaults.
-#.
-# Used for building the documentation's CSS file
-#.
-:processstyle
-#. Make Hex uniform
-s/0x//g
-/[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]*/ {
-    y/ABCDEF/abcdef/
-    s/^[0-9a-f]/#&/
-}
-#.
-# Set simple styles
-#.
-s/bold/font-weight:bold;/
-#.
-# Replace named colours (taken from color.cpp)
-#.
-s/black/#000/
-s/red/#f00/
-s/green/#0f0/
-s/brown/#725000/
-s/yellow/#ff0/
-s/blue/#00f/
-s/magenta/#f0f/
-s/purple/#f0f/
-s/cyan/#0ff/
-s/white/#fff/
-s/normal/#fff text-decoration:none; border-bottom:none; font-weight:normal;/
-#.
-/background/ {
-    s/background=\(#[0-9a-f][0-9a-f][0-9a-f][0-9a-f]*\)/background-color: \1;/
-}
-/underline/ {
-    s/^\(#[0-9a-f][0-9a-f][0-9a-f][0-9a-f]*\).*$/\1 border-bottom: 2px solid \1;/
-    s/^underline$/text-decoration: underline;/
-}
-# If we start with just a colour, make it explicit.
-s/^#[0-9a-f][0-9a-f]*/color: &;/
-#.
-# All done, return CSS style content
-b
 # Process any HTML tags.
 # Structured to reduce sed's greediness.
 :html
@@ -204,7 +161,7 @@ s/-\([A-Za-z]\)\([^A-Za-z}]\)/\\\
 \2/g
 #.
 # Long options
-s/--\([A-Za-z][A-Za-z0-9=_-]*\)\([^A-Za-z0-9]\)/\\\
+s/--\([A-Za-z][A-Za-z0-9=_-]*\)\([^A-Za-z0-9=_-]*\)/\\\
 <@opts{--\1}\
 \2/g
 #.
@@ -259,6 +216,9 @@ s/\n//g
     s/\(fsfo{[^@]*\)@sbin{\([^}]*\)}/\1\2/
     t cleanfsfo
 }
+# Convert 2nd order commands/functions and binaries to arguments
+s/@cmnd/@args/g
+s/@args/@cmnd/1
 # Character Entities
 #.
 # Mark up a few sesitive characters.
@@ -293,7 +253,7 @@ s/^[ ]*[^<][^@][^}]*$//
 s/^[ ]*[^<][^@][^\\]*[\\ ()]*\n//
 :holdflush
 s/}[)(\\ ][)(\\ ]*/}/
-s/\n[];)|* ][^\\]*[\\]*//
+s/\n[];)|* -][^\\]*[\\]*//
 t holdflush
 s/\n$//
 #.
@@ -321,7 +281,7 @@ s/\([A-Za-z*][A-Za-z]*\.[a-z0-9][a-z0-9]*\)/@fsfo{\1}/g
 #.
 # Manually add a few commands not harvested from source.
 #.
-s,[[:<:]]in[[:>:]],@cmnd{in},g
+s,[[:<:]]in[[:>:]],@args{in},g
 s,[[:<:]]whoami[[:>:]],@sbin{whoami},g
 s,[[:<:]]fishd[[:>:]],@sbin{fishd},g
 #.
@@ -360,8 +320,3 @@ s,[[:<:]]fishd[[:>:]],@sbin{fishd},g
 # single line.
 #.
 # b tidy
-#.
-# Colour lookup functions
-#.
-# The Makefile will add a table of colour names and values, possibly with
-# extra style information, that are used to set defaults in the CSS file.
diff --git a/doc_src/fish_prompt.txt b/doc_src/fish_prompt.txt
index cecc338d..53da848e 100644
--- a/doc_src/fish_prompt.txt
+++ b/doc_src/fish_prompt.txt
@@ -1,7 +1,7 @@
 \section fish_prompt fish_prompt - define the appearance of the command line prompt
 
 \subsection fish_prompt-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 function fish_prompt
     ...
 end
diff --git a/doc_src/fish_right_prompt.txt b/doc_src/fish_right_prompt.txt
index 15f1f95b..19d1efec 100644
--- a/doc_src/fish_right_prompt.txt
+++ b/doc_src/fish_right_prompt.txt
@@ -1,7 +1,7 @@
 \section fish_right_prompt fish_right_prompt - define the appearance of the right-side command line prompt
 
 \subsection fish_right_prompt-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 function fish_right_prompt
     ...
 end
diff --git a/doc_src/for.txt b/doc_src/for.txt
index 902f4495..c75f953c 100644
--- a/doc_src/for.txt
+++ b/doc_src/for.txt
@@ -1,7 +1,7 @@
 \section for for - perform a set of commands multiple times.
 
 \subsection for-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 for VARNAME in [VALUES...]; COMMANDS...; end
 \endfish
 
diff --git a/doc_src/funced.txt b/doc_src/funced.txt
index 82f2cd63..51d1b865 100644
--- a/doc_src/funced.txt
+++ b/doc_src/funced.txt
@@ -1,7 +1,7 @@
 \section funced funced - edit a function interactively
 
 \subsection funced-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 funced [OPTIONS] NAME
 \endfish
 
diff --git a/doc_src/funcsave.txt b/doc_src/funcsave.txt
index fd4b5d87..c3f2fe32 100644
--- a/doc_src/funcsave.txt
+++ b/doc_src/funcsave.txt
@@ -1,7 +1,7 @@
 \section funcsave funcsave - save the definition of a function to the user's autoload directory
 
 \subsection funcsave-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 funcsave FUNCTION_NAME
 \endfish
 
diff --git a/doc_src/function.txt b/doc_src/function.txt
index 0f3b4fb0..74dc9de5 100644
--- a/doc_src/function.txt
+++ b/doc_src/function.txt
@@ -1,7 +1,7 @@
 \section function function - create a function
 
 \subsection function-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 function [OPTIONS] NAME; BODY; end
 \endfish
 
diff --git a/doc_src/functions.txt b/doc_src/functions.txt
index 048ee93e..520b55b7 100644
--- a/doc_src/functions.txt
+++ b/doc_src/functions.txt
@@ -1,7 +1,7 @@
 \section functions functions - print or erase functions
 
 \subsection functions-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 functions [-a|--all] [-n|--names]
 functions -c OLDNAME NEWNAME
 functions -d DESCRIPTION FUNCTION
diff --git a/doc_src/help.txt b/doc_src/help.txt
index a3375204..d862da8c 100644
--- a/doc_src/help.txt
+++ b/doc_src/help.txt
@@ -1,7 +1,7 @@
 \section help help - display fish documentation
 
 \subsection help-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 help [SECTION]
 \endfish
 
diff --git a/doc_src/if.txt b/doc_src/if.txt
index 38054c37..b1ca88f5 100644
--- a/doc_src/if.txt
+++ b/doc_src/if.txt
@@ -1,7 +1,7 @@
 \section if if - conditionally execute a command
 
 \subsection if-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 if CONDITION; COMMANDS_TRUE...; [else if CONDITION2; COMMANDS_TRUE2...;] [else; COMMANDS_FALSE...;] end
 \endfish
 
diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in
index 2555ca08..95b1559c 100644
--- a/doc_src/index.hdr.in
+++ b/doc_src/index.hdr.in
@@ -188,7 +188,7 @@ When you start a job in `fish`, `fish` itself will pause, and give control of th
 Example:
 
 \fish
-emacs &
+emacs &amp;
 \endfish
 
 will start the emacs text editor in the background.
@@ -316,21 +316,20 @@ Specifying your own completions is not difficult. To specify a completion, use t
 
 To provide a list of possible completions for myprog, use the `-a` switch. If `myprog` accepts the arguments start and stop, this can be specified as `complete -c myprog -a 'start stop'`. The argument to the `-a` switch is always a single string. At completion time, it will be tokenized on spaces and tabs, and variable expansion, command substitution and other forms of parameter expansion will take place.
 
-Fish has a special syntax to support specifying switches accepted by a command. The switches `-s`, `-l` and `-o` are used to specify a short switch (single character, such as -l), a gnu style long switch (such as '`--color`') and an old-style long switch (like '`-shuffle`'), respectively. If the command 'myprog' has an option '-o' which can also be written as '`--output`', and which can take an additional value of either 'yes' or 'no', this can be specified by writing:
-
+`fish` has a special syntax to support specifying switches accepted by a command. The switches `-s`, `-l` and `-o` are used to specify a short switch (single character, such as `-l`), a gnu style long switch (such as '`--color`') and an old-style long switch (like '`-shuffle`'), respectively. If the command 'myprog' has an option '-o' which can also be written as '`--output`', and which can take an additional value of either 'yes' or 'no', this can be specified by writing:
 
 \fish
 complete -c myprog -s o -l output -a "yes no"
 \endfish
 
-There are also special switches for specifying that a switch requires an argument, to disable filename completion, to create completions that are only available in some combinations, etc..  For a complete description of the various switches accepted by the `complete` command, see the documentation for the <a href="commands.html#complete">complete</a> builtin, or write `complete --help` inside the `fish` shell.
+There are also special switches for specifying that a switch requires an argument, to disable filename completion, to create completions that are only available in some combinations, etc..  For a complete description of the various switches accepted by the `complete` command, see the documentationfor the <a href="commands.html#complete">complete</a> builtin, or write `complete --help` inside the `fish` shell.
 
 For examples of how to write your own complex completions, study the completions in `/usr/share/fish/completions`. (The exact path depends on your chosen installation prefix and may be slightly different)
 
 
 \subsection completion-func Useful functions for writing completions
 
-Fish ships with several functions that are very useful when writing command specific completions. Most of these functions name begins with the string '`__fish_`'. Such functions are internal to fish and their name and interface may change in future fish versions. Still, some of them may be very useful when writing completions. A few of these functions are described here. Be aware that they may be removed or changed in future versions of fish.
+`fish` ships with several functions that are very useful when writing command specific completions. Most of these functions name begins with the string '`__fish_`'. Such functions are internal to `fish` and their name and interface may change in future fish versions. Still, some of them may be very useful when writing completions. A few of these functions are described here. Be aware that they may be removed or changed in future versions of fish.
 
 Functions beginning with the string `__fish_print_` print a newline- separated list of strings. For example, `__fish_print_filesystems` prints a list of all known file systems. Functions beginning with `__fish_complete_` print out a newline separated list of completions with descriptions. The description is separated from the completion by a tab character.
 
@@ -349,7 +348,7 @@ Functions beginning with the string `__fish_print_` print a newline- separated l
 
 Completions can be defined on the commandline or in a configuration file, but they can also be automatically loaded. Fish automatically searches through any directories in the array variable `$fish_complete_path`, and any completions defined are automatically loaded when needed. A completion file must have a filename consisting of the name of the command to complete and the suffix '`.fish`'.
 
-The default value for `$fish`_complete_path is `~/.config/fish/completions` `/etc/fish/completions` `/usr/share/fish/completions`. The exact path to the last two of these may be slightly different depending on what install path prefix was chosen at configuration time. If a suitable file is found in one of these directories, it will be automatically loaded and the search will be stopped. The rationale behind having three different directories is that the first one is for user specific completions, the second one is for system-wide completions and the last one is for default fish completions.
+The default value for `$fish_complete_path` is `~/.config/fish/completions` `/etc/fish/completions` `/usr/share/fish/completions`. The exact path to the last two of these may be slightly different depending on what install path prefix was chosen at configuration time. If a suitable file is found in one of these directories, it will be automatically loaded and the search will be stopped. The rationale behind having three different directories is that the first one is for user specific completions, the second one is for system-wide completions and the last one is for default fish completions.
 
 If you have written new completions for a common Unix command, please consider sharing your work by submitting it via the instructions in <a href="#more-help">Further help and development</a>.
 
diff --git a/doc_src/isatty.txt b/doc_src/isatty.txt
index 33f0a6e7..9381d102 100644
--- a/doc_src/isatty.txt
+++ b/doc_src/isatty.txt
@@ -1,7 +1,7 @@
 \section isatty isatty - test if a file or file descriptor is a tty.
 
 \subsection isatty-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 isatty [FILE | DEVICE | FILE DESCRIPTOR NUMBER]
 \endfish
 
diff --git a/doc_src/jobs.txt b/doc_src/jobs.txt
index f47e618e..5056357c 100644
--- a/doc_src/jobs.txt
+++ b/doc_src/jobs.txt
@@ -1,7 +1,7 @@
 \section jobs jobs - print currently running jobs
 
 \subsection jobs-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 jobs [OPTIONS] [PID]
 \endfish
 
diff --git a/doc_src/math.txt b/doc_src/math.txt
index 887a813c..3b984fc0 100644
--- a/doc_src/math.txt
+++ b/doc_src/math.txt
@@ -2,7 +2,7 @@
 \section math math - Perform mathematics calculations
 
 \subsection math-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 math EXPRESSION
 \endfish
 
diff --git a/doc_src/mimedb.txt b/doc_src/mimedb.txt
index 79992f14..d65fd6ba 100644
--- a/doc_src/mimedb.txt
+++ b/doc_src/mimedb.txt
@@ -1,7 +1,7 @@
 \section mimedb mimedb - lookup file information via the mime database
 
 \subsection mimedb-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 mimedb [OPTIONS] FILES...
 \endfish
 
diff --git a/doc_src/nextd.txt b/doc_src/nextd.txt
index 2aad6049..a098c0a7 100644
--- a/doc_src/nextd.txt
+++ b/doc_src/nextd.txt
@@ -1,7 +1,7 @@
 \section nextd nextd - move forward through directory history
 
 \subsection nextd-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 nextd [ -l | --list ] [POS]
 \endfish
 
diff --git a/doc_src/not.txt b/doc_src/not.txt
index 746de9ba..b0d893f7 100644
--- a/doc_src/not.txt
+++ b/doc_src/not.txt
@@ -1,7 +1,7 @@
 \section not not - negate the exit status of a job
 
 \subsection not-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 not COMMAND [OPTIONS...]
 \endfish
 
diff --git a/doc_src/open.txt b/doc_src/open.txt
index 232b58b0..48c71cac 100644
--- a/doc_src/open.txt
+++ b/doc_src/open.txt
@@ -1,7 +1,7 @@
 \section open open - open file in its default application
 
 \subsection open-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 open FILES...
 \endfish
 
diff --git a/doc_src/or.txt b/doc_src/or.txt
index 39c3d95a..0d11129b 100644
--- a/doc_src/or.txt
+++ b/doc_src/or.txt
@@ -1,7 +1,7 @@
 \section or or - conditionally execute a command
 
 \subsection or-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 COMMAND1; or COMMAND2
 \endfish
 
diff --git a/doc_src/popd.txt b/doc_src/popd.txt
index 297a0a80..f160f43d 100644
--- a/doc_src/popd.txt
+++ b/doc_src/popd.txt
@@ -1,7 +1,7 @@
 \section popd popd - move through directory stack
 
 \subsection popd-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 popd
 \endfish
 
diff --git a/doc_src/prevd.txt b/doc_src/prevd.txt
index 8bead8a1..557f6c98 100644
--- a/doc_src/prevd.txt
+++ b/doc_src/prevd.txt
@@ -1,7 +1,7 @@
 \section prevd prevd - move backward through directory history
 
 \subsection prevd-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 prevd [ -l | --list ] [POS]
 \endfish
 
diff --git a/doc_src/psub.txt b/doc_src/psub.txt
index 62c09be0..d0caafba 100644
--- a/doc_src/psub.txt
+++ b/doc_src/psub.txt
@@ -1,7 +1,7 @@
 \section psub psub - perform process substitution
 
 \subsection psub-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 COMMAND1 (COMMAND2|psub [-f])
 \endfish
 
diff --git a/doc_src/pushd.txt b/doc_src/pushd.txt
index d6f50e63..3161fd09 100644
--- a/doc_src/pushd.txt
+++ b/doc_src/pushd.txt
@@ -1,7 +1,7 @@
 \section pushd pushd - push directory to directory stack
 
 \subsection pushd-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 pushd [DIRECTORY]
 \endfish
 
diff --git a/doc_src/pwd.txt b/doc_src/pwd.txt
index 0b83748d..46b6419f 100644
--- a/doc_src/pwd.txt
+++ b/doc_src/pwd.txt
@@ -1,7 +1,7 @@
 \section pwd pwd - output the current working directory
 
 \subsection pwd-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 pwd
 \endfish
 
diff --git a/doc_src/random.txt b/doc_src/random.txt
index abc444a8..3415daa6 100644
--- a/doc_src/random.txt
+++ b/doc_src/random.txt
@@ -1,7 +1,7 @@
 \section random random - generate random number
 
 \subsection random-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 random [SEED]
 \endfish
 
diff --git a/doc_src/read.txt b/doc_src/read.txt
index 44076bc4..f29e98ed 100644
--- a/doc_src/read.txt
+++ b/doc_src/read.txt
@@ -1,7 +1,7 @@
 \section read read - read line of input into variables
 
 \subsection read-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 read [OPTIONS] [VARIABLES...]
 \endfish
 
diff --git a/doc_src/return.txt b/doc_src/return.txt
index a044e58a..5f033349 100644
--- a/doc_src/return.txt
+++ b/doc_src/return.txt
@@ -1,7 +1,7 @@
 \section return return - stop the current inner function
 
 \subsection return-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 function NAME; [COMMANDS...;] return [STATUS]; [COMMANDS...;] end
 \endfish
 
diff --git a/doc_src/set.txt b/doc_src/set.txt
index 9dc1e04b..d27f603d 100644
--- a/doc_src/set.txt
+++ b/doc_src/set.txt
@@ -1,7 +1,7 @@
 \section set set - display and change shell variables.
 
 \subsection set-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 set [SCOPE_OPTIONS]
 set [OPTIONS] VARIABLE_NAME VALUES...
 set [OPTIONS] VARIABLE_NAME[INDICES]... VALUES...
diff --git a/doc_src/set_color.txt b/doc_src/set_color.txt
index ade02990..0597114b 100644
--- a/doc_src/set_color.txt
+++ b/doc_src/set_color.txt
@@ -1,7 +1,7 @@
 \section set_color set_color - set the terminal color
 
 \subsection set_color-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 set_color [-h|--help] [-b|--background COLOR] [COLOR]
 \endfish
 
diff --git a/doc_src/source.txt b/doc_src/source.txt
index bb32e30a..5efb6740 100644
--- a/doc_src/source.txt
+++ b/doc_src/source.txt
@@ -1,7 +1,7 @@
 \section source source - evaluate contents of file.
 
 \subsection source-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 source FILENAME [ARGUMENTS...]
 \endfish
 
diff --git a/doc_src/status.txt b/doc_src/status.txt
index 5cf8d98a..60e2342a 100644
--- a/doc_src/status.txt
+++ b/doc_src/status.txt
@@ -1,7 +1,7 @@
 \section status status - query fish runtime information
 
 \subsection status-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 status [OPTION]
 \endfish
 
diff --git a/doc_src/switch.txt b/doc_src/switch.txt
index 42e0d07a..7245b63f 100644
--- a/doc_src/switch.txt
+++ b/doc_src/switch.txt
@@ -1,7 +1,7 @@
 \section switch switch - conditionally execute a block of commands
 
 \subsection switch-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 switch VALUE; [case [WILDCARD...]; [COMMANDS...]; ...] end
 \endfish
 
diff --git a/doc_src/test.txt b/doc_src/test.txt
index ba0eb0eb..199c062d 100644
--- a/doc_src/test.txt
+++ b/doc_src/test.txt
@@ -1,7 +1,7 @@
 \section test test - perform tests on files and text
 
 \subsection test-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 test [EXPRESSION]
 \endfish
 
diff --git a/doc_src/trap.txt b/doc_src/trap.txt
index e3a280a5..fdccd178 100644
--- a/doc_src/trap.txt
+++ b/doc_src/trap.txt
@@ -1,7 +1,7 @@
 \section trap trap - perform an action when the shell receives a signal
 
 \subsection trap-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 trap [OPTIONS] [[ARG] SIGSPEC ... ]
 \endfish
 
diff --git a/doc_src/type.txt b/doc_src/type.txt
index 7a2c882b..c72520a1 100644
--- a/doc_src/type.txt
+++ b/doc_src/type.txt
@@ -1,7 +1,7 @@
 \section type type - indicate how a command would be interpreted
 
 \subsection type-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 type [OPTIONS] NAME [NAME ...]
 \endfish
 
diff --git a/doc_src/ulimit.txt b/doc_src/ulimit.txt
index 0d35f913..7ce12dcd 100644
--- a/doc_src/ulimit.txt
+++ b/doc_src/ulimit.txt
@@ -1,7 +1,7 @@
 \section ulimit ulimit - set or get resource usage limits
 
 \subsection ulimit-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 ulimit [OPTIONS] [LIMIT]
 \endfish
 
diff --git a/doc_src/umask.txt b/doc_src/umask.txt
index 49e0f796..7a83ddfa 100644
--- a/doc_src/umask.txt
+++ b/doc_src/umask.txt
@@ -1,7 +1,7 @@
 \section umask umask - set or get the file creation mode mask
 
 \subsection umask-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 umask [OPTIONS] [MASK]
 \endfish
 
diff --git a/doc_src/user_doc.css b/doc_src/user_doc.css
new file mode 100644
index 00000000..d2f00642
--- /dev/null
+++ b/doc_src/user_doc.css
@@ -0,0 +1,261 @@
+* {
+    margin: 0;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+}
+html { font-size: 62.5%; }
+html, body {
+    min-height: 100%;
+    background: #fff;
+    color: #111;
+}
+body {
+    text-rendering: optimizeLegibility;
+    overflow: hidden;
+}
+.logo {
+    position: absolute;
+    width: 200px;
+    height: 135px;
+    background-image: url(ascii_fish.png);
+}
+/*Top site index*/
+.qindex {
+    font: 500 1.4rem/3.6rem "DejaVuSansCondensed", Roboto, Verdana, "Helvetica Neue", Helvetica, Arial, sans-serif;
+    border: none;
+    color: white;
+    background-color: #1f2d53;
+    text-align: center;
+    position: relative;
+    width: 100%;
+    height: 3.6rem;
+    overflow: hidden;
+}
+/* Don't show the header */
+.header { display: none; }
+/*Substructure*/
+.contents {
+    margin: 0;
+    min-width: 570px;
+}
+.fish_left_bar, .fish_right_bar, .fish_only_bar {
+    position: absolute;
+    top: 3.6rem;
+    bottom: 0;
+    overflow-y: scroll;
+    -webkit-overflow-scrolling: touch; /* necessary for momentum scrolling */
+    font: 400 1.4rem/2.3rem "DejaVuSans", Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+.fish_left_bar {
+    width: 250px;
+    color: white;
+    font-family: "DejaVuSansCondensed", Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif;
+    background-color: #1f2d53;
+}
+.fish_left_little { width: 200px; }
+.fish_left_big { width: 380px; }
+.fish_right_bar {
+    margin-left: 250px;
+    margin-right: 0;
+    padding: 0 3rem;
+    -moz-box-shadow: -6px 0 6px 4px black;
+    -webkit-box-shadow: -6px 0 6px 4px black;
+    box-shadow: -0.6rem 0 0.6rem 0.4rem rgba(0,0,0,0.4);
+}
+.fish_right_little { margin-left: 380px; }
+.fish_right_big { margin-left: 200px; }
+.fish_only_bar {
+    width: 100%;
+}
+hr {
+    height: 0;
+    border: none;
+    border-top: 1px solid #AAA;
+}
+/*Ineraction*/
+a { color: #3d5cb3; }
+.qindex a {
+    color: white;
+    text-decoration: none;
+}
+.qindex a:hover { text-decoration: underline; }
+.fish_left_bar a {
+    color: white;
+    text-decoration: none;
+}
+.fish_left_bar a:visited { color: inherit; }
+.fish_left_bar a:hover { color: #88aaff; }
+.fish_right_bar a { text-decoration: none; }
+.fish_right_bar a:hover { text-decoration: underline; }
+/* Adjust lists */
+.fish_left_bar ul {
+    padding-left: 2rem;
+    padding-right: 1rem;
+}
+.fish_right_bar ul {
+    list-style-type: circle;
+    padding-left: 2.4rem;
+    margin: 1.4rem 0;
+}
+.fish_right_bar ul li {
+    margin-bottom: 0.6rem;
+}
+.fish_right_bar p > code {
+    display: inline-block;
+}
+/* Typography */
+p { margin: 1rem 0; }
+h1, h2, h3, h4, h5, h6 {
+    color: #1f2d53;
+    font-family: Roboto, "DejaVuSansCondensed-Bold", "DejaVuSans-Bold", Verdana, sans-serif;
+}
+h1 {
+    margin: 2rem 0 1.4rem 0;
+    font-weight: 700;
+    font-size: 2rem;
+}
+h2 {
+    margin: 1.6rem 0 1rem 0;
+    font-weight: 600;
+    font-size: 1.7rem;
+}
+h3 {
+    margin: 1rem 0 0.4rem 0;
+    font-weight: 500;
+    font-size: 1.6rem;
+}
+.interior_title {
+    font-size: 2rem;
+    color: #414141;
+    padding-bottom: 10px;
+    border-bottom: 1px solid #AAA;
+}
+/*Special Formmating for Code and keys*/
+.key span {
+    display:none;
+}
+.key em {
+    margin-right: 2px;
+    font-style: normal;
+}
+.key em, .key b {
+    padding: 0 4px;
+    background-color: #fafafa;
+    border: 1px solid #aaa;
+    border-radius: 3px;
+    font-weight: normal;
+    white-space: nowrap;
+}
+tt, code, pre, .fish {
+    font-family: "DejaVu Sans Mono", Menlo, Monaco, "Source Code Pro", "Ubuntu Mono", "Consolas", "Lucida Console", monospace, fixed;
+    font-weight: 500;
+    text-shadow: 0 0 0 rgba(0,0,0,1); /* Stronger anti-aliasing */
+}
+tt {
+    color: red; /*REMOVE THIS*/
+}
+code, pre, .line {
+    white-space: -moz-pre-wrap;
+    white-space: -pre-wrap;
+    white-space: -o-pre-wrap;
+    white-space: pre-wrap;
+    word-wrap: break-word;
+}
+h1 > code, h2 > code, h3 > code {
+    font-family: "DejaVu Sans Mono", Menlo, "Source Code Pro", "Consolas", "Lucida Console", Roboto, Verdana, sans-serif;
+    font-weight: 700;
+}
+.fish {
+    margin: 1rem;
+    padding: 0.4rem 1rem;
+    line-height: 1.9rem;
+    background-color: #fafafa;
+    border: 1px solid #f0f0f0;
+    border-radius: 0.4rem;
+}
+
+.comment { color: #777; }
+.command { color: #0A0; }
+.function { color: #0A0; }
+.binary { color: #060; }
+.argument { color: #906; }
+.variable { color: #339; }
+.redirect { color: #F00; }
+.operator { color: #990; }
+.file { color: #c97922; }
+.path { color: #c97922; }
+.string { color: #770; }
+.prompt { color: #03C; }
+.suggest { color: cyan ; }
+.error { color: red; font-weight: bold; }
+.cursor { border-bottom: 2px solid green; }
+
+
+/*.keyword, .keywordflow { color: #050; }*/
+/*.stringliteral, .charliteral { color: #226; }*/
+/*.preprocessor, .comment { color: #555; text-shadow: none; }*/
+
+.cli-dark {
+    background-color: #111;
+    color: #ddd;
+    padding: 0.4rem 2rem;
+    border-radius: 0.4rem;
+}
+/*
+.cli .command {
+    color: #0E0;
+    font-weight: bold;
+}
+.cli .function {
+    color: #0C0;
+}*/
+/*Menus*/
+.menu { margin: 1.4rem 0; line-height: 2.2rem; }
+.menu ul { list-style-type: none; }
+.menu > ul li { position: relative; }
+.menu > ul li:before {
+    content: "›";
+    color: #88aaff;
+    font-size: 1.6rem;
+    position: absolute;
+    left: -1rem;
+    top: -1px;
+}
+/*Page overrides*/
+/*Documentation*/
+.docs_menu { line-height: 2rem }
+.docs_menu > ul > li { position: static; }
+.docs_menu > ul ul { margin: 0.6rem 0; }
+.docs_menu > ul ul > li { margin-bottom: 0.2rem; }
+/*Tutorial*/
+
+/*Design*/
+.design {
+    max-width: 780px;
+    margin: 0 auto;
+    padding: 0 4rem;
+}
+/*Commands*/
+.commands_menu { line-height: 2rem }
+/*FAQ*/
+.faq_menu { line-height: 2rem }
+.faq_menu > ul li { margin-bottom: 0.6rem; }
+/*Licenses*/
+.license {
+    max-width: 780px;
+    margin: 0 auto;
+    padding: 0 4rem;
+}
+.license li { margin: 1rem 0; }
+.license ul li:first-child {
+    list-style-type: none;
+    position: relative;
+}
+.license ul li:first-child:before {
+    content: "0.";
+    position: absolute;
+    left: -2rem;
+}
+
+
diff --git a/doc_src/user_doc.css.in b/doc_src/user_doc.css.in
deleted file mode 100644
index d2f00642..00000000
--- a/doc_src/user_doc.css.in
+++ /dev/null
@@ -1,261 +0,0 @@
-* {
-    margin: 0;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-}
-html { font-size: 62.5%; }
-html, body {
-    min-height: 100%;
-    background: #fff;
-    color: #111;
-}
-body {
-    text-rendering: optimizeLegibility;
-    overflow: hidden;
-}
-.logo {
-    position: absolute;
-    width: 200px;
-    height: 135px;
-    background-image: url(ascii_fish.png);
-}
-/*Top site index*/
-.qindex {
-    font: 500 1.4rem/3.6rem "DejaVuSansCondensed", Roboto, Verdana, "Helvetica Neue", Helvetica, Arial, sans-serif;
-    border: none;
-    color: white;
-    background-color: #1f2d53;
-    text-align: center;
-    position: relative;
-    width: 100%;
-    height: 3.6rem;
-    overflow: hidden;
-}
-/* Don't show the header */
-.header { display: none; }
-/*Substructure*/
-.contents {
-    margin: 0;
-    min-width: 570px;
-}
-.fish_left_bar, .fish_right_bar, .fish_only_bar {
-    position: absolute;
-    top: 3.6rem;
-    bottom: 0;
-    overflow-y: scroll;
-    -webkit-overflow-scrolling: touch; /* necessary for momentum scrolling */
-    font: 400 1.4rem/2.3rem "DejaVuSans", Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-.fish_left_bar {
-    width: 250px;
-    color: white;
-    font-family: "DejaVuSansCondensed", Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif;
-    background-color: #1f2d53;
-}
-.fish_left_little { width: 200px; }
-.fish_left_big { width: 380px; }
-.fish_right_bar {
-    margin-left: 250px;
-    margin-right: 0;
-    padding: 0 3rem;
-    -moz-box-shadow: -6px 0 6px 4px black;
-    -webkit-box-shadow: -6px 0 6px 4px black;
-    box-shadow: -0.6rem 0 0.6rem 0.4rem rgba(0,0,0,0.4);
-}
-.fish_right_little { margin-left: 380px; }
-.fish_right_big { margin-left: 200px; }
-.fish_only_bar {
-    width: 100%;
-}
-hr {
-    height: 0;
-    border: none;
-    border-top: 1px solid #AAA;
-}
-/*Ineraction*/
-a { color: #3d5cb3; }
-.qindex a {
-    color: white;
-    text-decoration: none;
-}
-.qindex a:hover { text-decoration: underline; }
-.fish_left_bar a {
-    color: white;
-    text-decoration: none;
-}
-.fish_left_bar a:visited { color: inherit; }
-.fish_left_bar a:hover { color: #88aaff; }
-.fish_right_bar a { text-decoration: none; }
-.fish_right_bar a:hover { text-decoration: underline; }
-/* Adjust lists */
-.fish_left_bar ul {
-    padding-left: 2rem;
-    padding-right: 1rem;
-}
-.fish_right_bar ul {
-    list-style-type: circle;
-    padding-left: 2.4rem;
-    margin: 1.4rem 0;
-}
-.fish_right_bar ul li {
-    margin-bottom: 0.6rem;
-}
-.fish_right_bar p > code {
-    display: inline-block;
-}
-/* Typography */
-p { margin: 1rem 0; }
-h1, h2, h3, h4, h5, h6 {
-    color: #1f2d53;
-    font-family: Roboto, "DejaVuSansCondensed-Bold", "DejaVuSans-Bold", Verdana, sans-serif;
-}
-h1 {
-    margin: 2rem 0 1.4rem 0;
-    font-weight: 700;
-    font-size: 2rem;
-}
-h2 {
-    margin: 1.6rem 0 1rem 0;
-    font-weight: 600;
-    font-size: 1.7rem;
-}
-h3 {
-    margin: 1rem 0 0.4rem 0;
-    font-weight: 500;
-    font-size: 1.6rem;
-}
-.interior_title {
-    font-size: 2rem;
-    color: #414141;
-    padding-bottom: 10px;
-    border-bottom: 1px solid #AAA;
-}
-/*Special Formmating for Code and keys*/
-.key span {
-    display:none;
-}
-.key em {
-    margin-right: 2px;
-    font-style: normal;
-}
-.key em, .key b {
-    padding: 0 4px;
-    background-color: #fafafa;
-    border: 1px solid #aaa;
-    border-radius: 3px;
-    font-weight: normal;
-    white-space: nowrap;
-}
-tt, code, pre, .fish {
-    font-family: "DejaVu Sans Mono", Menlo, Monaco, "Source Code Pro", "Ubuntu Mono", "Consolas", "Lucida Console", monospace, fixed;
-    font-weight: 500;
-    text-shadow: 0 0 0 rgba(0,0,0,1); /* Stronger anti-aliasing */
-}
-tt {
-    color: red; /*REMOVE THIS*/
-}
-code, pre, .line {
-    white-space: -moz-pre-wrap;
-    white-space: -pre-wrap;
-    white-space: -o-pre-wrap;
-    white-space: pre-wrap;
-    word-wrap: break-word;
-}
-h1 > code, h2 > code, h3 > code {
-    font-family: "DejaVu Sans Mono", Menlo, "Source Code Pro", "Consolas", "Lucida Console", Roboto, Verdana, sans-serif;
-    font-weight: 700;
-}
-.fish {
-    margin: 1rem;
-    padding: 0.4rem 1rem;
-    line-height: 1.9rem;
-    background-color: #fafafa;
-    border: 1px solid #f0f0f0;
-    border-radius: 0.4rem;
-}
-
-.comment { color: #777; }
-.command { color: #0A0; }
-.function { color: #0A0; }
-.binary { color: #060; }
-.argument { color: #906; }
-.variable { color: #339; }
-.redirect { color: #F00; }
-.operator { color: #990; }
-.file { color: #c97922; }
-.path { color: #c97922; }
-.string { color: #770; }
-.prompt { color: #03C; }
-.suggest { color: cyan ; }
-.error { color: red; font-weight: bold; }
-.cursor { border-bottom: 2px solid green; }
-
-
-/*.keyword, .keywordflow { color: #050; }*/
-/*.stringliteral, .charliteral { color: #226; }*/
-/*.preprocessor, .comment { color: #555; text-shadow: none; }*/
-
-.cli-dark {
-    background-color: #111;
-    color: #ddd;
-    padding: 0.4rem 2rem;
-    border-radius: 0.4rem;
-}
-/*
-.cli .command {
-    color: #0E0;
-    font-weight: bold;
-}
-.cli .function {
-    color: #0C0;
-}*/
-/*Menus*/
-.menu { margin: 1.4rem 0; line-height: 2.2rem; }
-.menu ul { list-style-type: none; }
-.menu > ul li { position: relative; }
-.menu > ul li:before {
-    content: "›";
-    color: #88aaff;
-    font-size: 1.6rem;
-    position: absolute;
-    left: -1rem;
-    top: -1px;
-}
-/*Page overrides*/
-/*Documentation*/
-.docs_menu { line-height: 2rem }
-.docs_menu > ul > li { position: static; }
-.docs_menu > ul ul { margin: 0.6rem 0; }
-.docs_menu > ul ul > li { margin-bottom: 0.2rem; }
-/*Tutorial*/
-
-/*Design*/
-.design {
-    max-width: 780px;
-    margin: 0 auto;
-    padding: 0 4rem;
-}
-/*Commands*/
-.commands_menu { line-height: 2rem }
-/*FAQ*/
-.faq_menu { line-height: 2rem }
-.faq_menu > ul li { margin-bottom: 0.6rem; }
-/*Licenses*/
-.license {
-    max-width: 780px;
-    margin: 0 auto;
-    padding: 0 4rem;
-}
-.license li { margin: 1rem 0; }
-.license ul li:first-child {
-    list-style-type: none;
-    position: relative;
-}
-.license ul li:first-child:before {
-    content: "0.";
-    position: absolute;
-    left: -2rem;
-}
-
-
diff --git a/doc_src/vared.txt b/doc_src/vared.txt
index 90877553..7001be74 100644
--- a/doc_src/vared.txt
+++ b/doc_src/vared.txt
@@ -1,7 +1,7 @@
 \section vared vared - interactively edit the value of an environment variable
 
 \subsection vared-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 vared VARIABLE_NAME
 \endfish
 
diff --git a/doc_src/while.txt b/doc_src/while.txt
index 2fa74cb6..80ec959b 100644
--- a/doc_src/while.txt
+++ b/doc_src/while.txt
@@ -1,7 +1,7 @@
 \section while while - perform a command multiple times
 
 \subsection while-synopsis Synopsis
-\fish{syn}
+\fish{synopsis}
 while CONDITION; COMMANDS...; end
 \endfish
 
-- 
cgit v1.2.3


From 1cd50ba5722c424ddd70e26b0425d7496edcfa6a Mon Sep 17 00:00:00 2001
From: Mark Griffiths <mark@thebespokepixel.com>
Date: Sat, 2 Aug 2014 04:51:43 +0100
Subject: Merged in latest changes to docs and formatting tweaks

Addresses issue #1557 as well as fixing many typos, HTML errors and
inconsistencies. Also introduces automatic syntax colouring and enables
new documentation to be written in Markdown. TODO fix Tutorial.
---
 Makefile.in                    |  3 ++-
 doc_src/fish_lexicon_filter.in | 61 +++++++++++++++++++++++++++++++++++-------
 doc_src/index.hdr.in           |  4 +--
 doc_src/user_doc.css           | 23 ++++++++--------
 4 files changed, 66 insertions(+), 25 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index ca4a33ab..39cbd8d7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -388,7 +388,8 @@ doc_src/fish_lexicon_filter: lexicon.txt doc_src/fish_lexicon_filter.in
 	sed <$@.in >$@.tmp -e 's|@sed@|'"`command -v sed`"'|' -e '/^[ ]*#[^!]/d'
 	# Scan through the lexicon, transforming each line to something usefue to Doxygen.
 	sed <lexicon.txt >>$@.tmp -n \
-		-e 's|^\([a-z][a-z][a-z][a-z]\) \([a-z_-]*\)$$|s,[[:<:]]\2[[:>:]],@\1{\2},g|p';
+		-e 's|^\([a-z][a-z][a-z][a-z]\) \([a-z_-]*\)$$|s,[[:<:]]\2[[:>:]],@\1{\2},g|p' \
+		-e '$$G;s/.*\n/b tidy/p'; \
 	mv $@.tmp $@; if test -x $@; then true; else chmod a+x $@; fi
 
 #
diff --git a/doc_src/fish_lexicon_filter.in b/doc_src/fish_lexicon_filter.in
index 47ee345e..8a8c46b2 100644
--- a/doc_src/fish_lexicon_filter.in
+++ b/doc_src/fish_lexicon_filter.in
@@ -7,8 +7,8 @@
 # by Mark Griffiths <mark@thebespokepixel.com>             *but quite portable
 #.
 # Finds /fish../endfish blocks in documentation source files and enhances
-# markup. Requires that the short tags declared here are added to Doxyfiles as
-# aliases i.e.:
+# markup. Requires that the four character word 'classes' declared here are
+# added to Doxyfiles as aliases i.e.:
 #.
 # Enhance for HTML Help pages (Doxyfile.user)…
 # ALIASES   = "fish=\htmlonly[block] \n<pre class=\"fish\">"
@@ -26,6 +26,16 @@
 # ALIASES  += "blah{1}=\1"
 # ALIASES  += "cmnd{1}=<em>\1</em>"...
 #.
+# It's meant to only ever be run once, during make, as Doxygen's 'INPUT
+# FILTER', though can be run interactively by passing a file in via stdin. It
+# wont respond to arguments.
+#.
+# It's most easily tested by passing test strings into the compiled script:
+#.
+# echo "Line to test" | ./fish_lexicon_filter
+#.
+# The, at times, archiac looking regex is down to ensuring portable sed BREs
+#.
 # Licensed under whatever terms are most compatible with Fish's GPLv2 license,
 # bascially free to use/reuse/redistribute/laugh at/be inspired by. Don't
 # pretend it's your code unless you've spent more late nights on it than me but
@@ -35,9 +45,10 @@
 #.
 # Pattern flow control for scanning doc.h
 /\\fish/,/\\endfish/ {
-    # Open \fish block
+    # Open \fish block, firstly it it's on it's own line
     /^\\fish$/b
     /^\\fish{[^}]*}$/b
+    # Then if it's inline. Remove and process immediately...
     /^\\fish.*$/ {
         s/^\\fish//
         s/\\endfish//
@@ -172,6 +183,7 @@ s|\([^/~A-Za-z0-9]\)\([~/][/]*\)\([A-Za-z_0-9./-]*\)|\1\\\
 |g
 #.
 b protect
+#.
 # Tidy up. Merge back 'pure' entities from hold space.
 :tidy
 #.
@@ -207,6 +219,7 @@ s/\n//g
     s/\(redr{[^@]*\)@func{\([^}]*\)}/\1\2/
     s/\(redr{[^@]*\)@sbin{\([^}]*\)}/\1\2/
     s/\(redr{[^@]*\)@fsfo{\([^}]*\)}/\1\2/
+    s/\(redr{[^}]*\)}\( *\)@path{\([^}]*\)/\1\2\3/
     t cleanredr
 }
 /@fsfo/{
@@ -216,13 +229,44 @@ s/\n//g
     s/\(fsfo{[^@]*\)@sbin{\([^}]*\)}/\1\2/
     t cleanfsfo
 }
-# Convert 2nd order commands/functions and binaries to arguments
-s/@cmnd/@args/g
-s/@args/@cmnd/1
+#.
+# Finally, restructure to follow Fish's command [arguments] semantics.
+# Find the initial command, and change any others to arguments, up to a ( or ;
+# Assumes that a valid line will start with either a builtin, a function or a binary.
+#.
+:nextcmnd
+s/@cmnd\(.*\)$/@xcmd\
+\1/
+t castargs
+s/@func\(.*\)$/@xfnc\
+\1/
+t castargs
+s/@sbin\(.*\)$/@xbin\
+\1/
+t castargs
+b cleancmd
+:castargs
+s/\n\([^;(]*[;(]\)/\1/
+t nextcmnd
+s/\n\([^@]*\)@cmnd\(.*\)/\1@args\
+\2/
+t castargs
+s/\n\([^@]*\)@func\(.*\)/\1@args\
+\2/
+t castargs
+s/\n\([^@]*\)@sbin\(.*\)/\1@args\
+\2/
+t castargs
+:cleancmd
+s/xcmd/cmnd/g
+s/xfnc/func/g
+s/xbin/sbin/g
+s/\n//g
 # Character Entities
 #.
 # Mark up a few sesitive characters.
 #.
+:entities
 s/</\&lt;/g
 s/>/\&gt;/g
 #.
@@ -274,12 +318,9 @@ s/\([$%][$%]*\)\([A-Za-z_0-9][A-Za-z_0-9]*\)/@vars{@optr{\1}\2}/g
 # Files
 s/\([A-Za-z*][A-Za-z]*\.[a-z0-9][a-z0-9]*\)/@fsfo{\1}/g
 #.
-# Operators
-# s/\([^^=|+*&%<>{-]\)\([=|+*&%<>^-][|+*&%<>^-]*\)\([^0-9A-Za-z]\)/\1@optr{\2}\3/g
-#.
 :commands
 #.
-# Manually add a few commands not harvested from source.
+# Manually add a few commands not harvested from source files.
 #.
 s,[[:<:]]in[[:>:]],@args{in},g
 s,[[:<:]]whoami[[:>:]],@sbin{whoami},g
diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in
index 95b1559c..526954fc 100644
--- a/doc_src/index.hdr.in
+++ b/doc_src/index.hdr.in
@@ -605,8 +605,8 @@ end
 function avast
     set phrase 'Avast, mateys'
 
-    # Calling the shiver function here can not change any variables
-    # in the local scope
+    # Calling the shiver function here can not
+    # change any variables in the local scope
     shiver
 
     echo $phrase
diff --git a/doc_src/user_doc.css b/doc_src/user_doc.css
index d2f00642..abe70835 100644
--- a/doc_src/user_doc.css
+++ b/doc_src/user_doc.css
@@ -30,7 +30,6 @@ body {
     position: relative;
     width: 100%;
     height: 3.6rem;
-    overflow: hidden;
 }
 /* Don't show the header */
 .header { display: none; }
@@ -45,7 +44,7 @@ body {
     bottom: 0;
     overflow-y: scroll;
     -webkit-overflow-scrolling: touch; /* necessary for momentum scrolling */
-    font: 400 1.4rem/2.3rem "DejaVuSans", Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font: 400 1.3rem/2.1rem "DejaVuSans", Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
 .fish_left_bar {
     width: 250px;
@@ -54,16 +53,14 @@ body {
     background-color: #1f2d53;
 }
 .fish_left_little { width: 200px; }
-.fish_left_big { width: 380px; }
 .fish_right_bar {
     margin-left: 250px;
     margin-right: 0;
     padding: 0 3rem;
     -moz-box-shadow: -6px 0 6px 4px black;
     -webkit-box-shadow: -6px 0 6px 4px black;
-    box-shadow: -0.6rem 0 0.6rem 0.4rem rgba(0,0,0,0.4);
+    box-shadow: -0.3rem 0.3rem 1rem #000818;
 }
-.fish_right_little { margin-left: 380px; }
 .fish_right_big { margin-left: 200px; }
 .fish_only_bar {
     width: 100%;
@@ -90,7 +87,7 @@ a { color: #3d5cb3; }
 .fish_right_bar a:hover { text-decoration: underline; }
 /* Adjust lists */
 .fish_left_bar ul {
-    padding-left: 2rem;
+    padding-left: 1.4rem;
     padding-right: 1rem;
 }
 .fish_right_bar ul {
@@ -111,22 +108,23 @@ h1, h2, h3, h4, h5, h6 {
     font-family: Roboto, "DejaVuSansCondensed-Bold", "DejaVuSans-Bold", Verdana, sans-serif;
 }
 h1 {
-    margin: 2rem 0 1.4rem 0;
+    margin: 1.6rem 0 1rem 0;
     font-weight: 700;
-    font-size: 2rem;
+    font-size: 1.7rem;
 }
 h2 {
     margin: 1.6rem 0 1rem 0;
-    font-weight: 600;
+    font-weight: 700;
     font-size: 1.7rem;
 }
 h3 {
     margin: 1rem 0 0.4rem 0;
     font-weight: 500;
-    font-size: 1.6rem;
+    font-size: 1.5rem;
 }
 .interior_title {
     font-size: 2rem;
+    margin: 2rem 0 1.4rem 0;
     color: #414141;
     padding-bottom: 10px;
     border-bottom: 1px solid #AAA;
@@ -167,8 +165,9 @@ h1 > code, h2 > code, h3 > code {
     font-weight: 700;
 }
 .fish {
-    margin: 1rem;
-    padding: 0.4rem 1rem;
+    margin: 1rem 0;
+    padding: 0.6rem 1rem;
+    font-size: 1.3rem;
     line-height: 1.9rem;
     background-color: #fafafa;
     border: 1px solid #f0f0f0;
-- 
cgit v1.2.3


From c900f23662a34599570ee54a36343c4136c58698 Mon Sep 17 00:00:00 2001
From: Mark Griffiths <mark@thebespokepixel.com>
Date: Sun, 3 Aug 2014 02:25:47 +0100
Subject: Add lexicon filter to manpages.

 Fixed manpage 'NAME'. Under Doxygen 1.8, the output format has
changed, so the old sed script was leaving man pages with two titles.
---
 Doxyfile.help                      | 16 ++++++++--------
 Makefile.in                        | 11 ++++++-----
 build_tools/build_documentation.sh | 14 +++++++++-----
 3 files changed, 23 insertions(+), 18 deletions(-)

(limited to 'Makefile.in')

diff --git a/Doxyfile.help b/Doxyfile.help
index beda7bbb..74673382 100644
--- a/Doxyfile.help
+++ b/Doxyfile.help
@@ -241,9 +241,9 @@ ALIASES               += "endfish=</pre>"
 
 ALIASES               += "asis{1}=\1"
 ALIASES               += "blah{1}=\1"
-ALIASES               += "cmnd{1}=\1"
-ALIASES               += "func{1}=\1"
-ALIASES               += "sbin{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"
@@ -253,18 +253,18 @@ ALIASES               += "fsfo{1}=\1"
 ALIASES               += "path{1}=\1"
 ALIASES               += "clrv{1}=\1"
 
-ALIASES               += "strg{1}=<b>\1</b>"
+ALIASES               += "strg{1}=\1"
 ALIASES               += "sglq{1}=\'\1\'"
 ALIASES               += "dblq{1}=\"\1\""
 
-ALIASES               += "prmt{1}="
-ALIASES               += "sgst{1}=<em>\1</em>"
+ALIASES               += "prmt{1}=\1"
+ALIASES               += "sgst{1}=\1"
 ALIASES               += "eror{1}=<b>\1</b>"
-ALIASES               += "curs{1}=_"
+ALIASES               += "curs{1}=\1"
 
 ALIASES               += "bold{1}=<b>\1</b>"
 ALIASES               += "emph{1}=<em>\1</em>"
-ALIASES               += "undr{1}=<u>\1</u>"
+ALIASES               += "undr{1}=<em>\1</em>"
 ALIASES               += "span{2}=\1"
 ALIASES               += "spcl{2}=\1"
 
diff --git a/Makefile.in b/Makefile.in
index 39cbd8d7..cd1c5738 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -277,7 +277,7 @@ doc_src/user_doc.css: doc_src/user_doc.css.in doc_src/fish_lexicon_filter
 #
 
 doc: *.h *.cpp doc.h Doxyfile
-	(cat Doxyfile ; echo PROJECT_NUMBER=$(FISH_BUILD_VERSION)) | doxygen - ;
+	(cat Doxyfile; echo PROJECT_NUMBER=$(FISH_BUILD_VERSION)) | doxygen - ;
 
 
 #
@@ -386,7 +386,7 @@ doc_src/fish_lexicon_filter: lexicon.txt doc_src/fish_lexicon_filter.in
 	# Clean the filter input comments and set the shebang as sed can reside in
 	# /bin or /usr/bin and some versions dont allow more than one comment!.
 	sed <$@.in >$@.tmp -e 's|@sed@|'"`command -v sed`"'|' -e '/^[ ]*#[^!]/d'
-	# Scan through the lexicon, transforming each line to something usefue to Doxygen.
+	# Scan through the lexicon, transforming each line to something useful to Doxygen.
 	sed <lexicon.txt >>$@.tmp -n \
 		-e 's|^\([a-z][a-z][a-z][a-z]\) \([a-z_-]*\)$$|s,[[:<:]]\2[[:>:]],@\1{\2},g|p' \
 		-e '$$G;s/.*\n/b tidy/p'; \
@@ -493,11 +493,12 @@ common.o: $(COMMON_FILES)
 # There ought to be something simpler.
 #
 
-share/man: $(HELP_SRC)
+share/man: $(HELP_SRC) doc_src/fish_lexicon_filter
 	-mkdir share/man
 	touch share/man
 	-rm -Rf share/man/man1
-	PROJECT_NUMBER=`echo $(FISH_BUILD_VERSION)| sed "s/-.*//"` ./build_tools/build_documentation.sh Doxyfile.help ./doc_src ./share
+	PROJECT_NUMBER=`echo $(FISH_BUILD_VERSION)| sed "s/-.*//"` INPUT_FILTER=doc_src/fish_lexicon_filter \
+	./build_tools/build_documentation.sh Doxyfile.help ./doc_src ./share
 
 #
 # The build rules for installing/uninstalling fish
@@ -811,7 +812,7 @@ clean:
 	rm -f $(PROGRAMS) fish_tests key_reader
 	rm -f command_list.txt command_list_toc.txt toc.txt
 	rm -f doc_src/index.hdr doc_src/commands.hdr
-	rm -f doc_src/fish_lexicon_filter lexicon.txt
+	rm -f doc_src/fish_lexicon_filter lexicon.txt debug-lexicon.log
 	rm -f FISH-BUILD-VERSION-FILE
 	if test "$(HAVE_DOXYGEN)" = 1; then \
 		rm -rf doc user_doc share/man; \
diff --git a/build_tools/build_documentation.sh b/build_tools/build_documentation.sh
index 0c4a2aac..2705898e 100755
--- a/build_tools/build_documentation.sh
+++ b/build_tools/build_documentation.sh
@@ -37,10 +37,12 @@ resolve_path()
 # Expand relative paths
 DOXYFILE=`resolve_path "$DOXYFILE"`
 INPUTDIR=`resolve_path "$INPUTDIR"`
+INPUTFILTER=`resolve_path "$INPUT_FILTER"`
 OUTPUTDIR=`resolve_path "$OUTPUTDIR"`
 
 echo "      doxygen file: $DOXYFILE"
 echo "   input directory: $INPUTDIR"
+echo "      input filter: $INPUTFILTER"
 echo "  output directory: $OUTPUTDIR"
 echo "          skipping: $CONDEMNED_PAGES"
 
@@ -87,6 +89,7 @@ done
 # This prevents doxygen from generating "documentation" for intermediate directories
 DOXYPARAMS=$(cat <<EOF
 PROJECT_NUMBER=$PROJECT_NUMBER
+INPUT_FILTER=$INPUTFILTER
 INPUT=.
 OUTPUT_DIRECTORY=$OUTPUTDIR
 QUIET=YES
@@ -100,7 +103,7 @@ find "${OUTPUTDIR}" -name "*.1" -delete
 
 # Run doxygen
 cd "$TMPLOC"
-(cat "${DOXYFILE}" ; echo "$DOXYPARAMS";) | "$DOXYGENPATH" - 
+(cat "${DOXYFILE}" ; echo "$DOXYPARAMS";) | "$DOXYGENPATH" -
 
 # Remember errors
 RESULT=$?
@@ -110,15 +113,16 @@ if test "$RESULT" = 0 ; then
 
 	# Postprocess the files
 	for i in "$INPUTDIR"/*.txt; do
-		# It would be nice to use -i here for edit in place, but that is not portable 
+		# It would be nice to use -i here for edit in place, but that is not portable
 		CMD_NAME=`basename "$i" .txt`;
-		sed -e "s/\(.\)\\.SH/\1/" -e "s/$CMD_NAME *\\\\- *\"\(.*\)\"/\1/" "${CMD_NAME}.1" > "${CMD_NAME}.1.tmp"
+		sed < ${CMD_NAME}.1 > ${CMD_NAME}.1.tmp \
+            -e "/.SH \"$CMD_NAME/d" \
+            -e "s/^$CMD_NAME * \\\- \([^ ]*\) /\\\fB\1\\\fP -/"
 		mv "${CMD_NAME}.1.tmp" "${CMD_NAME}.1"
 	done
-	
+
 	# Erase condemned pages
 	rm -f $CONDEMNED_PAGES
-	
 fi
 
 # Destroy TMPLOC
-- 
cgit v1.2.3


From 509d152e5407856ce00833b931ef29c3d98c3573 Mon Sep 17 00:00:00 2001
From: Mark Griffiths <mark@thebespokepixel.com>
Date: Fri, 8 Aug 2014 03:44:37 +0100
Subject: Tutorial auto colouring, Man page and Make fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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…
---
 .gitignore                     |   5 +-
 Doxyfile                       |  44 +++-
 Doxyfile.help                  |  79 +++----
 Doxyfile.user                  |  79 +++----
 Makefile.in                    |  26 ++-
 doc_src/alias.txt              |   4 +-
 doc_src/commands.hdr.in        |   4 +-
 doc_src/design.hdr             |   6 +-
 doc_src/echo.txt               |   2 +-
 doc_src/faq.hdr                |   4 +-
 doc_src/fish.txt               |   2 +-
 doc_src/fish_indent.txt        |   2 +-
 doc_src/fish_lexicon_filter.in | 411 -----------------------------------
 doc_src/fish_prompt.txt        |   3 +-
 doc_src/functions.txt          |   2 +-
 doc_src/if.txt                 |   5 +-
 doc_src/index.hdr.in           |  69 +++---
 doc_src/nextd.txt              |   2 +-
 doc_src/psub.txt               |   8 +-
 doc_src/set.txt                |  18 +-
 doc_src/set_color.txt          |   2 +-
 doc_src/source.txt             |   7 +-
 doc_src/trap.txt               |   7 +-
 doc_src/tutorial.hdr           | 356 +++++++++++++++---------------
 doc_src/type.txt               |   6 +-
 doc_src/user_doc.css           |   3 +-
 doc_src/while.txt              |   7 +-
 lexicon_filter.in              | 475 +++++++++++++++++++++++++++++++++++++++++
 28 files changed, 888 insertions(+), 750 deletions(-)
 delete mode 100644 doc_src/fish_lexicon_filter.in
 create mode 100644 lexicon_filter.in

(limited to 'Makefile.in')

diff --git a/.gitignore b/.gitignore
index 492c5758..2fe2f215 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,14 +30,15 @@ share/man/
 toc.txt
 user_doc/
 xcuserdata
+fish.xccheckout
 tests/*tmp.*
 tests/foo.txt
 FISH-BUILD-VERSION-FILE
 version
 messages.pot
 lexicon.txt
-doc_src/fish_lexicon_filter
-debug-lexicon.log
+lexicon_filter
+lexicon-debug.log
 
 Fish-Shell.sublime-workspace
 Fish-Shell.sublime-project
diff --git a/Doxyfile b/Doxyfile
index 3cd01663..38cbd687 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -228,8 +228,48 @@ TAB_SIZE               = 8
 # "Side Effects:". You can put \n's in the value part of an alias to insert
 # newlines.
 
-ALIASES                = "fish=\n<div class=\"cli\">\verbatim"
-ALIASES               += "endfish=\endverbatim</div>"
+ALIASES  = "key{1}=<b>\1</b>"
+ALIASES += "key{2}=<b>\1</b>-<b>\2</b>"
+ALIASES += "key{3}=<b>\1</b>-<b>\3</b>"
+ALIASES += "cursor_key{2}=<b>\2</b>"
+
+ALIASES += "fish=\htmlonly[block] \n<pre>"
+ALIASES += "fish{1}=\htmlonly[block] \n<pre>"
+ALIASES += "endfish=</pre>\endhtmlonly \n"
+
+ALIASES += "asis{1}=\1"
+ALIASES += "outp{1}=\1"
+ALIASES += "blah{1}=#\1"
+ALIASES += "cmnd{1}=\1"
+ALIASES += "func{1}=\1"
+ALIASES += "sbin{1}=\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=&gt;"
+ALIASES += "prmt{1}=\1&gt;"
+ALIASES += "sgst{1}=\1"
+ALIASES += "mtch{1}=\1"
+ALIASES += "smtc{1}=\1"
+ALIASES += "eror{1}=\1"
+ALIASES += "curs=_"
+ALIASES += "curs{1}=\1"
+
+ALIASES += "bold{1}=\1"
+ALIASES += "emph{1}=\1"
+ALIASES += "undr{1}=\1"
+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"
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"
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"
diff --git a/Makefile.in b/Makefile.in
index cd1c5738..afcba3c9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -259,8 +259,8 @@ prof: all
 # The sed command deletes everything including and after the first -, for simpler version numbers
 # Cleans up the user_doc/html directory once Doxygen is done.
 
-user_doc: $(HDR_FILES_SRC) Doxyfile.user $(HTML_SRC) $(HELP_SRC) doc.h $(HDR_FILES) doc_src/fish_lexicon_filter
-	(cat Doxyfile.user; echo INPUT_FILTER=doc_src/fish_lexicon_filter; \
+user_doc: $(HDR_FILES_SRC) Doxyfile.user $(HTML_SRC) $(HELP_SRC) doc.h $(HDR_FILES) lexicon_filter
+	(cat Doxyfile.user; echo INPUT_FILTER=./lexicon_filter; \
 	echo PROJECT_NUMBER=$(FISH_BUILD_VERSION) | sed "s/-.*//") | doxygen - && touch user_doc; \
 	cd user_doc/html; rm -f bc_s.png bdwn.png closed.png ftv2*.png nav*.png open.png sync_*.png tab*.* doxygen.* dynsections.js jquery.js pages.html
 
@@ -276,8 +276,8 @@ doc_src/user_doc.css: doc_src/user_doc.css.in doc_src/fish_lexicon_filter
 # Source code documentation. Also includes user documentation.
 #
 
-doc: *.h *.cpp doc.h Doxyfile
-	(cat Doxyfile; echo PROJECT_NUMBER=$(FISH_BUILD_VERSION)) | doxygen - ;
+doc: *.h *.cpp doc.h Doxyfile lexicon_filter
+	(cat Doxyfile; echo INPUT_FILTER=./lexicon_filter; echo PROJECT_NUMBER=$(FISH_BUILD_VERSION)) | doxygen - ;
 
 
 #
@@ -368,6 +368,7 @@ lexicon.txt: doc_src/commands.hdr $(FUNCTIONS_DIR_FILES) $(COMPLETIONS_DIR_FILES
 		-e "s|'\(.*\)'|func \1|p"; \
 	sed <share/functions/__fish_config_interactive.fish >>lexicon.tmp -n \
 		-e '/set_default/s/.*\(fish_[a-z][a-z_]*\).*$$/clrv \1/p'; \
+	echo "sbin whoami\nsbin mkdir\nsbin basename" >> lexicon.tmp; \
 	mv lexicon.tmp lexicon.txt; rm -f lexicon_catalog.tmp lexicon_catalog.txt;
 
 #
@@ -381,14 +382,19 @@ lexicon.txt: doc_src/commands.hdr $(FUNCTIONS_DIR_FILES) $(COMPLETIONS_DIR_FILES
 # providing suitable CSS in user_doc.css.in
 #
 
-doc_src/fish_lexicon_filter: lexicon.txt doc_src/fish_lexicon_filter.in
+lexicon_filter: lexicon.txt lexicon_filter.in
 	-rm $@.tmp $@
 	# Clean the filter input comments and set the shebang as sed can reside in
 	# /bin or /usr/bin and some versions dont allow more than one comment!.
-	sed <$@.in >$@.tmp -e 's|@sed@|'"`command -v sed`"'|' -e '/^[ ]*#[^!]/d'
+	sed <$@.in >$@.tmp -e 's|@sed@|'"`which sed`"'|' -e '/^[ ]*#[^!]/d'
 	# Scan through the lexicon, transforming each line to something useful to Doxygen.
+	if `echo "x" | sed "/[[:<:]]x/d"`; then \
+		WORDBL='[[:<:]]'; WORDBR='[[:>:]]'; \
+	else\
+		WORDBL='\\<'; WORDBR='\\>'; \
+	fi; \
 	sed <lexicon.txt >>$@.tmp -n \
-		-e 's|^\([a-z][a-z][a-z][a-z]\) \([a-z_-]*\)$$|s,[[:<:]]\2[[:>:]],@\1{\2},g|p' \
+		-e "s|^\([a-z][a-z][a-z][a-z]\) \([a-z_-]*\)$$|s,$$WORDBL\2$$WORDBR,@\1{\2},g|p" \
 		-e '$$G;s/.*\n/b tidy/p'; \
 	mv $@.tmp $@; if test -x $@; then true; else chmod a+x $@; fi
 
@@ -493,11 +499,11 @@ common.o: $(COMMON_FILES)
 # There ought to be something simpler.
 #
 
-share/man: $(HELP_SRC) doc_src/fish_lexicon_filter
+share/man: $(HELP_SRC) lexicon_filter
 	-mkdir share/man
 	touch share/man
 	-rm -Rf share/man/man1
-	PROJECT_NUMBER=`echo $(FISH_BUILD_VERSION)| sed "s/-.*//"` INPUT_FILTER=doc_src/fish_lexicon_filter \
+	PROJECT_NUMBER=`echo $(FISH_BUILD_VERSION)| sed "s/-.*//"` INPUT_FILTER=./lexicon_filter \
 	./build_tools/build_documentation.sh Doxyfile.help ./doc_src ./share
 
 #
@@ -812,7 +818,7 @@ clean:
 	rm -f $(PROGRAMS) fish_tests key_reader
 	rm -f command_list.txt command_list_toc.txt toc.txt
 	rm -f doc_src/index.hdr doc_src/commands.hdr
-	rm -f doc_src/fish_lexicon_filter lexicon.txt debug-lexicon.log
+	rm -f lexicon_filter lexicon.txt lexicon.log
 	rm -f FISH-BUILD-VERSION-FILE
 	if test "$(HAVE_DOXYGEN)" = 1; then \
 		rm -rf doc user_doc share/man; \
diff --git a/doc_src/alias.txt b/doc_src/alias.txt
index c1450cc4..079cabff 100644
--- a/doc_src/alias.txt
+++ b/doc_src/alias.txt
@@ -23,11 +23,9 @@ The following code will create `rmi`, which runs `rm` with additional arguments
 
 \fish
 alias rmi "rm -i"
-\endfish
 
-This is equivalent to entering the following function:
+# This is equivalent to entering the following function:
 
-\fish
 function rmi
     rm -i $argv
 end
diff --git a/doc_src/commands.hdr.in b/doc_src/commands.hdr.in
index 12269b2b..fb9ebefa 100644
--- a/doc_src/commands.hdr.in
+++ b/doc_src/commands.hdr.in
@@ -1,5 +1,5 @@
-/** \page commands Commands
-
+/**
+\page commands Commands
 \htmlonly[block]
 <div class="fish_left_bar fish_left_little">
 <div class="menu commands_menu">
diff --git a/doc_src/design.hdr b/doc_src/design.hdr
index e055459f..714321d6 100644
--- a/doc_src/design.hdr
+++ b/doc_src/design.hdr
@@ -1,5 +1,5 @@
-/** \page design Design document
-
+/**
+\page design Design document
 \htmlonly[block]
 <div class="fish_only_bar">
 <div class="design">
@@ -41,7 +41,7 @@ Examples:
 - Here documents are too similar to using echo inside of a pipeline.
 - Subshells, command substitution and process substitution are strongly related. `fish` only supports command substitution, the others can be achieved either using a block or the psub shellscript function.
 - Having both aliases and functions is confusing, especially since both of them have limitations and problems. `fish` functions have none of the drawbacks of either syntax.
-- The many Posix quoting styles are silly, especially \$''.
+- The many Posix quoting styles are silly, especially $''.
 
 \section sep The law of responsiveness
 
diff --git a/doc_src/echo.txt b/doc_src/echo.txt
index 4ce96cb4..7b9b0318 100644
--- a/doc_src/echo.txt
+++ b/doc_src/echo.txt
@@ -2,7 +2,7 @@
 
 \subsection echo-synopsis Synopsis
 \fish{synopsis}
-echo [STRING]
+echo [OPTIONS] [STRING]
 \endfish
 
 \subsection echo-description Description
diff --git a/doc_src/faq.hdr b/doc_src/faq.hdr
index 5558d234..6d3ead30 100644
--- a/doc_src/faq.hdr
+++ b/doc_src/faq.hdr
@@ -1,5 +1,5 @@
-/** \page faq Frequently asked questions
-
+/**
+\page faq Frequently asked questions
 \htmlonly[block]
 <div class="fish_left_bar">
 <div class="menu faq_menu">
diff --git a/doc_src/fish.txt b/doc_src/fish.txt
index 80e7e4e5..ac100821 100644
--- a/doc_src/fish.txt
+++ b/doc_src/fish.txt
@@ -2,7 +2,7 @@
 
 \subsection fish-synopsis Synopsis
 \fish{synopsis}
-fish [-h] [-v] [-c command] [FILE [ARGUMENTS...]]
+fish [OPTIONS] [-c command] [FILE [ARGUMENTS...]]
 \endfish
 
 \subsection fish-description Description
diff --git a/doc_src/fish_indent.txt b/doc_src/fish_indent.txt
index 51cb5fa6..3a96b534 100644
--- a/doc_src/fish_indent.txt
+++ b/doc_src/fish_indent.txt
@@ -2,7 +2,7 @@
 
 \subsection fish_indent-synopsis Synopsis
 \fish{synopsis}
-fish_indent [options]
+fish_indent [OPTIONS]
 \endfish
 
 \subsection fish_indent-description Description
diff --git a/doc_src/fish_lexicon_filter.in b/doc_src/fish_lexicon_filter.in
deleted file mode 100644
index 9da7d173..00000000
--- a/doc_src/fish_lexicon_filter.in
+++ /dev/null
@@ -1,411 +0,0 @@
-#! @sed@ -f
-#.
-# A Doxygen filter for building Fish's lexicon, for documentation bling.
-#.
-# Written specially for Fish, the shell for the 90's, in sed, the state of the
-# art text processor from the 70's. Who's sed? sed's dead, baby, sed's dead.*
-# by Mark Griffiths <mark@thebespokepixel.com>             *but quite portable
-#.
-# Finds /fish../endfish blocks in documentation source files and enhances
-# markup. Requires that the four character word 'classes' declared here are
-# added to Doxyfiles as aliases i.e.:
-#.
-# Enhance for HTML Help pages (Doxyfile.user)…
-# ALIASES   = "fish=\htmlonly[block] \n<pre class=\"fish\">"
-# ALIASES  += "fish{1}=\htmlonly[block] \n<pre class=\"fish \1\">"
-# ALIASES  += "endfish=</pre>\endhtmlonly \n"
-#.
-# ALIASES  += "blah{1}=<span class=\"comment\">\1</span>"
-# ALIASES  += "cmnd{1}=<span class=\"command\">\1</span>" and so on...
-#.
-# And simplify for man pages (Doxyfile.help)…
-# ALIASES   = "fish=<pre>"
-# ALIASES  += "fish{1}=<pre>"
-# ALIASES  += "endfish=</pre>"
-#.
-# ALIASES  += "blah{1}=\1"
-# ALIASES  += "cmnd{1}=<em>\1</em>"...
-#.
-# It's meant to only ever be run once, during make, as Doxygen's 'INPUT
-# FILTER', though can be run interactively by passing a file in via stdin. It
-# wont respond to arguments.
-#.
-# It's most easily tested by passing test strings into the compiled script:
-#.
-# echo "/fish Line to test" | ./fish_lexicon_filter
-#.
-# The, at times, archiac looking regex is down to ensuring portable sed BREs
-#.
-# Licensed under whatever terms are most compatible with Fish's GPLv2 license,
-# bascially free to use/reuse/redistribute/laugh at/be inspired by. Don't
-# pretend it's your code unless you've spent more late nights on it than me but
-# if it saves you a late night, do what you can to help rebalance karma. If it
-# doesn't work or breaks something, it's your fault for using it: if it seems
-# to work it's more likely a hallucination than anything based in reality.
-#.
-# Pattern flow control for scanning doc.h
-/\\fish/,/\\endfish/ {
-    # Open \fish block, firstly it it's on it's own line
-    /^\\fish$/b
-    /^\\fish{[^}]*}$/b
-    # Then if it's inline. Remove and process immediately...
-    /^\\fish.*$/ {
-        s/^\\fish//
-        s/\\endfish//
-        b process
-    }
-    # Output blank lines
-    /^$/b
-    # Inside \fish block. Process...
-    /\\endfish/!{
-        # Preprocess HTML and HTML-like formatting
-        /<[^>]*>/ {
-            b html
-        }
-        # Process the rest
-        b process
-    }
-    # End block
-    /\\endfish/b
-}
-#.
-# This is not the pattern we're looking for
-b
-#.
-# Process any HTML tags.
-# Structured to reduce sed's greediness.
-:html
-# Spans
-s|<span style=['"]\([^'"][^'"]*\)">|@span{\1,|
-s|<span class=['"]\([^'"][^'"]*\)">|@spcl{\1,|
-s|</span>|}|
-t html
-#.
-# Bold
-s|<b>|@bold{|
-s|<b [^>]*>|@bold{|
-s|</b>|}|
-#.
-# Strong
-s|<strong>|@bold{|
-s|<strong [^>]*>|@bold{|
-s|</strong>|}|
-#.
-# Italic
-s|<i>|@emph{|
-s|<i [^>]*>|@emph{|
-s|</i>|}|
-#.
-# Emphasis
-s|<em>|@emph{|
-s|<em [^>]*>|@emph{|
-s|</em>|}|
-#.
-# Underline
-s|<u>|@undr{|
-s|<u [^>]*>|@undr{|
-s|</u>|}|
-t html
-#.
-# Some handy non-standard extensions
-# Autosuggestion
-s|<s>|@sgst{|
-s|<s [^>]*>|@sgst{|
-s|</s>|}|
-#.
-# Error
-s|<error>|@eror{|
-s|<error [^>]*>|@eror{|
-s|</error>|}|
-#.
-# File declaration
-s|<file>|@fsfo{|
-s|<file [^>]*>|@fsfo{|
-s|</file>|}|
-#.
-# AsIs - protect from auto-formatting
-s|<asis>|@asis{|
-s|</asis>|}|
-t html
-#.
-# Clean other unhandled html
-s|<\([A-Za-z][A-Za-z]*\)[^>]*>\([^<]*\)</\1>|\2|
-t html
-#.
-# Start processing entities
-:process
-#.
-# Comments:
-# Capture full line comments
-/^ *#.*$/ {
-    # Assume any line starting with a # is complete
-    s//@blah{&}/
-    t
-}
-# Match sub-line comments
-s/#\(.*$\)/\\\
-<@blah{#\1}\
-/
-#.
-# Protected entities These shouldn't allow nested structure, so we move them
-# to a marked, new line for a future extract/process/insert action.
-#.
-# AsIs block - resists formatting.
-s/@asis{\(.*\)}/\\\
-<@asis{\1}\
-/g
-#.
-# String Literals
-s/"\([^"]*\)"/\\\
-<@dblq{\1}\
-/g
-s/'\([^']*\)'/\\\
-<@sglq{\1}\
-/g
-#.
-# Command/Function options
-# Short options
-s/-\([A-Za-z]\)\([^A-Za-z}]\)/\\\
-<@opts{-\1}\
-\2/g
-#.
-# Long options
-s/--\([A-Za-z][A-Za-z0-9=_-]*\)\([^A-Za-z0-9=_-]*\)/\\\
-<@opts{--\1}\
-\2/g
-#.
-# Paths
-# Normal Directory
-s|\([^/~A-Za-z0-9]\)\([~/][/]*\)\([A-Za-z_0-9./-]*\)|\1\\\
-<@path{\2\3}\
-|g
-#.
-b protect
-#.
-# Tidy up. Merge back 'pure' entities from hold space.
-:tidy
-#.
-# Uncomment the following 2 lines (ss) to log the pattern buffer.
-# s/^.*$/PATT: &/w debug-lexicon.log
-# s/^PATT: //
-#.
-# Uncomment the following 4 lines (xssx) to log the hold buffer.
-# x
-# s/^.*$/HOLD: &/w debug-lexicon.log
-# s/^HOLD: //
-# x
-#.
-# Tack the hold space to the end of the pattern buffer.
-G
-#.
-# Uncomment the folowing two lines (ss) to log the buffer join.
-s/^.*$/JOIN: &/w debug-lexicon.log
-s/^JOIN: //
-#.
-# Iterate over alternate lines, matching '<' to '\'
-:join
-s,\([^\\ ]*\)\\\n\([^<]*\)<\(@[^}]*[}\\]\)[\n]*,\1\3\2,
-t join
-# Clean up stray new lines
-s/\n//g
-#.
-# Clean up special cases
-#.
-/@blah/{
-    s/\(blah{[^@]*\)@sglq{\([^}]*\)}/\1'\2'/
-    s/\(blah{[^@]*\)@dblq{\([^}]*\)}/\1"\2"/
-    s/\(blah{[^@]*\)@....{\([^}]*\)}/\1\2/
-}
-/@redr/{
-    :cleanredr
-    s/\(redr{[^@}]*\)@cmnd{\([^}]*\)}/\1\2/
-    s/\(redr{[^@}]*\)@func{\([^}]*\)}/\1\2/
-    s/\(redr{[^@}]*\)@sbin{\([^}]*\)}/\1\2/
-    s/\(redr{[^@}]*\)@fsfo{\([^}]*\)}/\1\2/
-    s/\(redr{[^}]*\)}\( *\)@path{\([^}]*\)/\1\2\3/
-    t cleanredr
-}
-/@fsfo/{
-    :cleanfsfo
-    s/\(fsfo{[^@}]*\)@cmnd{\([^}]*\)}/\1\2/
-    s/\(fsfo{[^@}]*\)@func{\([^}]*\)}/\1\2/
-    s/\(fsfo{[^@}]*\)@sbin{\([^}]*\)}/\1\2/
-    t cleanfsfo
-}
-#.
-# Finally, restructure to follow Fish's command [arguments] semantics.
-# Find the initial command, and change any others to arguments, up to a |, ( or ;
-# Assumes that a valid line will start with either a builtin, a function or a binary.
-#.
-# 'if' and 'for' seem to be special cases
-/@cmnd{if}/ {
-s//@xcmd\
-{if}/
-s/@cmnd{else}/@xcmd\
-{else}/
-s/@cmnd{not}/@xcmd\
-{not}/
-s/$}@cmnd{status}/$}status/
-b nextcmnd
-}
-/@cmnd{for}/ {
-s/@cmnd{for}/@xcmd\
-{for}/
-s/[[:<:]]in[[:>:]]/@args{in}/
-b castargs
-}
-
-#.
-# Find initial command
-#.
-s/^\( *\)@cmnd\(.*\)/\1@xcmd\
-\2/
-t castargs
-s/^\( *\)@func\(.*\)/\1@xfnc\
-\2/
-t castargs
-s/^\( *\)@sbin\(.*\)/\1@xbin\
-\2/
-t castargs
-:nextcmnd
-s/@cmnd\(.*\)$/@xcmd\
-\1/
-t castargs
-s/@func\(.*\)$/@xfnc\
-\1/
-t castargs
-s/@sbin\(.*\)$/@xbin\
-\1/
-t castargs
-b cleancmd
-:castargs
-s/\n\([^;(]*[;(]\)/\1/
-s/\n\([^@]*@redr{|}\)/\1/
-t nextcmnd
-s/\n\([^@]*\)@cmnd\(.*\)/\1@args\
-\2/
-t castargs
-s/\n\([^@]*\)@func\(.*\)/\1@args\
-\2/
-t castargs
-s/\n\([^@]*\)@sbin\(.*\)/\1@args\
-\2/
-t castargs
-s/\n\([^@]*\)@\(....\)\(.*\)/\1@\2\
-\3/
-t castargs
-:cleancmd
-s/xcmd/cmnd/g
-s/xfnc/func/g
-s/xbin/sbin/g
-s/\n//g
-#.
-# Remove any args after echo
-#.
-/@cmnd{echo}/ {
-s//\
-&\
-/
-:cleanecho
-s/\n\([^@]*\)@args{\([^}]*\)}/\1\2/
-t cleanecho
-s/\n//g
-w debug-lexicon.log
-}
-#.
-# Mark up sesitive character entities.
-#.
-:entities
-s/</\&lt;/g
-s/>/\&gt;/g
-#.
-# Uncomment the folowing two lines (ss) to log the final output, sent to Doxygen.
-# s/^.*$/OUT : &/w debug-lexicon.log
-# s/^OUT : //
-#.
-# Lines are reassembled, so branch to end
-b
-#.
-# Move protected content to hold space and mark up other entities.
-:protect
-h
-# Clear out any content that has already been marked up, to prevent futher
-# markup on words that should be left alone.
-#.
-:patternflush
-s/\n<@[^}]*}//
-s/\n[}]//
-t patternflush
-s/\n$//
-#.
-# Swap the pattern and hold buffers and remove unmarked lines and extra
-# characters. Basically the inverse of the 'patternflush' action, with
-# additional trailing characters stripped.
-x
-s/^ *[^<][^@][^}]*$//
-s/^ *[^<][^@][^\\]*[\\ ()]*\n//
-:holdflush
-s/}[)(\\ ][)(\\ ]*/}/
-s/\n[];)|* -][^\\]*[\\]*//
-t holdflush
-s/\n$//
-#.
-# Swap the buffers back.
-x
-#.
-# A special case. Tidy up after commands.
-# Redirectors
-s/\([^{|] *\)|/\1@redr{|}/g
-s/\([^{<>^] *\)\([0-9]* *[<>^][<>^]*[a-zA-z0-9._-]*\)/\1@redr{\2}/g
-s/\\}/}\\/g
-#.
-# Now we can add in 'unsafe' entities that would be too greedy.
-# Declared Variables
-#:vars
-s/\([$%][$%]*\)\([A-Za-z_0-9][A-Za-z_0-9]*\)/@vars{@optr{\1}\2}/g
-#.
-# Files
-s/\([A-Za-z*][A-Za-z]*\.[a-z0-9][a-z0-9]*\)/@fsfo{\1}/g
-#.
-:commands
-#.
-# Manually add a few commands not harvested from source files.
-#.
-s,[[:<:]]whoami[[:>:]],@sbin{whoami},g
-s,[[:<:]]fishd[[:>:]],@sbin{fishd},g
-#.
-#### This section is built in the Makefile. Just some formatting examples. #####
-#.
-#   fish commands (cmnd) <- 4 character code that has a Doxygen alias counterpart
-#   template : s/[[:<:]]function[[:>:]]/@cmnd{&}/
-#.
-#   s,[[:<:]]function[[:>:]],@cmnd{function},g
-#   s,[[:<:]]begin[[:>:]],@cmnd{begin},g
-#   ...
-#.
-#   fish functions (func)
-#   Populated by 'public' functions' filename.
-#.
-#   s,[[:<:]]fish_pwd[[:>:]],@func{fish_pwd},g
-#   s,[[:<:]]fish_prompt[[:>:]],@func{fish_prompt},g
-#   ...
-#.
-#   Shell Binary (sbin)
-#   Populated from completion filenames
-#.
-#   s,[[:<:]]seq[[:>:]],@sbin{seq},g
-#   s,[[:<:]]rm[[:>:]],@sbin{rm},g
-#   ...
-#.
-#   Color Variable (clrv)
-#   Populated from __fish_config_interactive.fish
-#   Allows fish's 'special' color variables to be identified
-#.
-#   s,[[:<:]]fish_color_normal[[:>:]],@clrv{fish_color_normal},g
-#   s,[[:<:]]fish_color_command[[:>:]],@clrv{fish_color_command},g
-#.
-# Once all of the commands/functions/variables/special's have been marked up,
-# branch back to tidy up and collapse the pattern/hold buffers back to a
-# single line.
-#.
-# b tidy
diff --git a/doc_src/fish_prompt.txt b/doc_src/fish_prompt.txt
index 53da848e..57cc5c24 100644
--- a/doc_src/fish_prompt.txt
+++ b/doc_src/fish_prompt.txt
@@ -25,7 +25,8 @@ A simple prompt:
 
 \fish
 function fish_prompt -d "Write out the prompt"
-    printf '%s@%s%s%s%s> ' (whoami) (hostname|cut -d . -f 1) (set_color $fish_color_cwd) (prompt_pwd) (set_color normal)
+    printf '%s@%s%s%s%s> ' (whoami) (hostname | cut -d . -f 1) \
+    		(set_color $fish_color_cwd) (prompt_pwd) (set_color normal)
 end
 \endfish
 
diff --git a/doc_src/functions.txt b/doc_src/functions.txt
index 520b55b7..24e375c4 100644
--- a/doc_src/functions.txt
+++ b/doc_src/functions.txt
@@ -2,7 +2,7 @@
 
 \subsection functions-synopsis Synopsis
 \fish{synopsis}
-functions [-a|--all] [-n|--names]
+functions [-a | --all] [-n | --names]
 functions -c OLDNAME NEWNAME
 functions -d DESCRIPTION FUNCTION
 functions [-eq] FUNCTIONS...
diff --git a/doc_src/if.txt b/doc_src/if.txt
index b1ca88f5..c5373801 100644
--- a/doc_src/if.txt
+++ b/doc_src/if.txt
@@ -2,7 +2,10 @@
 
 \subsection if-synopsis Synopsis
 \fish{synopsis}
-if CONDITION; COMMANDS_TRUE...; [else if CONDITION2; COMMANDS_TRUE2...;] [else; COMMANDS_FALSE...;] end
+if CONDITION; COMMANDS_TRUE...;
+[else if CONDITION2; COMMANDS_TRUE2...;]
+[else; COMMANDS_FALSE...;]
+end
 \endfish
 
 \subsection if-description Description
diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in
index 94929b74..1f3a9cc3 100644
--- a/doc_src/index.hdr.in
+++ b/doc_src/index.hdr.in
@@ -1,4 +1,5 @@
-/** \mainpage Documentation
+/**
+\mainpage Documentation
 \htmlonly[block]
 <div class="fish_left_bar">
 <div class="menu docs_menu">
@@ -188,7 +189,7 @@ When you start a job in `fish`, `fish` itself will pause, and give control of th
 Example:
 
 \fish
-emacs &amp;
+emacs &
 \endfish
 
 will start the emacs text editor in the background.
@@ -260,14 +261,14 @@ The other conditionals use the <a href='#variables-status'>exit status</a> of a
 
 This is a short explanation of some of the commonly used words in fish.
 
-- <b>argument</b>, a parameter given to a command
-- <b>builtin</b>, a command that is implemented in the shell. Builtins are commands that are so closely tied to the shell that it is impossible to implement them as external commands.
-- <b>command</b>, a program that the shell can run.
-- <b>function</b>, a block of commands that can be called as if they where a single command. By using functions, it is possible to string together multiple smaller commands into one more advanced command.
-- <b>job</b>, a running pipeline or command
-- <b>pipeline</b>, a set of commands stringed together so that the output of one command is the input of the next command
-- <b>redirection</b>, a operation that changes one of the input/output streams associated with a job
-- <b>switch</b>, a special flag sent as an argument to a command that will alter the behavior of the command. A switch almost always begins with one or two hyphens.
+- <b>argument</b> a parameter given to a command
+- <b>builtin</b> a command that is implemented in the shell. Builtins are commands that are so closely tied to the shell that it is impossible to implement them as external commands.
+- <b>command</b> a program that the shell can run.
+- <b>function</b> a block of commands that can be called as if they where a single command. By using functions, it is possible to string together multiple smaller commands into one more advanced command.
+- <b>job</b> a running pipeline or command
+- <b>pipeline</b> a set of commands stringed together so that the output of one command is the input of the next command
+- <b>redirection</b> a operation that changes one of the input/output streams associated with a job
+- <b>switch</b> a special flag sent as an argument to a command that will alter the behavior of the command. A switch almost always begins with one or two hyphens.
 
 
 \section docs Help
@@ -393,6 +394,9 @@ The exit status of the last run command substitution is available in the <a href
 Only part of the output can be used, see <a href='#expand-index-range'>index range expansion</a> for details.
 
 Examples:
+\fish
+echo (basename image.jpg .jpg).png
+# Outputs 'image.png'.
 
 The command `echo (basename image.jpg .jpg).png` will output 'image.png'.
 
@@ -406,13 +410,14 @@ splitting it into an array.
 
 A comma separated list of characters enclosed in curly braces will be expanded so each element of the list becomes a new parameter.
 
-Example:
-
+Examples:
 \fish
-echo input.{c,h,txt} # Outputs 'input.c input.h input.txt'
-\endfish
+echo input.{c,h,txt}
+# Outputs 'input.c input.h input.txt'
 
-The command `mv *.{c,h} src/` moves all files with the suffix '.c' or '.h' to the subdirectory src.
+mv *.{c,h} src/
+# Moves all files with the suffix '.c' or '.h' to the subdirectory src.
+\endfish
 
 \subsection expand-variable Variable expansion
 
@@ -423,12 +428,18 @@ Undefined and empty variables expand to nothing.
 To separate a variable name from text it should immediately be followed by, encase the variable within braces.
 
 Examples:
+\fish
+echo $HOME
+# Prints the home directory of the current user.
 
-`echo $HOME` prints the home directory of the current user.
+echo $nonexistentvariable
+# Prints no output.
 
-`echo $nonexistentvariable` prints no output.
+echo The plural of $WORD is {$WORD}s
+# Prints "The plural of cat is cats" when $WORD is set to cat.
+\endfish
 
-`echo The plural of $WORD is {$WORD}s` prints "The plural of cat is cats" when `$WORD` is set to cat. Note that without the braces, fish will try to expand a variable called `$WORDs`, which may not exist.
+Note that without the braces, fish will try to expand a variable called `$WORDs`, which may not exist.
 
 The latter syntax works by exploiting <a href="#expand-brace">brace expansion</a>; care should be taken with array variables and undefined variables, as these behave very differently to POSIX shells.
 
@@ -461,24 +472,19 @@ Some examples:
 \fish
 # Limit the command substitution output
 echo (seq 10)[2..5]
-# will use elements from 2 to 5
-
-# Output is:
-# 2 3 4 5
+# Uses elements from 2 to 5
+# Output is: 2 3 4 5
 
 # Use overlapping ranges:
 echo (seq 10)[2..5 1..3]
-# will take elements from 2 to 5 and then elements from 1 to 3
-
-# Output is:
-# 2 3 4 5 1 2 3
+# Takes elements from 2 to 5 and then elements from 1 to 3
+# Output is: 2 3 4 5 1 2 3
 
 # Reverse output
 echo (seq 10)[-1..1]
-# will use elements from the last output line to the first one in reverse direction
-
-# Output is:
-# 10 9 8 7 6 5 4 3 2 1
+# Uses elements from the last output line to
+# the first one in reverse direction
+# Output is: 10 9 8 7 6 5 4 3 2 1
 \endfish
 
 The same works when setting or expanding variables:
@@ -604,14 +610,11 @@ end
 
 function avast
     set phrase 'Avast, mateys'
-
     # Calling the shiver function here can not
     # change any variables in the local scope
     shiver
-
     echo $phrase
 end
-
 avast
 \endfish
 
diff --git a/doc_src/nextd.txt b/doc_src/nextd.txt
index a098c0a7..217042b1 100644
--- a/doc_src/nextd.txt
+++ b/doc_src/nextd.txt
@@ -2,7 +2,7 @@
 
 \subsection nextd-synopsis Synopsis
 \fish{synopsis}
-nextd [ -l | --list ] [POS]
+nextd [-l | --list] [POS]
 \endfish
 
 \subsection nextd-description Description
diff --git a/doc_src/psub.txt b/doc_src/psub.txt
index d0caafba..be812f4a 100644
--- a/doc_src/psub.txt
+++ b/doc_src/psub.txt
@@ -2,7 +2,7 @@
 
 \subsection psub-synopsis Synopsis
 \fish{synopsis}
-COMMAND1 (COMMAND2|psub [-f])
+COMMAND1 (COMMAND2 | psub [-f])
 \endfish
 
 \subsection psub-description Description
@@ -24,5 +24,7 @@ process can seek in the stream.
 
 \subsection psub-example Example
 
-`diff (sort a.txt|psub) (sort b.txt|psub)` shows the difference
-between the sorted versions of files a.txt and b.txt.
+\fish
+diff (sort a.txt | psub) (sort b.txt | psub)
+# shows the difference between the sorted versions of files `a.txt` and `b.txt`.
+\endfish
\ No newline at end of file
diff --git a/doc_src/set.txt b/doc_src/set.txt
index 4acbbf17..cbdd0f15 100644
--- a/doc_src/set.txt
+++ b/doc_src/set.txt
@@ -82,19 +82,21 @@ success, with a non-zero exit status if the commandline was invalid, if the
 variable was write-protected or if the variable did not exist.
 
 \subsection set-example Example
+\fish
+set -xg
+# Prints all global, exported variables.
 
-`set -xg` will print all global, exported variables.
-
-`set foo hi` sets the value of the variable foo to be hi.
+set foo hi
+# Sets the value of the variable $foo to be 'hi'.
 
-`set -e smurf` removes the variable `smurf`.
+set -e smurf
+# Removes the variable $smurf
 
-`set PATH[4] ~/bin` changes the fourth element of the `PATH` array to `~/bin`
+set PATH[4] ~/bin
+# Changes the fourth element of the $PATH array to ~/bin
 
-\fish
 if set python_path (which python)
     echo "Python is at $python_path"
 end
+# Outputs the path to Python if `which` returns true.
 \endfish
-
-The above outputs the path to Python if `which` returns true.
diff --git a/doc_src/set_color.txt b/doc_src/set_color.txt
index 0597114b..41c58d9e 100644
--- a/doc_src/set_color.txt
+++ b/doc_src/set_color.txt
@@ -2,7 +2,7 @@
 
 \subsection set_color-synopsis Synopsis
 \fish{synopsis}
-set_color [-h|--help] [-b|--background COLOR] [COLOR]
+set_color [OPTIONS] [COLOR]
 \endfish
 
 \subsection set_color-description Description
diff --git a/doc_src/source.txt b/doc_src/source.txt
index 5efb6740..8e051a8a 100644
--- a/doc_src/source.txt
+++ b/doc_src/source.txt
@@ -27,6 +27,7 @@ is deprecated in favour of `source`, and `.` will be removed in a future
 version of fish.
 
 \subsection source-example Example
-
-`source ~/.config/fish/config.fish` causes fish to re-read its initialization file.
-
+\fish
+source ~/.config/fish/config.fish
+# Causes fish to re-read its initialization file.
+\endfish
diff --git a/doc_src/trap.txt b/doc_src/trap.txt
index fdccd178..9c607ad4 100644
--- a/doc_src/trap.txt
+++ b/doc_src/trap.txt
@@ -40,6 +40,7 @@ The return status is 1 if any `SIGSPEC` is invalid; otherwise trap
 returns 0.
 
 \subsection trap-example Example
-
-`trap "status --print-stack-trace" SIGUSR1` prints a stack trace
-each time the `SIGUSR1` signal is sent to the shell.
+\fish
+trap "status --print-stack-trace" SIGUSR1
+# Prints a stack trace each time the SIGUSR1 signal is sent to the shell.
+\endfish
\ No newline at end of file
diff --git a/doc_src/tutorial.hdr b/doc_src/tutorial.hdr
index 0f011efc..c228c11f 100644
--- a/doc_src/tutorial.hdr
+++ b/doc_src/tutorial.hdr
@@ -1,5 +1,5 @@
-/** \page tutorial Tutorial
-
+/**
+\page tutorial Tutorial
 \htmlonly[block]
 <div class="fish_left_bar">
 <div class="menu tutorial_menu">
@@ -23,7 +23,10 @@
 - <a href="#tut_functions">Functions</a>
 - <a href="#tut_loops">Loops</a>
 - <a href="#tut_prompt">Prompt</a>
+- <a href="#tut_path">$PATH</a>
 - <a href="#tut_startup">Startup</a>
+- <a href="#tut_autoload">Autoloading Functions</a>
+- <a href="#tut-more">Ready for more?</a>
 
 \htmlonly[block]
 </div>
@@ -33,7 +36,6 @@
 <h1 class="interior_title">fish tutorial</h1>
 \endhtmlonly
 
-
 \section tut_why_fish Why fish?
 
 `fish` is a fully-equipped command line shell (like bash or zsh) that is smart and user-friendly. `fish` supports powerful features like syntax highlighting, autosuggestions, and tab completions that just work, with nothing to learn or configure.
@@ -45,14 +47,14 @@ If you want to make your command line more productive, more useful, and more fun
 
 This tutorial assumes a basic understanding of command line shells and Unix commands, and that you have a working copy of `fish`.
 
-If you have a strong understanding of other shells, and want to know what `fish` does differently, search for the magic phrase <i>unlike other shells</i>, which is used to call out important differences.
+If you have a strong understanding of other shells, and want to know what `fish` does differently, search for the magic phrase <em>unlike other shells</em>, which is used to call out important differences.
 
 When you start `fish`, you should see this:
 
 \fish{cli-dark}
-Welcome to fish, the friendly interactive shell
-Type <em>help</em> for instructions on how to use fish
-you@hostname <em>~</em>>
+<outp>Welcome to fish, the friendly interactive shell</outp>
+<outp>Type <span class="cwd">help</span> for instructions on how to use fish</outp>
+<asis>you@hostname</asis> ~>___
 \endfish
 
 `fish` comes with a default prompt that shows your username, hostname, and working directory. You'll see <a href="#tut_prompt">how to change your prompt</a> further down. From now on, we'll pretend your prompt is just a '`>`' to save space.
@@ -63,17 +65,17 @@ you@hostname <em>~</em>>
 `fish` runs commands like other shells: you type a command, followed by its arguments. Spaces are separators:
 
 \fish{cli-dark}
-> <b>echo</b> <i>hello world</i>
-hello world
+>_ echo hello world
+<outp>hello world</outp>
 \endfish
 
 You can include a literal space in an argument with a backslash, or by using single or double quotes:
 
 \fish{cli-dark}
-> <b>mkdir</b> <i>My\ Files</i>
-> <b>cp</b> <i>~/Some\ File</i> <i class=quote>'My Files'</i>
-> <b>ls</b> <i class=quote>"My Files"</i>
-Some File
+>_ mkdir My\ Files
+>_ cp ~/Some\ File 'My Files'
+>_ ls "My Files"
+<outp>Some File</outp>
 \endfish
 
 Commands can be chained with semicolons.
@@ -84,9 +86,9 @@ Commands can be chained with semicolons.
 `fish` has excellent help and man pages. Run `help` to open help in a web browser, and `man` to open it in a man page. You can also ask for help with a specific command, for example, `help set` to open in a web browser, or `man set` to see it in the terminal.
 
 \fish{cli-dark}
-> <b>man</b> <i>set</i>
-set - handle shell variables
-  Synopsis...
+>_ man set
+<outp>set - handle shell variables</outp>
+<outp>  Synopsis...</outp>
 \endfish
 
 
@@ -95,19 +97,19 @@ set - handle shell variables
 You'll quickly notice that `fish` performs syntax highlighting as you type. Invalid commands are colored red by default:
 
 \fish{cli-dark}
-> <error>/bin/mkd</error>
+>_ <error>/bin/mkd</error>
 \endfish
 
 A command may be invalid because it does not exist, or refers to a file that you cannot execute. When the command becomes valid, it is shown in a different color:
 
 \fish{cli-dark}
-> <b>/bin/mkdir</b>
+>_ /bin/mkdir
 \endfish
 
 `fish` will underline valid file paths as you type them:
 
 \fish{cli-dark}
-> <b>cat</b> <i><span style="text-decoration: underline">~/somef<span class="u">i</span></span></i>
+>_ cat <u>~/somefi</u>__
 \endfish
 
 This tells you that there exists a file that starts with '`somefi`', which is useful feedback as you type.
@@ -117,29 +119,29 @@ These colors, and many more, can be changed by running `fish_config`, or by modi
 
 \section tut_wildcards Wildcards
 
-`fish` supports the familiar wildcard *. To list all JPEG files:
+`fish` supports the familiar wildcard `*`. To list all JPEG files:
 
 \fish{cli-dark}
-> <b>ls</b> <i>*.jpg</i>
-lena.jpg
-meena.jpg
-santa maria.jpg
+>_ ls *.jpg
+<outp>lena.jpg</outp>
+<outp>meena.jpg</outp>
+<outp>santa maria.jpg</outp>
 \endfish
 
 You can include multiple wildcards:
 
 \fish{cli-dark}
-> <b>ls</b> <i>l*.p*</i>
-lena.png
-lesson.pdf
+>_ ls l*.p*
+<outp>lena.png</outp>
+<outp>lesson.pdf</outp>
 \endfish
 
-Especially powerful is the <i>recursive wildcard</i> ** which searches directories recursively:
+Especially powerful is the recursive wildcard ** which searches directories recursively:
 
 \fish{cli-dark}
-> <b>ls</b> <i>/var/\**.log</i>
-/var/log/system.log
-/var/run/sntp.log
+>_ ls /var/**.log
+<outp>/var/log/system.log</outp>
+<outp>/var/run/sntp.log</outp>
 \endfish
 
 If that directory traversal is taking a long time, you can @key{Control,C} out of it.
@@ -150,14 +152,14 @@ If that directory traversal is taking a long time, you can @key{Control,C} out o
 You can pipe between commands with the usual vertical bar:
 
 \fish{cli-dark}
-> <b>echo</b> <i>hello world</i> | <b>wc</b>
-       1       2      12
+>_ echo hello world | wc
+<outp>       1       2      12</outp>
 \endfish
 
 stdin and stdout can be redirected via the familiar &lt; and &gt;. Unlike other shells, stderr is redirected with a caret ^
 
 \fish{cli-dark}
-> <b>grep</b> <i>fish</i> &lt; /etc/shells > ~/output.txt ^ ~/errors.txt
+>_ grep fish < /etc/shells > ~/output.txt ^ ~/errors.txt
 \endfish
 
 
@@ -166,24 +168,23 @@ stdin and stdout can be redirected via the familiar &lt; and &gt;. Unlike other
 `fish` suggests commands as you type, and shows the suggestion to the right of the cursor, in gray. For example:
 
 \fish{cli-dark}
-> <b class="error">/bin/h</b><span class="suggest"><span class="u">o</span>stname</span>
+>_ <error>/bin/h</error><s>__ostname</s>
 \endfish
 
 It knows about paths and options:
 
 \fish{cli-dark}
-> <b>grep</b> <i>--i<span class="suggest"><span class="u">g</span>nore-case</span></i>
+>_ grep --i<s>__gnore-case</s>
 \endfish
 
 And history too. Type a command once, and you can re-summon it by just typing a few letters:
 
 \fish{cli-dark}
-> <b>r</b><span class="suggest"><span class="u">s</span>ync -avze ssh . myname@somelonghost.com:/some/long/path/doo/dee/doo/dee/doo</span>
+>_ r<s>__sync -avze ssh . myname@somelonghost.com:/some/long/path/doo/dee/doo/dee/doo</s>
 \endfish
 
 To accept the autosuggestion, hit right arrow or @key{Control,F}. To accept a single word of the autosuggestion, @key{Alt,&rarr;} (right arrow). If the autosuggestion is not what you want, just ignore it.
 
-
 \section tut_tab_completions Tab Completions
 
 `fish` comes with a rich set of tab completions, that work "out of the box."
@@ -191,14 +192,14 @@ To accept the autosuggestion, hit right arrow or @key{Control,F}. To accept a si
 Press tab, and `fish` will attempt to complete the command, argument, or path:
 
 \fish{cli-dark}
-> <b class="error">/pri</b><span class="meta">&lt;tab&gt; &rarr;</span> <b>/private/</b>
+>_ <error>/pri</error> @key{Tab} &rarr; /private/
 \endfish
 
 If there's more than one possibility, it will list them:
 
 \fish{cli-dark}
-> <b class="error">~/stuff/s</b><span class="meta">&lt;tab&gt;</span>
-<i>~/stuff/s</i>cript.sh  <i class="quote">(Executable, 4.8kB)</i>  <i>~/stuff/s</i>ources/  <i class="quote">(Directory)</i>
+>_ <error>~/stuff/s</error> @key{Tab}
+<outp><m>~/stuff/s</m>cript.sh  <i>(Executable, 4.8kB)</i>  <m>~/stuff/s</m>ources/  <i>(Directory)</i></outp>
 \endfish
 
 Hit tab again to cycle through the possibilities.
@@ -206,51 +207,50 @@ Hit tab again to cycle through the possibilities.
 `fish` can also complete many commands, like git branches:
 
 \fish{cli-dark}
-> <b>git</b> <i>merge pr</i><span class="meta">&lt;tab&gt; &rarr;</span> git merge prompt_designer
-> <b>git</b> <i>checkout b</i><span class="meta">&lt;tab&gt;</span>
-<i>b</i>uiltin_list_io_merge  <i class="quote">(Branch)</i>  <i>b</i>uiltin_set_color  <i class="quote">(Branch)</i>  <i>b</i>usted_events  <i class="quote">(Tag)</i>
+>_ git merge pr @key{Tab} &rarr; git merge prompt_designer
+>_ git checkout b @key{Tab}
+<outp><m>b</m>uiltin_list_io_merge <i>(Branch)</i> <m>b</m>uiltin_set_color <i>(Branch)</i> <m>b</m>usted_events <i>(Tag)</i></outp>
 \endfish
 
 Try hitting tab and see what `fish` can do!
 
-
 \section tut_variables Variables
 
-Like other shells, a dollar sign performs <i>variable substitution</i>:
+Like other shells, a dollar sign performs variable substitution:
 
 \fish{cli-dark}
-> <b>echo</b> <i>My home directory is $HOME</i>
-My home directory is /home/tutorial
+>_ echo My home directory is $HOME
+<outp>My home directory is /home/tutorial</outp>
 \endfish
 
 Variable substitution also occurs in double quotes, but not single quotes:
 
 \fish{cli-dark}
-> <b>echo</b> <i class="quote">"My current directory is </i><i>$</i><i class="quote">PWD"</i>
-My current directory is /home/tutorial
-> <b>echo</b> <i class="quote">'My current directory is $PWD'</i>
-My current directory is $PWD
+>_ echo "My current directory is $PWD"
+<outp>My current directory is /home/tutorial</outp>
+>_ echo 'My current directory is $PWD'
+<outp>My current directory is $PWD</outp>
 \endfish
 
 Unlike other shells, `fish` has no dedicated syntax for setting variables. Instead it has an ordinary command: `set`, which takes a variable name, and then its value.
 
 \fish{cli-dark}
-> <b>set</b> <i>name</i> <i class="quote">'Mister Noodle'</i>
-> <b>echo</b> <i>$name</i>
-Mister Noodle
+>_ set name 'Mister Noodle'
+>_ echo $name
+<outp>Mister Noodle</outp>
 \endfish
 
-(Notice the quotes: without them, `Mister` and `Noodle` would have been separate arguments, and `$name` would have been made into a <i>list</i> of two elements.)
+(Notice the quotes: without them, `Mister` and `Noodle` would have been separate arguments, and `$name` would have been made into a list of two elements.)
 
-Unlike other shells, variables are <i>not</i> further split after substitution:
+Unlike other shells, variables are not further split after substitution:
 
 \fish{cli-dark}
-> <b>mkdir</b> <i>$name</i>
-> <b>ls</b>
-Mister Noodle
+>_ mkdir $name
+>_ ls
+<outp>Mister Noodle</outp>
 \endfish
 
-In bash, this would have created two directories "Mister" and "Noodle". In `fish`, it created only one: the variable had the value "Mister Noodle", so that is the argument that was passed to <span style="mono">mkdir</span>, spaces and all.
+In bash, this would have created two directories "Mister" and "Noodle". In `fish`, it created only one: the variable had the value "Mister Noodle", so that is the argument that was passed to `mkdir`, spaces and all.
 
 
 \section tut_exit_status Exit Status
@@ -258,43 +258,44 @@ In bash, this would have created two directories "Mister" and "Noodle". In `fish
 Unlike other shells, `fish` stores the exit status of the last command in `$status` instead of `$?`.
 
 \fish{cli-dark}
-> <b>false</b>
-> <b>echo</b> <i>$status</i>
-1
+>_ false
+>_ echo $status
+<outp>1</outp>
 \endfish
 
 Zero is considered success, and non-zero is failure.
 
-<h2 id="tut_exports">Exports (Shell Variables)</h2>
+
+\section tut_exports Exports (Shell Variables)
 
 Unlike other shells, `fish` does not have an export command. Instead, a variable is exported via an option to `set`, either `--export` or just `-x`.
 
 \fish{cli-dark}
-> <b>set</b> <i>-x MyVariable SomeValue</i>
-> <b>env</b> | <b>grep</b> <i>MyVariable</i>
-<span style="background: #A0A">MyVariable</span>=SomeValue
+>_ set -x MyVariable SomeValue
+>_ env | grep MyVariable
+<outp><sm>MyVariable</sm>=SomeValue</outp>
 \endfish
 
 You can erase a variable with `-e` or `--erase`
 
 \fish{cli-dark}
-> <b>set</b> <i>-e MyVariable</i>
-> <b>env</b> | <b>grep</b> <i>MyVariable</i>
-<span class="meta">(no output)</span>
+>_ set -e MyVariable
+>_ env | grep MyVariable
+<outp>(no output)</outp>
 \endfish
 
 
 \section tut_lists Lists
 
-The `set` command above used quotes to ensure that `Mister Noodle` was one argument. If it had been two arguments, then `name` would have been a <i>list</i> of length 2.  In fact, all variables in `fish` are really lists, that can contain any number of values, or none at all.
+The `set` command above used quotes to ensure that `Mister Noodle` was one argument. If it had been two arguments, then `name` would have been a list of length 2.  In fact, all variables in `fish` are really lists, that can contain any number of values, or none at all.
 
-Some variables, like `$PWD`, only have one value. By convention, we talk about that variable's value, but we really mean its <i>first</i> (and only) value.
+Some variables, like `$PWD`, only have one value. By convention, we talk about that variable's value, but we really mean its first (and only) value.
 
-Other variables, like `$PATH`, really do have multiple values. During <i>variable expansion</i>, the variable expands to become multiple arguments:
+Other variables, like `$PATH`, really do have multiple values. During variable expansion, the variable expands to become multiple arguments:
 
 \fish{cli-dark}
-> <b>echo</b> <i>$PATH</i>
-/usr/bin /bin /usr/sbin /sbin /usr/local/bin
+>_ echo $PATH
+<outp>/usr/bin /bin /usr/sbin /sbin /usr/local/bin</outp>
 \endfish
 
 Lists cannot contain other lists: there is no recursion.  A variable is a list of strings, full stop.
@@ -302,48 +303,48 @@ Lists cannot contain other lists: there is no recursion.  A variable is a list o
 Get the length of a list with `count`:
 
 \fish{cli-dark}
-> <b>count</b> <i>$PATH</i>
-5
+>_ count $PATH
+<outp>5</outp>
 \endfish
 
 You can append (or prepend) to a list by setting the list to itself, with some additional arguments. Here we append /usr/local/bin to $PATH:
 
 \fish{cli-dark}
-> <b>set</b> <i>PATH $PATH /usr/local/bin</i>
+>_ set PATH $PATH /usr/local/bin
 \endfish
 
 
 You can access individual elements with square brackets. Indexing starts at 1 from the beginning, and -1 from the end:
 
 \fish{cli-dark}
-> <b>echo</b> <i>$PATH</i>
-/usr/bin /bin /usr/sbin /sbin /usr/local/bin
-> <b>echo</b> <i>$PATH[1]</i>
-/usr/bin
-> <b>echo</b> <i>$PATH[-1]</i>
-/usr/local/bin
+>_ echo $PATH
+<outp>/usr/bin /bin /usr/sbin /sbin /usr/local/bin</outp>
+>_ echo $PATH[1]
+<outp>/usr/bin</outp>
+>_ echo $PATH[-1]
+<outp>/usr/local/bin</outp>
 \endfish
 
 You can also access ranges of elements, known as "slices:"
 
 \fish{cli-dark}
-> <b>echo</b> <i>$PATH[1..2]</i>
-/usr/bin /bin
-> <b>echo</b> <i>$PATH[-1..2]</i>
-/usr/local/bin /sbin /usr/sbin /bin
+>_ echo $PATH[1..2]
+<outp>/usr/bin /bin</outp>
+>_ echo $PATH[-1..2]
+<outp>/usr/local/bin /sbin /usr/sbin /bin</outp>
 \endfish
 
-You can iterate over a list (or a slice) with a <i>for loop</i>:
+You can iterate over a list (or a slice) with a for loop:
 
 \fish{cli-dark}
-> <b>for</b> <i>val</i> <b>in</b> <i>$PATH</i>
-    <b>echo</b> <i>"entry: $val"</i>
-  <b>end</b>
-entry: /usr/bin/
-entry: /bin
-entry: /usr/sbin
-entry: /sbin
-entry: /usr/local/bin
+>_ for val in $PATH
+    echo "entry: $val"
+  end
+<outp>entry: /usr/bin/</outp>
+<outp>entry: /bin</outp>
+<outp>entry: /usr/sbin</outp>
+<outp>entry: /sbin</outp>
+<outp>entry: /usr/local/bin</outp>
 \endfish
 
 
@@ -352,62 +353,64 @@ entry: /usr/local/bin
 Command substitutions use the output of one command as an argument to another. Unlike other shells, `fish` does not use backticks ` for command substitutions. Instead, it uses parentheses:
 
 \fish{cli-dark}
-> <b>echo</b> <i>In (</i><b>pwd</b><i>), running (</i><b>uname</b><i>)</i>
-In /home/tutorial, running FreeBSD
+>_ echo In (pwd), running (uname)
+<outp>In /home/tutorial, running FreeBSD</outp>
 \endfish
 
 A common idiom is to capture the output of a command in a variable:
 
 \fish{cli-dark}
-> <b>set</b> <i>os (</i><b>uname</b><i>)</i>
-> <b>echo</b> <i>$os</i>
-Linux
+>_ set os (uname)
+>_ echo $os
+<outp>Linux</outp>
 \endfish
 
 Command substitutions are not expanded within quotes. Instead, you can temporarily close the quotes, add the command substitution, and reopen them, all in the same argument:
 
 \fish{cli-dark}
-> <b>touch</b> <i class="quote">"testing_"</i><i>(</i><b>date</b> <i>+%s</i><i>)</i><i class="quote">".txt"</i>
-> <b>ls</b> <i>*.txt</i>
-testing_1360099791.txt
+>_ touch <i class="quote">"testing_"</i>(date +%s)<i class="quote">".txt"</i>
+>_ ls *.txt
+<outp>testing_1360099791.txt</outp>
 \endfish
 
-<h2 id="tut_combiners">Combiners (And, Or, Not)</h2>
+
+\section tut_combiners Combiners (And, Or, Not)
 
 Unlike other shells, `fish` does not have special syntax like &amp;&amp; or || to combine commands. Instead it has commands `and`, `or`, and `not`.
 
 \fish{cli-dark}
-> <b>cp</b> <i>file1.txt file1_bak.txt</i>; <b>and echo</b> <i class="quote">"Backup successful"</i>; <b>or echo</b> <i class="quote">"Backup failed"</i>
-Backup failed
+>_ cp file1.txt file1_bak.txt; and echo "Backup successful"; or echo "Backup failed"
+<outp>Backup failed</outp>
 \endfish
 
-<h2 id="tut_conditionals">Conditionals (If, Else, Switch)</h2>
+
+\section tut_conditionals Conditionals (If, Else, Switch)
 
 Use `if`, `else if`, and `else` to conditionally execute code, based on the exit status of a command.
 
 \fish{cli-dark}
-<b>if grep</b> <i>fish /etc/shells</i>
-    <b>echo</b> <i>Found fish</i>
-<b>else if grep</b> <i>bash /etc/shells</i>
-    <b>echo</b> <i>Found bash</i>
-<b>else</b>
-    <b>echo</b> <i>Got nothing</i>
-<b>end</b>
+if grep fish /etc/shells
+    echo Found fish
+else if grep bash /etc/shells
+    echo Found bash
+else
+    echo Got nothing
+end
 \endfish
 
 There is also a `switch` command:
 
 \fish{cli-dark}
-<b>switch</b> <i>(</i><b>uname</b><i>)</i>
-<b>case</b> <i>Linux</i>
-    <b>echo</b> <i>Hi Tux!</i>
-<b>case</b> <i>Darwin</i>
-    <b>echo</b> <i>Hi Hexley!</i>
-<b>case</b> <i>FreeBSD NetBSD DragonFly</i>
-    <b>echo</b> <i>Hi Beastie!</i>
-<b>case</b> <i class="quote">'*'</i>
-    <b>echo</b> <i>Hi, stranger!</i>
-<b>end</b>
+switch (uname)
+case Linux
+    echo Hi Tux!
+case Darwin
+    echo Hi Hexley!
+case FreeBSD NetBSD DragonFly
+    echo Hi Beastie!
+case '*'
+    echo Hi, stranger!
+end
 \endfish
 
 Note that `case` does not fall through, and can accept multiple arguments or (quoted) wildcards.
@@ -418,13 +421,13 @@ Note that `case` does not fall through, and can accept multiple arguments or (qu
 A `fish` function is a list of commands, which may optionally take arguments. Unlike other shells, arguments are not passed in "numbered variables" like `$1`, but instead in a single list `$argv`. To create a function, use the `function` builtin:
 
 \fish{cli-dark}
-> <i><b>function</b> say_hello
-     <b>echo</b> Hello $argv
-  <b>end</b></i>
-> <b>say_hello</b>
-Hello
-> <b>say_hello <i>everybody!</i></b>
-Hello everybody!
+>_ function say_hello
+     echo Hello $argv
+  end
+>_ say_hello
+<outp>Hello</outp>
+>_ say_hello everybody!
+<outp>Hello everybody!</outp>
 \endfish
 
 Unlike other shells, `fish` does not have aliases or special prompt syntax. Functions take their place.
@@ -432,14 +435,14 @@ Unlike other shells, `fish` does not have aliases or special prompt syntax. Func
 You can list the names of all functions with the `functions` keyword (note the plural!). `fish` starts out with a number of functions:
 
 \fish{cli-dark}
-> <b>functions</b>
-alias, cd, delete-or-exit, dirh, dirs, down-or-search, eval, export, fish_command_not_found_setup, fish_config, fish_default_key_bindings, fish_prompt, fish_right_prompt, fish_sigtrap_handler, fish_update_completions, funced, funcsave, grep, help, history, isatty, ls, man, math, nextd, nextd-or-forward-word, open, popd, prevd, prevd-or-backward-word, prompt_pwd, psub, pushd, seq, setenv, sgrep, trap, type, umask, up-or-search, vared
+>_ functions
+<outp>alias, cd, delete-or-exit, dirh, dirs, down-or-search, eval, export, fish_command_not_found_setup, fish_config, fish_default_key_bindings, fish_prompt, fish_right_prompt, fish_sigtrap_handler, fish_update_completions, funced, funcsave, grep, help, history, isatty, ls, man, math, nextd, nextd-or-forward-word, open, popd, prevd, prevd-or-backward-word, prompt_pwd, psub, pushd, seq, setenv, sgrep, trap, type, umask, up-or-search, vared</outp>
 \endfish
 
 You can see the source for any function by passing its name to `functions`:
 
 \fish{cli-dark}
-> <b>functions</b> <i>ls</i>
+>_ functions ls
 function ls --description 'List contents of directory'
     command ls -G $argv
 end
@@ -451,29 +454,29 @@ end
 While loops:
 
 \fish{cli-dark}
-> <b>while</b> <i>true</i>
-    <b>echo</b> <i class="quote">"Loop forever"</i>
-<b>end</b>
-Loop forever
-Loop forever
-Loop forever
-...
+>_ while true
+    echo <i class="quote">"Loop forever"</i>
+end
+<outp>Loop forever</outp>
+<outp>Loop forever</outp>
+<outp>Loop forever</outp>
+<outp>...</outp>
 \endfish
 
 For loops can be used to iterate over a list. For example, a list of files:
 
 \fish{cli-dark}
-> <b>for</b> <i>file in *.txt</i>
-    <b>cp</b> <i>$file $file.bak</i>
-<b>end</b>
+>_ for file in *.txt
+    cp $file $file.bak
+end
 \endfish
 
 Iterating over a list of numbers can be done with `seq`:
 
 \fish{cli-dark}
-> <b>for</b> <i>x in (</i><b>seq</b> <i>5)</i>
-    <b>touch</b> <i>file_$x.txt</i>
-<b>end</b>
+>_ for x in (seq 5)
+    touch file_$x.txt
+end
 \endfish
 
 
@@ -484,48 +487,49 @@ Unlike other shells, there is no prompt variable like PS1. To display your promp
 You can define your own prompt:
 
 \fish{cli-dark}
-> <b>function</b> <i>fish_prompt</i>
-    echo <i>"New Prompt % "</i>
-<b>end</b>
-New Prompt % <span class="u"> </span>
+>_ function fish_prompt
+    echo "New Prompt % "
+end
+New Prompt % __
 \endfish
 
 Multiple lines are OK. Colors can be set via `set_color`, passing it named ANSI colors, or hex RGB values:
 
 \fish{cli-dark}
-> <b>function</b> <i>fish_prompt</i>
-      <b>set_color</b> <i>purple</i>
-      <b>date</b> <i class="quote">"+%m/%d/%y"</i>
-      <b>set_color</b> <i>FF0</i>
-      <b>echo</b> <i>(</i><b>pwd</b><i>)</i> <i class="quote">'>'</i>
-      <b>set_color</b> <i>normal</i>
-  <b>end</b>
+>_ function fish_prompt
+      set_color purple
+      date "+%m/%d/%y"
+      set_color FF0
+      echo (pwd) '>'
+      set_color normal
+  end
 <span style="color: purple">02/06/13</span>
-<span style="color: #FF0">/home/tutorial ></span><span class="u"> </span>
+<span style="color: #FF0">/home/tutorial ></span>__
 \endfish
 
 You can choose among some sample prompts by running `fish_config prompt`. `fish` also supports RPROMPT through `fish_right_prompt`.
 
-\subsection tut-path $PATH
+\section tut-path $PATH
 
 `$PATH` is an environment variable containing the directories in which `fish` searches for commands. Instead of separating entries with a colon, $PATH is a list. You can modify $PATH in a few ways:
 
 -# By modifying the `$fish_user_paths` variable, which is automatically appended to `$PATH`. For example, to permanently add `/usr/local/bin` to your `$PATH`, you could write:
 
 \fish{cli-dark}
-> <b>set</b> <i>-U fish_user_paths $fish_user_paths /usr/local/bin</i>
+>_ set -U fish_user_paths $fish_user_paths /usr/local/bin
 \endfish
 
 -# Directly in config.fish (see below).
 
-<h2 id="tut_startup">Startup (Where's .bashrc?)</h2>
+
+\section tut_startup Startup (Where's .bashrc?)
 
 `fish` starts by executing commands in `~/.config/fish/config.fish`. You can create it if it does not exist.
 
 It is possible to directly create functions and variables in `config.fish` file, using the commands shown above. For example:
 
 \fish{cli-dark}
-> <b>cat</b> <i>~/.config/fish/config.fish</i>
+>_ cat ~/.config/fish/config.fish
 
 set -x PATH $PATH /sbin/
 
@@ -534,16 +538,16 @@ function ll
 end
 \endfish
 
-However, it is more common and efficient to use  <i>autoloading functions</i> and <i>universal variables</i>.
+However, it is more common and efficient to use  autoloading functions and universal variables.
 
-\subsection tut-autoload Autoloading Functions
+\section tut-autoload Autoloading Functions
 
-When `fish` encounters a command, it attempts to <i>autoload</i> a function for that command, by looking for a file with the name of that command in `~/.config/fish/functions/`.
+When `fish` encounters a command, it attempts to autoload a function for that command, by looking for a file with the name of that command in `~/.config/fish/functions/`.
 
 For example, if you wanted to have a function `ll`, you would add a text file `ll.fish` to `~/.config/fish/functions`:
 
 \fish{cli-dark}
-> <b>cat</b> <i>~/.config/fish/functions/ll.fish</i>
+>_ cat ~/.config/fish/functions/ll.fish
 function ll
     ls -lh $argv
 end
@@ -552,30 +556,30 @@ end
 This is the preferred way to define your prompt as well:
 
 \fish{cli-dark}
-> <b>cat</b> <i>~/.config/fish/functions/fish_prompt.fish</i>
+>_ cat ~/.config/fish/functions/fish_prompt.fish
 function fish_prompt
-    echo (pwd) '> '
+    echo (pwd) "> "
 end
 \endfish
 
 See the documentation for <a href="commands.html#funced">funced</a> and <a href="commands.html#funcsave">funcsave</a> for ways to create these files automatically.
 
-\subsection tut-universal Universal Variables
+\section tut-universal Universal Variables
 
 A universal variable is a variable whose value is shared across all instances of `fish`, now and in the future - even after a reboot. You can make a variable universal with `set -U`:
 
 \fish{cli-dark}
-> <b>set</b> <i>-U EDITOR vim</i>
+>_ set -U EDITOR vim
 \endfish
 
 Now in another shell:
 
 \fish{cli-dark}
-> <b>echo</b> <i>$EDITOR</i>
+>_ echo $EDITOR
 vim
 \endfish
 
-\subsection tut-more  Ready for more?
+\section tut-more  Ready for more?
 
 If you want to learn more about fish, there is <a href="index.html">lots of detailed documentation</a>, an <a href="https://lists.sourceforge.net/lists/listinfo/fish-users">official mailing list</a>, the IRC channel \#fish on `irc.oftc.net`, and the <a href="http://github.com/fish-shell/fish-shell/">github page</a>.
 
diff --git a/doc_src/type.txt b/doc_src/type.txt
index c72520a1..c3265f38 100644
--- a/doc_src/type.txt
+++ b/doc_src/type.txt
@@ -23,5 +23,7 @@ The following options are available:
 and 1 if it could not be found.
 
 \subsection type-example Example
-
-`type fg` outputs the string '`fg is a shell builtin`'.
+\fish
+type fg
+# Outputs the string 'fg is a shell builtin'.
+\endfish
diff --git a/doc_src/user_doc.css b/doc_src/user_doc.css
index d91f5dde..c64a8665 100644
--- a/doc_src/user_doc.css
+++ b/doc_src/user_doc.css
@@ -135,7 +135,6 @@ h3 {
 }
 .key em {
     margin-right: 2px;
-    font-style: normal;
 }
 .key em, .key b {
     padding: 0 4px;
@@ -148,7 +147,7 @@ h3 {
 tt, code, pre, .fish {
     font-family: "DejaVu Sans Mono", Menlo, Monaco, "Source Code Pro", "Ubuntu Mono", "Consolas", "Lucida Console", monospace, fixed;
     font-weight: 500;
-    text-shadow: 0 0 0 rgba(0,0,0,1); /* Stronger anti-aliasing */
+    text-shadow: 0 0 0 rgba(0,0,0,0.2);
 }
 tt {
     color: red; /*REMOVE THIS*/
diff --git a/doc_src/while.txt b/doc_src/while.txt
index 80ec959b..3de3f54a 100644
--- a/doc_src/while.txt
+++ b/doc_src/while.txt
@@ -18,6 +18,7 @@ complex control can be achieved with `while true` containing a
 
 \subsection while-example Example
 
-`while test -f foo.txt; echo file exists; sleep 10; end`
-outputs 'file exists' at 10 second intervals as long as
-the file foo.txt exists.
+\fish
+while test -f foo.txt; echo file exists; sleep 10; end
+# outputs 'file exists' at 10 second intervals as long as the file foo.txt exists.
+\endfish
\ No newline at end of file
diff --git a/lexicon_filter.in b/lexicon_filter.in
new file mode 100644
index 00000000..7e49651e
--- /dev/null
+++ b/lexicon_filter.in
@@ -0,0 +1,475 @@
+#! @sed@ -f
+#.
+# A Doxygen filter for building Fish's lexicon, for documentation bling.
+#.
+# Written specially for Fish, the shell for the 90's, in sed, the state of the
+# art text processor from the 70's. Who's sed? sed's dead, baby, sed's dead.*
+# by Mark Griffiths <mark@thebespokepixel.com>             *but quite portable
+#.
+# Finds /fish../endfish blocks in documentation source files and enhances
+# markup. Requires that the four character word 'classes' declared here are
+# added to Doxyfiles as aliases i.e.:
+#.
+# Enhance for HTML Help pages (Doxyfile.user)…
+# ALIASES   = "fish=\htmlonly[block] \n<pre class=\"fish\">"
+# ALIASES  += "fish{1}=\htmlonly[block] \n<pre class=\"fish \1\">"
+# ALIASES  += "endfish=</pre>\endhtmlonly \n"
+#.
+# ALIASES  += "blah{1}=<span class=\"comment\">\1</span>"
+# ALIASES  += "cmnd{1}=<span class=\"command\">\1</span>" and so on...
+#.
+# And simplify for man pages (Doxyfile.help)…
+# ALIASES   = "fish=<pre>"
+# ALIASES  += "fish{1}=<pre>"
+# ALIASES  += "endfish=</pre>"
+#.
+# ALIASES  += "blah{1}=\1"
+# ALIASES  += "cmnd{1}=<em>\1</em>"...
+#.
+# It's meant to only ever be run once, during make, as Doxygen's 'INPUT
+# FILTER', though can be run interactively by passing a file in via stdin. It
+# wont respond to arguments.
+#.
+# It's most easily tested by passing test strings into the compiled script:
+#.
+# echo "/fish Line to test" | ./fish_lexicon_filter
+#.
+# The, at times, archiac looking regex is down to ensuring portable sed BREs
+#.
+# Licensed under whatever terms are most compatible with Fish's GPLv2 license,
+# bascially free to use/reuse/redistribute/laugh at/be inspired by. Don't
+# pretend it's your code unless you've spent more late nights on it than me but
+# if it saves you a late night, do what you can to help rebalance karma. If it
+# doesn't work or breaks something, it's your fault for using it: if it seems
+# to work it's more likely a hallucination than anything based in reality.
+#.
+# Pattern flow control for scanning doc.h
+/\\fish/,/\\endfish/ {
+    # Open \fish block, firstly it it's on it's own line
+    /^\\fish$/b
+    /^\\fish{[^}]*}$/b
+    # Then if it's inline. Remove and process immediately...
+    /^\\fish.*$/ {
+        # Catch @ symbol
+        s/@/(at)/
+        s/^\\fish//
+        s/\\endfish//
+        b html
+    }
+    # Output blank lines
+    /^$/b
+    # Inside \fish block. Process...
+    /\\endfish/!{
+        # Catch @ symbol
+        s/@/((d))/
+        # Preprocess HTML and HTML-like formatting
+        /<[^>]*>/ {
+            b html
+        }
+        # Process the rest
+        b process
+    }
+    # End block
+    /\\endfish/b
+}
+#.
+# This is not the pattern we're looking for
+b
+#.
+# Process any HTML tags.
+# Structured to reduce sed's greediness.
+:html
+# Spans
+s|<span style=['"]\([^'"][^'"]*\)">|@span{\1,|
+s|<span class=['"]\([^'"][^'"]*\)">|@spcl{\1,|
+s|</span>|}|
+#.
+# Bold
+s|<b>|@bold{|
+s|<b [^>]*>|@bold{|
+s|</b>|}|
+#.
+# Strong (synonimous with emphasis)
+s|<strong>|@bold{|
+s|<strong [^>]*>|@bold{|
+s|</strong>|}|
+#.
+# EMPHasis
+s|<em>|@emph{|
+s|<em [^>]*>|@emph{|
+s|</em>|}|
+#.
+# Italic (synonimous with emphasis)
+s|<i>|@emph{|
+s|<i [^>]*>|@emph{|
+s|</i>|}|
+#.
+# UNDeRline
+s|<u>|@undr{|
+s|<u [^>]*>|@undr{|
+s|</u>|}|
+t html
+#.
+# Some handy non-standard extensions
+# autoSuGgeSTion
+s|<s>|@sgst{|
+s|<s [^>]*>|@sgst{|
+s|</s>|}|
+#.
+# MaTCH
+s|<m>|@mtch{|
+s|<m [^>]*>|@mtch{|
+s|</m>|}|
+#.
+# SearchMaTCh
+s|<sm>|@smtc{|
+s|<sm [^>]*>|@smtc{|
+s|</sm>|}|
+#.
+# ERrOR
+s|<error>|@eror{|
+s|<error [^>]*>|@eror{|
+s|</error>|}|
+#.
+# AsIs - protect from auto-formatting
+s|<asis>|@asis{|
+s|</asis>|}|
+#.
+# OUTPut - protect from auto-formatting
+s|<outp>|@outp{|
+s|</outp>|}|
+t html
+#.
+# Clean other unhandled html
+s|<\([A-Za-z][A-Za-z]*\)[^>]*>\([^<]*\)</\1>|\2|
+t html
+#.
+# Start processing entities
+:process
+# Output:
+# Line marked as output pass through
+/@outp/ {
+    b
+}
+# Comments:
+# Capture full line comments
+/^\( *\)#\(.*\)$/ {
+    # Assume any line starting with a # is complete
+    s//\1@blah{\2}/
+    t
+}
+# Match sub-line comments
+/#[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]/ ! {
+    s/#\(.*$\)/\\\
+<@blah{#\1}\
+/
+}
+#.
+# Protected entities These shouldn't allow nested structure, so we move them
+# to a marked, new line for a future extract/process/insert action.
+#.
+# AsIs block - resists formatting.
+s/@asis{\(.*\)}/\\\
+<@asis{\1}\
+/g
+#.
+# Manual <span>
+s/@span{\(.*\)}/\\\
+<@span{\1}\
+/g
+#.
+# String Literals
+s/"\([^"]*\)"/\\\
+<@dblq{\1}\
+/g
+s/'\([^']*\)'/\\\
+<@sglq{\1}\
+/g
+#.
+# AutoSuggestions.
+s/@sgst{\([^}]*\)}/\\\
+<@sgst{\1}\
+/
+#.
+# Command/Function options
+# Short options
+s/-\([A-Za-z]\)\([^A-Za-z}]\)/\\\
+<@opts{-\1}\
+\2/g
+#.
+# Long options
+s/--\([A-Za-z][A-Za-z0-9=_-]*\)\([^A-Za-z0-9=_-]*\)/\\\
+<@opts{--\1}\
+\2/g
+#.
+# Prompt
+s/~>_/\\\
+<@prmt{~}\
+/
+s/^>_/@prmt/
+#.
+# Cursor
+#.
+s/__$/@curs/
+s/__\(.\)/\\\
+<@curs{\1}\
+/
+#.
+# Paths
+/\n<@dblq[^}]*[~/]/b protect
+/\n<@sglq[^}]*[~/]/b protect
+/\n<@span[^}]*[~/]/b protect
+#.
+# Normal Directory
+s|mkdir |mkdir :|
+s|\([~/:][/]*[.A-Za-z_0-9/-]*\)\\ |\1=|g
+s|\([~/][/]*[.A-Za-z_0-9/=-]*\)|\\\
+<@path{\1}\
+|g
+t protect
+s| \(:[/]*[.A-Za-z_0-9/=-]*\)|\\\
+<@path{\1}\
+|g
+t protect
+#.
+# Dot Relative Directory (no spaces in path)
+s| *\(./[A-Za-z_0-9/-]*\)| \\\
+<@path{\1}\
+|g
+b protect
+#.
+# Tidy up. Merge back 'pure' entities from hold space.
+:tidy
+#.
+# Uncomment the following 2 lines (ss) to log the pattern buffer.
+s/^.*$/PATT: &/w lexicon.log
+s/^PATT: //
+#.
+# Uncomment the following 4 lines (xssx) to log the hold buffer.
+x
+s/^.*$/HOLD: &/w lexicon.log
+s/^HOLD: //
+x
+#.
+# Tack the hold space to the end of the pattern buffer.
+G
+#.
+# Uncomment the folowing two lines (ss) to log the buffer join.
+s/^.*$/JOIN: &/w debug-lexicon.log
+s/^JOIN: //
+#.
+# Iterate over alternate lines, matching '<' to '\'
+:join
+s,\([^\\ ]*\)\\\n\([^<]*\)<\(@[^}]*[}\\]\),\1\3\2,
+t join
+# Clean up stray new lines
+s/\n//g
+#.
+# Uncomment the folowing two lines (ss) to log the buffer join.
+s/^.*$/PCLN: &/w lexicon.log
+s/^PCLN: //
+# Clean up special cases
+#.
+/@blah/{
+    s/\(blah{[^@]*\)@sglq{\([^}]*\)}/\1'\2'/
+    s/\(blah{[^@]*\)@dblq{\([^}]*\)}/\1"\2"/
+    s/\(blah{[^@]*\)@....{\([^}]*\)}/\1\2/
+}
+/@redr/{
+    :cleanredr
+    s/\(redr{[^@}]*\)@cmnd{\([^}]*\)}/\1\2/
+    s/\(redr{[^@}]*\)@func{\([^}]*\)}/\1\2/
+    s/\(redr{[^@}]*\)@sbin{\([^}]*\)}/\1\2/
+    s/\(redr{[^@}]*\)@fsfo{\([^}]*\)}/\1\2/
+    s/\(redr{[^}]*\)}\( *\)@path{\([^}]*\)/\1\2\3/
+    t cleanredr
+}
+/@sgst/ {
+    :cleansgst
+    s/\(sgst{@curs{.}[^@]*\)@cmnd{\([^}]*\)}/\1\2/
+    s/\(sgst{@curs{.}[^@]*\)@sbin{\([^}]*\)}/\1\2/
+    s/\(sgst{@curs{.}[^@]*\)@path{\([^}]*\)}/\1\2/
+    t cleansgst
+}
+/@fsfo/{
+    :cleanfsfo
+    s/\(fsfo{[^@}]*\)@cmnd{\([^}]*\)}/\1\2/
+    s/\(fsfo{[^@}]*\)@func{\([^}]*\)}/\1\2/
+    s/\(fsfo{[^@}]*\)@sbin{\([^}]*\)}/\1\2/
+    t cleanfsfo
+}
+#.
+# Restore Paths
+/@fsfo/ {
+    s/\(@fsfo{[^=]*\)=/\1 /
+}
+/@path/ {
+    :cleanpath
+    s/\(@path{[^:]*\):/\1/
+    s/\(@path{[^=]*\)=/\1\\ /
+    t cleanpath
+    s/@path{}//
+}
+#.
+# Finally, restructure to follow Fish's command [arguments] semantics.
+# Find the initial command, and change any others to arguments, up to a |, ( or ;
+# Assumes that a valid line will start with either a builtin, a function or a binary.
+#.
+# 'if' and 'for' seem to be special cases
+#.
+# Uncomment the folowing two lines (ss) to log the buffer join.
+s/^.*$/PREQ: &/w lexicon.log
+s/^PREQ: //
+#.
+# Find initial commands/functions/binaries
+#.
+# Store prmt, if present
+#.
+/@prmt/ {
+h
+s/^\(@prmt *\).*$/\1/
+x
+s/^@prmt *//
+}
+#.
+s/^\( *\)@sbin/\1@xbin/
+s/\( *[;()] *\)@sbin/\1@xbin/
+s/\( *@redr{|} *\)@sbin/\1@xbin/
+s/^\( *\)@cmnd/\1@xcmd/
+s/\( *[;()] *\)@cmnd/\1@xcmd/
+s/\( *@redr{|} *\)@cmnd/\1@xcmd/
+s/^\( *\)@func/\1@xfnc/
+s/\( *[;()] *\)@func/\1@xfnc/
+s/\( *@redr{|} *\)@func/\1@xfnc/
+
+s/@cmnd/@args/g
+s/@func/@args/g
+s/@sbin/@args/g
+
+s/^.*$/PSTQ: &/w lexicon.log
+s/^PSTQ: //
+#.
+s/xcmd/cmnd/g
+s/xfnc/func/g
+s/xbin/sbin/g
+x
+/^@prmt/ {
+G
+s/^@prmt \n/@prmt /
+}
+/^@prmt/ ! {
+x
+}
+#.
+# Mark up sesitive character entities.
+#.
+:entities
+s/</\&lt;/g
+s/>/\&gt;/g
+s/((d))/@/g
+#.
+# Uncomment the folowing two lines (ss) to log the final output, sent to Doxygen.
+s/^.*$/OUT : &/w lexicon.log
+s/^OUT : //
+#.
+# Lines are reassembled, so branch to end
+b
+# === Main End ===
+#.
+#.
+# === Subroutines ===
+# Branched to when content requires.
+#.
+# Move protected content to hold space and mark up other entities.
+:protect
+h
+# Clear out any content that has already been marked up, to prevent futher
+# markup on words that should be left alone.
+#.
+:patternflush
+s/\n<@[^}]*[}\\]//
+s/\\ [^\\]*$/\\/
+t patternflush
+s/\n$//g
+#.
+# Swap the pattern and hold buffers and remove unmarked lines and extra
+# characters. Basically the inverse of the 'patternflush' action, with
+# additional trailing characters stripped.
+x
+/^\<@[^}]*$/ ! {
+s/[^\<]*//
+s/^ *\\\n//
+s/[()] \\//
+s/\n *\\//
+s/^[^\<][^@][^\\]*//
+s/\n[]|;) ][^\\]*\\//
+s/\n[]|;) a-zA-z0-9-][^\\]*$//
+s/\n[]|;)}]\\//
+s/\n[]|;)}]\n//
+s/\n[]|;)}]$//
+s/[()]$//
+s/}@curs/}/
+s/\n@curs$//
+s/\n[^\<@][^\\]*\\//
+s/\n[^\<@][^\\]*//
+s/^\\//
+s/\n$//g
+}
+#.
+# Swap the buffers back.
+x
+#.
+# A special case. Tidy up after commands.
+# Redirectors
+s/\([^{|] *\)|/\1@redr{|}/g
+s/\([^{&] *\)&[^a-z]/\1@redr{\&amp;}/g
+s/\([^{<>^] *\)\([0-9]* *[<>^][<>^]*[^@][a-zA-Z0-9._-]*\)/\1@redr{\2}/g
+s/\\}/}\\/g
+#.
+# Now we can add in 'unsafe' entities that would be too greedy.
+# Declared Variables
+s/\([$%][$%]*\)\([A-Za-z_0-9][A-Za-z_0-9]*\)/@vars{@optr{\1}\2}/g
+#.
+# Files
+s/\([^@]\)\([A-Za-z0-9_-][A-Za-z0-9_-]*\.[a-z0-9*][a-z0-9*]*\)/\1@fsfo{\2}/g
+#.
+# Fold Files into Paths
+s/\(@path{[^}]*\)}@fsfo/\1}@fsfo/
+#.
+:commands
+#.
+#### This section is built in the Makefile. Just some formatting examples. #####
+#.
+#   fish commands (cmnd) <- 4 character code that has a Doxygen alias counterpart
+#   template : s/[[:<:]]function[[:>:]]/@cmnd{&}/
+#.
+#   s,[[:<:]]function[[:>:]],@cmnd{function},g
+#   s,[[:<:]]begin[[:>:]],@cmnd{begin},g
+#   ...
+#.
+#   fish functions (func)
+#   Populated by 'public' functions' filename.
+#.
+#   s,[[:<:]]fish_pwd[[:>:]],@func{fish_pwd},g
+#   s,[[:<:]]fish_prompt[[:>:]],@func{fish_prompt},g
+#   ...
+#.
+#   Shell Binary (sbin)
+#   Populated from completion filenames
+#.
+#   s,[[:<:]]seq[[:>:]],@sbin{seq},g
+#   s,[[:<:]]rm[[:>:]],@sbin{rm},g
+#   ...
+#.
+#   Color Variable (clrv)
+#   Populated from __fish_config_interactive.fish
+#   Allows fish's 'special' color variables to be identified
+#.
+#   s,[[:<:]]fish_color_normal[[:>:]],@clrv{fish_color_normal},g
+#   s,[[:<:]]fish_color_command[[:>:]],@clrv{fish_color_command},g
+#.
+# Once all of the commands/functions/variables/special's have been marked up,
+# branch back to tidy up and collapse the pattern/hold buffers back to a
+# single line.
+#.
+# b tidy
-- 
cgit v1.2.3


From 98ebb21489b3206ed745aadb821b400a9f3fa5c6 Mon Sep 17 00:00:00 2001
From: Mark Griffiths <mark@thebespokepixel.com>
Date: Tue, 26 Aug 2014 19:19:24 +0100
Subject: Consistency fixes

---
 Doxyfile              |  20 +++---
 Doxyfile.help         |  12 ++--
 Doxyfile.user         |   4 +-
 Makefile.in           |  11 +--
 doc_src/bind.txt      |  10 ++-
 doc_src/complete.txt  |  16 +++--
 doc_src/count.txt     |   2 -
 doc_src/faq.hdr       |  18 +----
 doc_src/functions.txt |   4 +-
 doc_src/index.hdr.in  |  58 ++-------------
 doc_src/nextd.txt     |   2 +-
 doc_src/psub.txt      |   2 +-
 doc_src/set.txt       |   6 +-
 doc_src/tutorial.hdr  |  36 ++--------
 doc_src/user_doc.css  |   6 +-
 lexicon_filter.in     | 190 ++++++++++++++++++++++++++++++++++++++++----------
 16 files changed, 226 insertions(+), 171 deletions(-)

(limited to 'Makefile.in')

diff --git a/Doxyfile b/Doxyfile
index 38cbd687..3eecb862 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -216,7 +216,7 @@ SEPARATE_MEMBER_PAGES  = NO
 # uses this value to replace tabs by spaces in code fragments.
 # Minimum value: 1, maximum value: 16, default value: 4.
 
-TAB_SIZE               = 8
+TAB_SIZE               = 4
 
 # This tag can be used to specify a number of aliases that act as commands in
 # the documentation. An alias has the form:
@@ -228,14 +228,16 @@ TAB_SIZE               = 8
 # "Side Effects:". You can put \n's in the value part of an alias to insert
 # newlines.
 
+# Simplify Fish output from Doxygen for developer doc pages. (see lexicon_filter.in)
+
 ALIASES  = "key{1}=<b>\1</b>"
-ALIASES += "key{2}=<b>\1</b>-<b>\2</b>"
-ALIASES += "key{3}=<b>\1</b>-<b>\3</b>"
+ALIASES += "key{2}=<b>\1-\2</b>"
+ALIASES += "key{3}=<b>\1-\3</b>"
 ALIASES += "cursor_key{2}=<b>\2</b>"
 
-ALIASES += "fish=\htmlonly[block] \n<pre>"
-ALIASES += "fish{1}=\htmlonly[block] \n<pre>"
-ALIASES += "endfish=</pre>\endhtmlonly \n"
+ALIASES += "fish=<pre>"
+ALIASES += "fish{1}=<pre>"
+ALIASES += "endfish=</pre>\n"
 
 ALIASES += "asis{1}=\1"
 ALIASES += "outp{1}=\1"
@@ -271,6 +273,8 @@ ALIASES += "undr{1}=\1"
 ALIASES += "span{2}=\2"
 ALIASES += "spcl{2}=\2"
 
+ALIASES += "bksl{1}=\\\1"
+
 # 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"
 # will allow you to use the command class in the itcl::class meaning.
@@ -1677,7 +1681,7 @@ PAPER_TYPE             = a4wide
 # If left blank no extra packages will be included.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-EXTRA_PACKAGES         =
+EXTRA_PACKAGES         = bookmark
 
 # The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
 # generated LaTeX document. The header should contain everything until the first
@@ -1736,7 +1740,7 @@ USE_PDFLATEX           = YES
 # The default value is: NO.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_BATCHMODE        = NO
+LATEX_BATCHMODE        = YES
 
 # If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
 # index chapters (such as File Index, Compound Index, etc.) in the output.
diff --git a/Doxyfile.help b/Doxyfile.help
index 7b905572..018c9281 100644
--- a/Doxyfile.help
+++ b/Doxyfile.help
@@ -228,12 +228,12 @@ TAB_SIZE               = 4
 # "Side Effects:". You can put \n's in the value part of an alias to insert
 # newlines.
 
-# Simplify Fish output from Doxygen for man pages. (see fish_lexicon_filter)
+# Simplify Fish output from Doxygen for man pages. (see lexicon_filter.in)
 
-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  = "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>"
@@ -273,6 +273,8 @@ ALIASES += "undr{1}=<em>\1</em>"
 ALIASES += "span{2}=\2"
 ALIASES += "spcl{2}=\2"
 
+ALIASES += "bksl{1}=\\\1"
+
 # 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"
 # will allow you to use the command class in the itcl::class meaning.
diff --git a/Doxyfile.user b/Doxyfile.user
index b1319a78..6d9c2fcc 100644
--- a/Doxyfile.user
+++ b/Doxyfile.user
@@ -228,7 +228,7 @@ TAB_SIZE               = 4
 # "Side Effects:". You can put \n's in the value part of an alias to insert
 # newlines.
 
-# Enhance Fish docs output from Doxygen. (See fish_lexicon_filter.in)
+# Enhance Fish docs output from Doxygen. (See 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>"
@@ -273,6 +273,8 @@ ALIASES += "undr{1}=<span class=\"underline\">\1</span>"
 ALIASES += "span{2}=<span style=\"\1\">\2</span>"
 ALIASES += "spcl{2}=<span class=\"\1\">\2</span>"
 
+ALIASES += "bksl{1}=<span>\</span>\1"
+
 # 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"
 # will allow you to use the command class in the itcl::class meaning.
diff --git a/Makefile.in b/Makefile.in
index afcba3c9..cdb6fbc5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -285,10 +285,10 @@ doc: *.h *.cpp doc.h Doxyfile lexicon_filter
 #
 
 doc/refman.pdf: doc
-	cd doc/latex;
-	make;
-	mv refman.pdf ..;
-	cd ../..;
+	cd doc/latex; \
+	make; \
+	mv refman.pdf ..; \
+	cd ../..; \
 	rm -r doc/latex;
 
 
@@ -368,7 +368,8 @@ lexicon.txt: doc_src/commands.hdr $(FUNCTIONS_DIR_FILES) $(COMPLETIONS_DIR_FILES
 		-e "s|'\(.*\)'|func \1|p"; \
 	sed <share/functions/__fish_config_interactive.fish >>lexicon.tmp -n \
 		-e '/set_default/s/.*\(fish_[a-z][a-z_]*\).*$$/clrv \1/p'; \
-	echo "sbin whoami\nsbin mkdir\nsbin basename" >> lexicon.tmp; \
+	sed <lexicon_filter.in >>lexicon.tmp -n \
+		-e '/^#!#/s/^#!# \(.... [a-z][a-z_]*\)/\1/p'; \
 	mv lexicon.tmp lexicon.txt; rm -f lexicon_catalog.tmp lexicon_catalog.txt;
 
 #
diff --git a/doc_src/bind.txt b/doc_src/bind.txt
index 59a8dec5..ff262ec6 100644
--- a/doc_src/bind.txt
+++ b/doc_src/bind.txt
@@ -89,7 +89,13 @@ The following special input functions are available:
 
 \subsection bind-example Examples
 
-`bind \cd 'exit'` causes `fish` to exit when @key{Control,D} is pressed.
+\fish
+bind \cd 'exit'
+\endfish
+Causes `fish` to exit when @key{Control,D} is pressed.
 
-`bind -k ppage history-search-backward` performs a history search when the @key{Page Up} key is pressed.
+\fish
+bind -k ppage history-search-backward
+\endfish
+Performs a history search when the @key{Page Up} key is pressed.
 
diff --git a/doc_src/complete.txt b/doc_src/complete.txt
index cb4e6bde..c1422825 100644
--- a/doc_src/complete.txt
+++ b/doc_src/complete.txt
@@ -50,21 +50,29 @@ When erasing completions, it is possible to either erase all completions for a s
 
 The short style option `-o` for the `gcc` command requires that a file follows it.  This can be done using writing:
 
-`complete -c gcc -s o -r`
+\fish
+complete -c gcc -s o -r
+\endfish
 
 The short style option `-d` for the `grep` command requires that one of the strings '`read`', '`skip`' or '`recurse`' is used.  This can be specified writing:
 
-`complete -c grep -s d -x -a "read skip recurse"`
+\fish
+complete -c grep -s d -x -a "read skip recurse"
+\endfish
 
 The `su` command takes any username as an argument. Usernames are given as the first colon-separated field in the file /etc/passwd. This can be specified as:
 
-`complete -x -c su -d "Username" -a "(cat /etc/passwd | cut -d : -f 1)"`
+\fish
+complete -x -c su -d "Username" -a "(cat /etc/passwd | cut -d : -f 1)"
+\endfish
 
 The `rpm` command has several different modes. If the `-e` or `--erase` flag has been specified, `rpm` should delete one or more packages, in which case several switches related to deleting packages are valid, like the `nodeps` switch.
 
 This can be written as:
 
-`complete -c rpm -n "__fish_contains_opt -s e erase" -l nodeps -d "Don't check dependencies"`
+\fish
+complete -c rpm -n "__fish_contains_opt -s e erase" -l nodeps -d "Don't check dependencies"
+\endfish
 
 where `__fish_contains_opt` is a function that checks the commandline buffer for the presence of a specified set of options.
 
diff --git a/doc_src/count.txt b/doc_src/count.txt
index 4587209f..9f904311 100644
--- a/doc_src/count.txt
+++ b/doc_src/count.txt
@@ -18,10 +18,8 @@ count $VARIABLE
 
 \fish
 count $PATH
-
 # Returns the number of directories in the users PATH variable.
 
 count *.txt
-
 # Returns the number of files in the current working directory ending with the suffix '.txt'.
 \endfish
\ No newline at end of file
diff --git a/doc_src/faq.hdr b/doc_src/faq.hdr
index 99c2ada4..fd3ed976 100644
--- a/doc_src/faq.hdr
+++ b/doc_src/faq.hdr
@@ -7,37 +7,21 @@
 \endhtmlonly
 
 - <a href='#faq-envvar'>How do I set or clear an environment variable?</a>
-
 - <a href='#faq-login-cmd'>How do I run a command every login? What's fish's equivalent to `.bashrc`?</a>
-
 - <a href='#faq-prompt'>How do I set my prompt?</a>
-
 - <a href='#faq-cmd-history'>How do I run a command from history?</a>
-
 - <a href='#faq-subcommand'>How do I run a subcommand? The backtick doesn't work!</a>
-
 - <a href='#faq-exit-status'>How do I get the exit status of a command?</a>
-
 - <a href='#faq-single-env'>How do I set an environment variable for just one command?</a>
-
 - <a href='#faq-customize-colors'>How do I customize my syntax highlighting colors?</a>
-
 - <a href='#faq-update-manpage-completions'>How do I update man page completions?</a>
-
 - <a href='#faq-cwd-symlink'>Why does cd, pwd and other fish commands always resolve symlinked directories to their canonical path?</a>
-
 - <a href='#faq-cd-implicit'>I accidentally entered a directory path and fish changed directory. What happened?</a>
-
 - <a href='#faq-open'>The open command doesn't work.</a>
-
 - <a href='#faq-default'>How do I make fish my default shell?</a>
-
 - <a href='#faq-titlebar'>I'm seeing weird output before each prompt when using screen. What's wrong?</a>
-
 - <a href='#faq-greeting'>How do I change the greeting message?</a>
-
 - <a href='#faq-history'>Why doesn't history substitution ("!$" etc.) work?</a>
-
 - <a href='#faq-uninstalling'>How do I uninstall fish?</a>
 
 \htmlonly[block]
@@ -81,7 +65,7 @@ You can also use the Web configuration tool, <a href="commands.html#fish_config"
 
 \section faq-cmd-history How do I run a command from history?
 
-Type some part of the command, and then hit the up or down arrow keys to navigate through history matches.
+Type some part of the command, and then hit the @cursor_key{&uarr;,up} or @cursor_key{&darr;,down} arrow keys to navigate through history matches.
 
 
 \section faq-subcommand How do I run a subcommand? The backtick doesn't work!
diff --git a/doc_src/functions.txt b/doc_src/functions.txt
index 6e7f92d5..0750cd1b 100644
--- a/doc_src/functions.txt
+++ b/doc_src/functions.txt
@@ -2,10 +2,10 @@
 
 \subsection functions-synopsis Synopsis
 \fish{synopsis}
-functions [-a | --all] [-n | --names]
+functions [ -a | --all ] [ -n | --names ]
 functions -c OLDNAME NEWNAME
 functions -d DESCRIPTION FUNCTION
-functions [-eq] FUNCTIONS...
+functions [ -e | -q ] FUNCTIONS...
 \endfish
 
 \subsection functions-description Description
diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in
index a24905c3..8d827cd6 100644
--- a/doc_src/index.hdr.in
+++ b/doc_src/index.hdr.in
@@ -42,17 +42,11 @@ Every program on your computer can be used as a command in `fish`. If the progra
 Here is a list of some useful commands:
 
 - `cd`, change the current directory
-
 - `ls`, list files and directories
-
 - `man`, display a manual page on the screen
-
 - `mv`, move (rename) files
-
 - `cp`, copy files
-
 - `open`, open files with the default application associated with each filetype
-
 - `less`, list the contents of files
 
 Commands and parameters are separated by the space character '&nbsp;'. Every command ends with either a newline (i.e. by pressing the return key) or a semicolon '`;`'. More than one command can be written on the same line by separating them with semicolons.
@@ -86,61 +80,33 @@ would remove the two files 'cumbersome' and 'filename.txt'.
 Some characters can not be written directly on the command line. For these characters, so called escape sequences are provided. These are:
 
 - '<code>\\a</code>' escapes the alert character
-
 - '<code>\\b</code>' escapes the backspace character
-
 - '<code>\\e</code>' escapes the escape character
-
 - '<code>\\f</code>' escapes the form feed character
-
 - '<code>\\n</code>' escapes a newline character
-
 - '<code>\\r</code>' escapes the carriage return character
-
 - '<code>\\t</code>' escapes the tab character
-
 - '<code>\\v</code>' escapes the vertical tab character
-
 - '<code>\\ </code>' escapes the space character
-
 - '<code>\\$</code>' escapes the dollar character
-
 - '<code>\\\\</code>' escapes the backslash character
-
 - '<code>\\*</code>' escapes the star character
-
 - '<code>\\?</code>' escapes the question mark character
-
 - '<code>\\~</code>' escapes the tilde character
-
 - '<code>\\%</code>' escapes the percent character
-
 - '<code>\\#</code>' escapes the hash character
-
 - '<code>\\(</code>' escapes the left parenthesis character
-
 - '<code>\\)</code>' escapes the right parenthesis character
-
 - '<code>\\{</code>' escapes the left curly bracket character
-
 - '<code>\\}</code>' escapes the right curly bracket character
-
 - '<code>\\[</code>' escapes the left bracket character
-
 - '<code>\\]</code>' escapes the right bracket character
-
 - '<code>\\</code>' escapes the less than character
-
 - '<code>\\\></code>' escapes the more than character
-
 - '<code>\\^</code>' escapes the circumflex character
-
 - '<code>\\&amp;</code>' escapes the ampersand character
-
 - '<code>\\;</code>' escapes the semicolon character
-
 - '<code>\\"</code>' escapes the quote character
-
 - '<code>\\'</code>' escapes the apostrophe character
 
 - '<code>\\x<i>xx</i></code>', where <code><i>xx</i></code> is a hexadecimal number, escapes the ascii character with the specified value. For example, `\x9` is the tab character.
@@ -163,9 +129,7 @@ the tab character
 Most programs use three input/output (IO) streams, each represented by a number called a file descriptor (FD). These are:
 
 - Standard input, FD 0, for reading, defaults to reading from the keyboard.
-
 - Standard output, FD 1, for writing, defaults to writing to the screen.
-
 - Standard error, FD 2, for writing errors and warnings, defaults to writing to the screen.
 
 The reason for providing for two output file descriptors is to allow
@@ -432,11 +396,11 @@ When an argument for a program is given on the commandline, it undergoes the pro
 
 If a star (`*`) or a question mark (`?`) is present in the parameter, `fish` attempts to match the given parameter to any files in such a way that:
 
-- '`?`' can match any single character except '/'.
+- `?` can match any single character except '/'.
 
-- '`*`' can match any string of characters not containing '/'. This includes matching an empty string.
+- `*` can match any string of characters not containing '/'. This includes matching an empty string.
 
-- '`**`' matches any string of characters. This includes matching an empty string. The string may include the '/' character but does not need to.
+- `**` matches any string of characters. This includes matching an empty string. The string may include the `/` character but does not need to.
 
 Wildcard matches are sorted case insensitively. When sorting matches containing numbers, consecutive digits are considered to be one element, so that the strings '1' '5' and '12' would be sorted in the order given.
 
@@ -613,13 +577,9 @@ All of the above expansions can be combined. If several expansions result in mor
 When combining multiple parameter expansions, expansions are performed in the following order:
 
 - Command substitutions
-
 - Variable expansions
-
 - Bracket expansion
-
 - Pid expansion
-
 - Wildcard expansion
 
 Expansions are performed from right to left, nested bracket expansions are performed from the inside and out.
@@ -653,6 +613,7 @@ There are three kinds of variables in fish: universal, global and local variable
 Variables can be explicitly set to be universal with the `-U` or `--universal` switch, global with the `-g` or `--global` switch, or local with the `-l` or `--local` switch.  The scoping rules when creating or updating a variable are:
 
 -# If a variable is explicitly set to either universal, global or local, that setting will be honored. If a variable of the same name exists in a different scope, that variable will not be changed.
+
 -# If a variable is not explicitly set to be either universal, global or local, but has been previously defined, the variable scope is not changed.
 
 -# If a variable is not explicitly set to be either universal, global or local and has never before been defined, the variable will be local to the currently executing function. Note that this is different from using the `-l` or `--local` flag. If one of those flags is used, the variable will be local to the most inner currently executing block, while without these the variable will be local to the function. If no function is executing, the variable will be global.
@@ -685,7 +646,7 @@ To see universal variables in action, start two fish sessions side by side, and
 
 When calling a function, all current local variables temporarily disappear. This shadowing of the local scope is needed since the variable namespace would become cluttered, making it very easy to accidentally overwrite variables from another function.
 
-For example, the following code will output '`Avast, mateys`':
+For example:
 
 \fish
 function shiver
@@ -700,6 +661,8 @@ function avast
     echo $phrase
 end
 avast
+
+# Outputs "Avast, mateys"
 \endfish
 
 
@@ -1057,11 +1020,8 @@ end
 Detected errors include:
 
 - Non existing commands.
-
 - Reading from or appending to a non existing file.
-
 - Incorrect use of output redirects
-
 - Mismatched parenthesis
 
 
@@ -1118,13 +1078,9 @@ If a function named `fish_greeting` exists, it will be run when entering interac
 When defining a new function in fish, it is possible to make it into an event handler, i.e. a function that is automatically run when a specific event takes place. Events that can trigger a handler currently are:
 
 - When a signal is delivered
-
 - When a process or job exits
-
 - When the value of a variable is updated
-
 - When the prompt is about to be shown
-
 - When a command lookup fails
 
 Example:
diff --git a/doc_src/nextd.txt b/doc_src/nextd.txt
index 96daf18c..8d7c9035 100644
--- a/doc_src/nextd.txt
+++ b/doc_src/nextd.txt
@@ -2,7 +2,7 @@
 
 \subsection nextd-synopsis Synopsis
 \fish{synopsis}
-nextd [-l | --list] [POS]
+nextd [ -l | --list ] [POS]
 \endfish
 
 \subsection nextd-description Description
diff --git a/doc_src/psub.txt b/doc_src/psub.txt
index 12f1b620..e6347d85 100644
--- a/doc_src/psub.txt
+++ b/doc_src/psub.txt
@@ -2,7 +2,7 @@
 
 \subsection psub-synopsis Synopsis
 \fish{synopsis}
-COMMAND1 (COMMAND2 | psub [-f])
+COMMAND1 ( COMMAND2 | psub [-f] )
 \endfish
 
 \subsection psub-description Description
diff --git a/doc_src/set.txt b/doc_src/set.txt
index 0dae9010..0b3d8417 100644
--- a/doc_src/set.txt
+++ b/doc_src/set.txt
@@ -5,9 +5,9 @@
 set [SCOPE_OPTIONS]
 set [OPTIONS] VARIABLE_NAME VALUES...
 set [OPTIONS] VARIABLE_NAME[INDICES]... VALUES...
-set (-q | --query) [SCOPE_OPTIONS] VARIABLE_NAMES...
-set (-e | --erase) [SCOPE_OPTIONS] VARIABLE_NAME
-set (-e | --erase) [SCOPE_OPTIONS] VARIABLE_NAME[INDICES]...
+set ( -q | --query ) [SCOPE_OPTIONS] VARIABLE_NAMES...
+set ( -e | --erase ) [SCOPE_OPTIONS] VARIABLE_NAME
+set ( -e | --erase ) [SCOPE_OPTIONS] VARIABLE_NAME[INDICES]...
 \endfish
 
 \subsection set-description Description
diff --git a/doc_src/tutorial.hdr b/doc_src/tutorial.hdr
index 94cca97b..aa67cf60 100644
--- a/doc_src/tutorial.hdr
+++ b/doc_src/tutorial.hdr
@@ -5,49 +5,27 @@
 <div class="menu tutorial_menu">
 \endhtmlonly
 - <a href="#tut_why_fish">Why fish?</a>
-
 - <a href="#tut_learning_Fish">Learning fish</a>
-
 - <a href="#tut_running_commands">Running Commands</a>
-
 - <a href="#tut_getting_help">Getting Help</a>
-
 - <a href="#tut_syntax_highlighting">Syntax Highlighting</a>
-
 - <a href="#tut_wildcards">Wildcards</a>
-
 - <a href="#tut_pipes_and_redirections">Pipes and Redirections</a>
-
 - <a href="#tut_autosuggestions">Autosuggestions</a>
-
 - <a href="#tut_tab_completions">Tab Completions</a>
-
 - <a href="#tut_variables">Variables</a>
-
 - <a href="#tut_exit_status">Exit Status</a>
-
 - <a href="#tut_exports">Shell Variables</a>
-
 - <a href="#tut_lists">Lists</a>
-
 - <a href="#tut_command_substitutions">Command Substitutions</a>
-
 - <a href="#tut_combiners">Combiners (And, Or, Not)</a>
-
 - <a href="#tut_conditionals">Conditionals (If, Else, Switch)</a>
-
 - <a href="#tut_functions">Functions</a>
-
 - <a href="#tut_loops">Loops</a>
-
 - <a href="#tut_prompt">Prompt</a>
-
 - <a href="#tut_path">$PATH</a>
-
 - <a href="#tut_startup">Startup</a>
-
 - <a href="#tut_autoload">Autoloading Functions</a>
-
 - <a href="#tut-more">Ready for more?</a>
 
 \htmlonly[block]
@@ -76,7 +54,7 @@ When you start `fish`, you should see this:
 \fish{cli-dark}
 <outp>Welcome to fish, the friendly interactive shell</outp>
 <outp>Type <span class="cwd">help</span> for instructions on how to use fish</outp>
-<asis>you@hostname</asis> ~>___
+<asis>you@hostname</asis> ~>____
 \endfish
 
 `fish` comes with a default prompt that shows your username, hostname, and working directory. You'll see <a href="#tut_prompt">how to change your prompt</a> further down. From now on, we'll pretend your prompt is just a '`>`' to save space.
@@ -131,7 +109,7 @@ A command may be invalid because it does not exist, or refers to a file that you
 `fish` will underline valid file paths as you type them:
 
 \fish{cli-dark}
->_ cat <u>~/somefi</u>__
+>_ cat <u>~/somefi</u>___
 \endfish
 
 This tells you that there exists a file that starts with '`somefi`', which is useful feedback as you type.
@@ -190,19 +168,19 @@ stdin and stdout can be redirected via the familiar &lt; and &gt;. Unlike other
 `fish` suggests commands as you type, and shows the suggestion to the right of the cursor, in gray. For example:
 
 \fish{cli-dark}
->_ <error>/bin/h</error><s>__ostname</s>
+>_ <error>/bin/h</error><s>___ostname</s>
 \endfish
 
 It knows about paths and options:
 
 \fish{cli-dark}
->_ grep --i<s>__gnore-case</s>
+>_ grep --i<s>___gnore-case</s>
 \endfish
 
 And history too. Type a command once, and you can re-summon it by just typing a few letters:
 
 \fish{cli-dark}
->_ <error>r</error><s>__sync -avze ssh . myname@somelonghost.com:/some/long/path/doo/dee/doo/dee/doo</s>
+>_ <error>r</error><s>___sync -avze ssh . myname@somelonghost.com:/some/long/path/doo/dee/doo/dee/doo</s>
 \endfish
 
 To accept the autosuggestion, hit right arrow or @key{Control,F}. To accept a single word of the autosuggestion, @key{Alt,&rarr;} (right arrow). If the autosuggestion is not what you want, just ignore it.
@@ -512,7 +490,7 @@ You can define your own prompt:
 >_ function fish_prompt
     echo "New Prompt % "
 end
-New Prompt % __
+<asis>New Prompt % </asis>___
 \endfish
 
 Multiple lines are OK. Colors can be set via `set_color`, passing it named ANSI colors, or hex RGB values:
@@ -526,7 +504,7 @@ Multiple lines are OK. Colors can be set via `set_color`, passing it named ANSI
       set_color normal
   end
 <span style="color: purple">02/06/13</span>
-<span style="color: #FF0">/home/tutorial ></span>__
+<span style="color: #FF0">/home/tutorial ></span>___
 \endfish
 
 You can choose among some sample prompts by running `fish_config prompt`. `fish` also supports RPROMPT through `fish_right_prompt`.
diff --git a/doc_src/user_doc.css b/doc_src/user_doc.css
index cf76e9ed..a61f2cf2 100644
--- a/doc_src/user_doc.css
+++ b/doc_src/user_doc.css
@@ -138,12 +138,14 @@ h3 {
     margin-right: 2px;
 }
 .key em, .key b {
-    padding: 0 4px;
+    padding: 1px 4px;
     background-color: #fafafa;
-    border: 1px solid #aaa;
+    background: linear-gradient(to bottom, #eee 0%,#fafafa 100%);
+    border: 1px solid #bbb;
     border-radius: 3px;
     font-weight: normal;
     white-space: nowrap;
+    box-shadow: 0 1px 2px #ddd;
 }
 tt, code, pre, .fish {
     font-family: "DejaVu Sans Mono", Menlo, Monaco, "Source Code Pro", "Ubuntu Mono", "Consolas", "Lucida Console", monospace, fixed;
diff --git a/lexicon_filter.in b/lexicon_filter.in
index da1d37e0..33d4bef5 100644
--- a/lexicon_filter.in
+++ b/lexicon_filter.in
@@ -193,25 +193,26 @@ s/@sgst{\([^}]*\)}/\\\
 #.
 # Command/Function options
 # Short options
-s/-\([A-Za-z]\)\([^A-Za-z}]\)/\\\
+s/ -\([A-Za-z][A-Za-z]*\)\([^A-Za-z}]\)/ \\\
 <@opts{-\1}\
 \2/g
 #.
 # Long options
-s/--\([A-Za-z][A-Za-z0-9=_-]*\)\([^A-Za-z0-9=_-]*\)/\\\
+s/ --\([A-Za-z][A-Za-z0-9=_-]*\)\([^A-Za-z0-9=_-]*\)/ \\\
 <@opts{--\1}\
 \2/g
 #.
 # Prompt
 s/~>_/\\\
-<@prmt{~}\
-/
+<@prmt{\
+<@path{~}\
+}/
 s/^>_/@prmt/
 #.
 # Cursor
 #.
-s/__$/@curs/
-s/__\(.\)/\\\
+s/___$/@curs/
+s/___\(.\)/\\\
 <@curs{\1}\
 /
 #.
@@ -223,17 +224,16 @@ s/__\(.\)/\\\
 # Normal Directory
 s|mkdir |mkdir :|
 s|\([~/:][/]*[.A-Za-z_0-9/-]*\)\\ |\1=|g
-s|\([~/:][/]*[.A-Za-z_0-9/=-]*\)|\\\
+s| \([~/][/]*[.A-Za-z_0-9/=-]*\)| \\\
 <@path{\1}\
 |g
-t protect
-s| \(:[/]*[.A-Za-z_0-9/=-]*\)|\\\
+s| \(:[/]*[.A-Za-z_0-9/=-]*\)| \\\
 <@path{\1}\
 |g
 t protect
 #.
 # Dot Relative Directory (no spaces in path)
-s| *\(./[A-Za-z_0-9/-]*\)| \\\
+s| \(./[A-Za-z_0-9/-]*\)| \\\
 <@path{\1}\
 |g
 b protect
@@ -241,14 +241,28 @@ b protect
 # Tidy up. Merge back 'pure' entities from hold space.
 :tidy
 #.
+# Convert loose text to arguments
+s/ \([a-zA-Z0-9+%*.-][{},a-zA-Z0-9%*._/?!=-]*\)/ @args{\1}/g
+#.
+# Or when tight to a newline
+s|\n\([a-zA-Z0-9+%*.-][{},a-zA-Z0-9%*._/?!-]*\)|\
+@args{\1}|g
+#.
+# Or when tight to the beginning
+s|^\([a-zA-Z][{},a-zA-Z0-9%*._/?!-]*\)|@args{\1}|g
+#.
+# Pick up loose text after markup.
+s/\([})]\)\([a-zA-Z0-9+%*.,][,a-zA-Z0-9%*._/?!-]*\);/\1@args{\2};/g
+s/\([})]\)\([a-zA-Z0-9+%*.,][,a-zA-Z0-9%*._/?!-]*\)$/\1@args{\2}/g
+#.
 # Uncomment the following 2 lines (ss) to log the pattern buffer.
-s/^.*$/PATT: &/w lexicon.log
-s/^PATT: //
+s/^.*$/Pattern : &/w lexicon.log
+s/^Pattern : //
 #.
 # Uncomment the following 4 lines (xssx) to log the hold buffer.
 x
-s/^.*$/HOLD: &/w lexicon.log
-s/^HOLD: //
+s/^.*$/HoldBufr: &/w lexicon.log
+s/^HoldBufr: //
 x
 #.
 # Tack the hold space to the end of the pattern buffer.
@@ -265,9 +279,9 @@ t join
 # Clean up stray new lines
 s/\n//g
 #.
-# Uncomment the folowing two lines (ss) to log the buffer join.
-s/^.*$/PCLN: &/w lexicon.log
-s/^PCLN: //
+# Uncomment the folowing two lines (ss) to log the buffer before 'cleaning'.
+s/^.*$/PreClean: &/w lexicon.log
+s/^PreClean: //
 # Clean up special cases
 #.
 /@blah/{
@@ -277,14 +291,22 @@ s/^PCLN: //
 }
 /@dblq/{
     :cleandblq
-    s/\(dblq{[^@<]*\)<*@...[^q]{\([^}]*\)}/\1\2/
+    s/\(dblq{[^@}<]*\)[<]*@...[^q]{\([^}]*\)}/\1\2/
     t cleandblq
 }
 /@sglq/{
     :cleansglq
-    s/\(sglq{[^@<]*\)<*@...[^q]{\([^}]*\)}/\1\2/
+    s/\(sglq{[^@}<]*\)[<]*@...[^q]{\([^}]*\)}/\1\2/
     t cleansglq
 }
+/@vars/{
+    :cleanvars
+    s/\(vars{@optr{$}[^@}]*\)@cmnd{\([^}]*\)}/\1\2/
+    s/\(vars{@optr{$}[^@}]*\)@func{\([^}]*\)}/\1\2/
+    s/\(vars{@optr{$}[^@}]*\)@sbin{\([^}]*\)}/\1\2/
+    s/\(vars{@optr{$}[^@}]*\)@args{\([^}]*\)}/\1\2/
+    t cleanvars
+}
 /@redr/{
     :cleanredr
     s/\(redr{[^@}]*\)@cmnd{\([^}]*\)}/\1\2/
@@ -298,8 +320,11 @@ s/^PCLN: //
     s/@sgst{<@/@sgst{@/
     :cleansgst
     s/\(sgst{@curs{.}[^@]*\)@cmnd{\([^}]*\)}/\1\2/
+    s/\(sgst{@curs{.}[^@]*\)@func{\([^}]*\)}/\1\2/
     s/\(sgst{@curs{.}[^@]*\)@sbin{\([^}]*\)}/\1\2/
+    s/\(sgst{@curs{.}[^@]*\)@opts{\([^}]*\)}/\1\2/
     s/\(sgst{@curs{.}[^@]*\)@path{\([^}]*\)}/\1\2/
+    s/\(sgst{@curs{.}[^@]*\)@args{\([^}]*\)}/\1\2/
     s/\(sgst{@curs{.}[^@]*\)@fsfo{\([^}]*\)}/\1\2/
     t cleansgst
 }
@@ -332,9 +357,9 @@ s/^PCLN: //
 #.
 # 'if' and 'for' seem to be special cases
 #.
-# Uncomment the folowing two lines (ss) to log the buffer join.
-s/^.*$/PREQ: &/w lexicon.log
-s/^PREQ: //
+# Uncomment the folowing two lines (ss) to log the buffer before semantic conversion.
+s/^.*$/PreArgs : &/w lexicon.log
+s/^PreArgs : //
 #.
 # Find initial commands/functions/binaries
 #.
@@ -347,22 +372,88 @@ x
 s/^@prmt *//
 }
 #.
+# Special case for one-line 'if' statements
+/@cmnd{if}/ {
+    s//@xcmd{if}/
+    s/@cmnd{set}/@xcmd{set}/
+    s/@cmnd{not}/@xcmd{not}/
+    s/@cmnd{else}/@xcmd{else}/
+    s/@cmnd{contains}/@xcmd{contains}/
+    s/@cmnd{test}/@xcmd{test}/
+    s/@cmnd{end}/@xcmd{end}/
+    s/@sbin{grep}/@xbin{grep}/
+}
+# one-line 'for' statements
+/@cmnd{for}/ {
+    s//@xcmd{for}/
+    s/@args{in}/@xcmd{in}/
+}
+# one-line 'begin' statements
+/@cmnd{begin}/ {
+    s//@xcmd{begin}/
+    s/@cmnd{end}/@xcmd{end}/
+}
+# one-line 'break' statements
+/@cmnd{break}/ {
+    s//@xcmd{break}/
+    s/@cmnd{end}/@xcmd{end}/
+}
+# one-line 'continue' statements
+/@cmnd{continue}/ {
+    s//@xcmd{continue}/
+    s/@cmnd{end}/@xcmd{end}/
+}
+# one-line 'switch' statements
+/@cmnd{switch}/ {
+    s//@xcmd{switch}/
+    s/@cmnd{case}/@xcmd{case}/
+    s/@cmnd{end}/@xcmd{end}/
+}
+# one-line 'function' statements
+/@cmnd{function}/ {
+    s//@xcmd{function}/
+    s/@cmnd{return}/@xcmd{return}/
+    s/@cmnd{end}/@xcmd{end}/
+}
+# one-line 'bind' statements - special input functions
+/@cmnd{bind}/ {
+    s//@xcmd{bind}/
+    s/@....{\([a-z]*\)}\(-[a-z-]*\)/@args{\1\2}/
+}
+# one-line 'builtin' statements
+s/@cmnd{builtin} @cmnd/@xcmd{builtin} @xcmd/g
+s/@cmnd{builtin} @sbin/@xcmd{builtin} @xbin/g
+s/@cmnd{builtin} @func/@xcmd{builtin} @xfnc/g
+#.
+# one-line 'command' statements
+s/@cmnd{command} @cmnd/@xcmd{command} @xcmd/g
+s/@cmnd{command} @sbin/@xcmd{command} @xbin/g
+s/@cmnd{command} @func/@xcmd{command} @xfnc/g
+#.
+# one-line 'and/or' statements
+s/@cmnd{and} @cmnd/@xcmd{and} @xcmd/g
+s/@cmnd{and} @sbin/@xcmd{and} @xbin/g
+s/@cmnd{and} @func/@xcmd{and} @xfnc/g
+s/@cmnd{or} @cmnd/@xcmd{or} @xcmd/g
+s/@cmnd{or} @sbin/@xcmd{or} @xbin/g
+s/@cmnd{or} @func/@xcmd{or} @xfnc/g
+#.
 s/^\( *\)@sbin/\1@xbin/
-s/\( *[;()] *\)@sbin/\1@xbin/
-s/\( *@redr{|} *\)@sbin/\1@xbin/
+s/\( *[;()] *\)@sbin/\1@xbin/g
+s/\( *@redr{|} *\)@sbin/\1@xbin/g
 s/^\( *\)@cmnd/\1@xcmd/
-s/\( *[;()] *\)@cmnd/\1@xcmd/
-s/\( *@redr{|} *\)@cmnd/\1@xcmd/
+s/\( *[;()] *\)@cmnd/\1@xcmd/g
+s/\( *@redr{|} *\)@cmnd/\1@xcmd/g
 s/^\( *\)@func/\1@xfnc/
-s/\( *[;()] *\)@func/\1@xfnc/
-s/\( *@redr{|} *\)@func/\1@xfnc/
-
+s/\( *[;()] *\)@func/\1@xfnc/g
+s/\( *@redr{|} *\)@func/\1@xfnc/g
+s/\\@cmnd{\([^}]*\)/@args{@bksl{\1}/g
 s/@cmnd/@args/g
 s/@func/@args/g
 s/@sbin/@args/g
-
-s/^.*$/PSTQ: &/w lexicon.log
-s/^PSTQ: //
+#.
+s/^.*$/PostArgs: &/w lexicon.log
+s/^PostArgs: //
 #.
 s/xcmd/cmnd/g
 s/xfnc/func/g
@@ -382,10 +473,16 @@ x
 s/</\&lt;/g
 s/>/\&gt;/g
 s/((d))/@/g
+s/\\\([()]\)/@optr{@bksl{\1}}/g
+s/\([()]\)/@optr{\1}/g
+s/\\n/@bksl{n}/
 #.
 # Uncomment the folowing two lines (ss) to log the final output, sent to Doxygen.
-s/^.*$/OUT : &/w lexicon.log
-s/^OUT : //
+s/^.*$/Output  : &\
+\
+/w lexicon.log
+s/^Output  : //
+s/\n\n$//
 #.
 # Lines are reassembled, so branch to end
 b
@@ -397,6 +494,8 @@ b
 #.
 # Move protected content to hold space and mark up other entities.
 :protect
+s/^.*$/Input   : &/w lexicon.log
+s/^Input   : //
 h
 # Clear out any content that has already been marked up, to prevent futher
 # markup on words that should be left alone.
@@ -413,9 +512,9 @@ s/\n$//g
 x
 /^\<@[^}]*$/ ! {
     s/[^\<]*//
-    s/^ *\\\n//
-    s/[()] \\//
-    s/\n *\\//
+    s/^ *\\\n//g
+    s/\n *\\//g
+    s/[()] \\//g
     s/^[^\<][^@][^\\]*//
     s/\n[]|;) ][^\\]*\\//
     s/\n[]|;) a-zA-z0-9-][^\\]*$//
@@ -433,6 +532,7 @@ x
 s/\\\n/\
 /
 s/\< \n//
+s/^[a-z][a-z]* \n//
 #.
 # Swap the buffers back.
 x
@@ -446,8 +546,11 @@ s/\([^{<>^] *\)\([0-9]* *[<>^][<>^]*[^@][a-zA-Z0-9._-]*\)/\1@redr{\2}/g
 s/\\}/}\\/g
 #.
 # Now we can add in 'unsafe' entities that would be too greedy.
+# Arrays
+s/[[][0-9$a-zA-Z_;. -]*]/@args{&}/g
+#.
 # Declared Variables
-s/\([$%][$%]*\)\([A-Za-z_0-9][A-Za-z_0-9]*\)/@vars{@optr{\1}\2}/g
+s/\($[$]*\)\([A-Za-z_0-9][A-Za-z_0-9]*\)/@vars{@optr{\1}\2}/g
 #.
 # Files
 s/\([^@]\)\([A-Za-z0-9_-][A-Za-z0-9_-]*\.[a-z0-9*][a-z0-9*]*\)/\1@fsfo{\2}/g
@@ -492,3 +595,14 @@ s/\(@path{[^}]*\)}@fsfo/\1}@fsfo/
 # single line.
 #.
 # b tidy
+#.
+#.
+# Below is a special section that adds vocabuarly to the lexicon during 'make'.
+# As the lexicon is written into the output lexicon_filter, portability is
+# automatically handled.
+#.
+#!# sbin whoami
+#!# sbin mkdir
+#!# sbin basename
+#!# cmnd sleep
+#!# args in
-- 
cgit v1.2.3


From c39fe3433bf73aa2562fb366cc82bc9c3cc6616a Mon Sep 17 00:00:00 2001
From: Mark Griffiths <mark@thebespokepixel.com>
Date: Wed, 27 Aug 2014 00:30:08 +0100
Subject: Various additions and fixes

---
 Doxyfile                |   4 +-
 Doxyfile.help           |   4 +-
 Doxyfile.user           |   4 +-
 Makefile.in             |   4 +-
 doc_src/FORMATTING.md   |   4 ++
 doc_src/commands.hdr.in |  15 +++++
 doc_src/contains.txt    |   1 -
 doc_src/count.txt       |   2 +-
 doc_src/echo.txt        |   2 -
 doc_src/fish.txt        |   2 -
 doc_src/fish_indent.txt |   2 -
 doc_src/functions.txt   |  14 +++--
 doc_src/index.hdr.in    |   7 ++-
 doc_src/jobs.txt        |   2 -
 doc_src/mimedb.txt      |   2 -
 doc_src/set_color.txt   |   4 +-
 doc_src/status.txt      |   2 -
 doc_src/trap.txt        |   2 -
 doc_src/tutorial.hdr    |   2 +-
 doc_src/ulimit.txt      |   2 -
 lexicon_filter.in       | 156 ++++++++++++++++++++++++++----------------------
 21 files changed, 129 insertions(+), 108 deletions(-)

(limited to 'Makefile.in')

diff --git a/Doxyfile b/Doxyfile
index 3eecb862..eba1174f 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -242,9 +242,9 @@ ALIASES += "endfish=</pre>\n"
 ALIASES += "asis{1}=\1"
 ALIASES += "outp{1}=\1"
 ALIASES += "blah{1}=#\1"
-ALIASES += "cmnd{1}=\1"
+ALIASES += "bltn{1}=\1"
 ALIASES += "func{1}=\1"
-ALIASES += "sbin{1}=\1"
+ALIASES += "cmnd{1}=\1"
 ALIASES += "args{1}=\1"
 ALIASES += "opts{1}=\1"
 ALIASES += "vars{1}=\1"
diff --git a/Doxyfile.help b/Doxyfile.help
index 018c9281..c66bea8b 100644
--- a/Doxyfile.help
+++ b/Doxyfile.help
@@ -242,9 +242,9 @@ ALIASES += "endfish=</pre>"
 ALIASES += "asis{1}=\1"
 ALIASES += "outp{1}=\1"
 ALIASES += "blah{1}= \1"
-ALIASES += "cmnd{1}=<b>\1</b>"
+ALIASES += "bltn{1}=<b>\1</b>"
 ALIASES += "func{1}=<b>\1</b>"
-ALIASES += "sbin{1}=<b>\1</b>"
+ALIASES += "cmnd{1}=<b>\1</b>"
 ALIASES += "args{1}=\1"
 ALIASES += "opts{1}=\1"
 ALIASES += "vars{1}=\1"
diff --git a/Doxyfile.user b/Doxyfile.user
index 6d9c2fcc..85608948 100644
--- a/Doxyfile.user
+++ b/Doxyfile.user
@@ -242,9 +242,9 @@ 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 += "bltn{1}=<span class=\"command\">\1</span>"
 ALIASES += "func{1}=<span class=\"function\">\1</span>"
-ALIASES += "sbin{1}=<span class=\"binary\">\1</span>"
+ALIASES += "cmnd{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>"
diff --git a/Makefile.in b/Makefile.in
index cdb6fbc5..ab58e56b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -357,11 +357,11 @@ lexicon.txt: doc_src/commands.hdr $(FUNCTIONS_DIR_FILES) $(COMPLETIONS_DIR_FILES
 	# Scan sources for commands/functions/binaries/colours. If GNU sed was portable, this could be much smarter.
 	sed <command_list_toc.txt >>lexicon.tmp -n \
 		-e "s|^.*>\([a-z][a-z_]*\)</a>|'\1'|w lexicon_catalog.tmp" \
-		-e "s|'\(.*\)'|cmnd \1|p"; mv lexicon_catalog.tmp lexicon_catalog.txt; \
+		-e "s|'\(.*\)'|bltn \1|p"; mv lexicon_catalog.tmp lexicon_catalog.txt; \
 	printf "%s\n" $(COMPLETIONS_DIR_FILES) | sed -n \
 		-e "s|[^ ]*/\([a-z][a-z_-]*\).fish|'\1'|p" | fgrep -vx -f lexicon_catalog.txt | sed >>lexicon.tmp -n \
 		-e 'w lexicon_catalog.tmp' \
-		-e "s|'\(.*\)'|sbin \1|p"; cat lexicon_catalog.tmp >> lexicon_catalog.txt; \
+		-e "s|'\(.*\)'|cmnd \1|p"; cat lexicon_catalog.tmp >> lexicon_catalog.txt; \
 	printf "%s\n" $(FUNCTIONS_DIR_FILES) | sed -n \
 		-e "s|[^ ]*/\([a-z][a-z_-]*\).fish|'\1'|p" | fgrep -vx -f lexicon_catalog.txt | sed >>lexicon.tmp -n \
 		-e 'w lexicon_catalog.tmp' \
diff --git a/doc_src/FORMATTING.md b/doc_src/FORMATTING.md
index b5bef345..74b530a4 100644
--- a/doc_src/FORMATTING.md
+++ b/doc_src/FORMATTING.md
@@ -102,4 +102,8 @@ Some useful Unicode/HTML5 entities:
 
 ### Lists
 
+### Synopsis rules
+
+### Prompts and cursor
+
 #### Author: Mark Griffiths [@GitHub](https://github.com/MarkGriffiths)
\ No newline at end of file
diff --git a/doc_src/commands.hdr.in b/doc_src/commands.hdr.in
index fb9ebefa..0ffb9d52 100644
--- a/doc_src/commands.hdr.in
+++ b/doc_src/commands.hdr.in
@@ -14,6 +14,21 @@
 \endhtmlonly
 `fish` ships with a large number of builtin commands, shellscript functions and external commands. These are all described below.
 
+Almost all fish commands respond to the `-h` or `--help` options to display their relevant help, also accessible using the `help` and `man` commands, like so:
+
+\fish
+echo -h
+echo --help
+# Prints help to the terminal window
+
+man echo
+# Displays the man page in the system pager
+# (normally 'less', 'more' or 'most').
+
+help echo
+# Open a web browser to show the relevant documentation
+\endfish
+
 @command_list@
 
 \htmlonly[block]
diff --git a/doc_src/contains.txt b/doc_src/contains.txt
index 4c947c9d..f3966d82 100644
--- a/doc_src/contains.txt
+++ b/doc_src/contains.txt
@@ -12,7 +12,6 @@ contains [OPTIONS] KEY [VALUES...]
 The following options are available:
 
 - `-i` or `--index` print the word index
-- `-h` or `--help` display this message
 
 
 \subsection contains-example Example
diff --git a/doc_src/count.txt b/doc_src/count.txt
index 9f904311..279ead7d 100644
--- a/doc_src/count.txt
+++ b/doc_src/count.txt
@@ -9,7 +9,7 @@ count $VARIABLE
 
 `count` prints the number of arguments that were passed to it. This is usually used to find out how many elements an environment variable array contains.
 
-`count` does not accept any options, including '`-h`'.
+`count` does not accept any options, including `-h` or `--help`.
 
 `count` exits with a non-zero exit status if no arguments were passed to it, and with zero if at least one argument was passed.
 
diff --git a/doc_src/echo.txt b/doc_src/echo.txt
index d7062716..c53d3009 100644
--- a/doc_src/echo.txt
+++ b/doc_src/echo.txt
@@ -19,8 +19,6 @@ The following options are available:
 
 - `-e`, Enable interpretation of backslash escapes
 
-- `-h`, `--help` Display this help
-
 \subsection echo-escapes Escape Sequences
 
 If `-e` is used, the following sequences are recognized:
diff --git a/doc_src/fish.txt b/doc_src/fish.txt
index 05f48d66..bf9c3eb1 100644
--- a/doc_src/fish.txt
+++ b/doc_src/fish.txt
@@ -15,8 +15,6 @@ The following options are available:
 
 - `-d` or `--debug-level=DEBUG_LEVEL` specify the verbosity level of fish. A higher number means higher verbosity. The default level is 1.
 
-- `-h` or `--help` display help and exit
-
 - `-i` or `--interactive` specify that fish is to run in interactive mode
 
 - `-l` or `--login` specify that fish is to run as a login shell
diff --git a/doc_src/fish_indent.txt b/doc_src/fish_indent.txt
index 386835dc..1d4694e3 100644
--- a/doc_src/fish_indent.txt
+++ b/doc_src/fish_indent.txt
@@ -11,8 +11,6 @@ fish_indent [OPTIONS]
 
 The following options are available:
 
-- `-h` or `--help` displays this help message and then exits
-
 - `-i` or `--no-indent` do not indent commands
 
 - `-v` or `--version` displays the current fish version and then exits
diff --git a/doc_src/functions.txt b/doc_src/functions.txt
index 0750cd1b..1a5b1c07 100644
--- a/doc_src/functions.txt
+++ b/doc_src/functions.txt
@@ -22,8 +22,6 @@ The following options are available:
 
 - `-e` or `--erase` causes the specified functions to be erased.
 
-- `-h` or `--help` displays a help message and exits.
-
 - `-n` or `--names` lists the names of all defined functions.
 
 - `-q` or `--query` tests if the specified functions exist.
@@ -42,9 +40,13 @@ The exit status of `functions` is the number of functions specified in the argum
 
 
 \subsection functions-example Examples
+\fish
+functions -n
+# Displays a list of currently-defined functions
 
-`functions -n` displays a list of currently-defined functions.
-
-`functions -c foo bar` copies the `foo` function to a new function called `bar`.
+functions -c foo bar
+# Copies the 'foo' function to a new function called 'bar'
 
-`functions -e bar` erases the function `bar`.
+functions -e bar
+# Erases the function `bar`
+\endfish
diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in
index 8d827cd6..4c99944a 100644
--- a/doc_src/index.hdr.in
+++ b/doc_src/index.hdr.in
@@ -1029,8 +1029,11 @@ When the cursor is over a parenthesis or a quote, `fish` also highlights its mat
 
 To customize the syntax highlighting, you can set the environment variables `fish_color_normal`, `fish_color_command`, `fish_color_substitution`, `fish_color_redirection`, `fish_color_end`, `fish_color_error`, `fish_color_param`, `fish_color_comment`, `fish_color_match`, `fish_color_search_match`, `fish_color_cwd`, `fish_pager_color_prefix`, `fish_pager_color_completion`, `fish_pager_color_description`, `fish_pager_color_progress` and `fish_pager_color_secondary`. Usually, the value of these variables will be one of `black`, `red`, `green`, `brown`, `yellow`, `blue`, `magenta`, `purple`, `cyan`, `white` or `normal`, but they can be an array containing any color options for the `set_color` command.
 
-Issuing `set fish_color_error black --background=red --bold` will make all commandline errors be written in a black, bold font, with a red background.
-
+\fish
+set fish_color_error black --background=red --bold
+# Make all commandline errors be written in a black,
+# bold font, with a red background.
+\endfish
 
 \subsection title Programmable title
 
diff --git a/doc_src/jobs.txt b/doc_src/jobs.txt
index fbdc0579..613266d3 100644
--- a/doc_src/jobs.txt
+++ b/doc_src/jobs.txt
@@ -15,8 +15,6 @@ jobs accepts the following switches:
 
 - `-g` or `--group` only prints the group ID of each job.
 
-- `-h` or `--help` displays a help message and exits.
-
 - `-l` or `--last` prints only the last job to be started.
 
 - `-p` or `--pid` prints the process ID for each process in all jobs.
diff --git a/doc_src/mimedb.txt b/doc_src/mimedb.txt
index b7ec29ce..19747444 100644
--- a/doc_src/mimedb.txt
+++ b/doc_src/mimedb.txt
@@ -25,6 +25,4 @@ The following options are available:
 
 - `-l`, `--launch` launches the default action for the specified files.
 
-- `-h`, `--help` displays a help message and exit.
-
 - `-v`, `--version` displays the version number and exits.
diff --git a/doc_src/set_color.txt b/doc_src/set_color.txt
index ab4916df..f48926a8 100644
--- a/doc_src/set_color.txt
+++ b/doc_src/set_color.txt
@@ -17,8 +17,6 @@ The following options are available:
 
 - `-c`, `--print-colors` prints a list of all valid color names.
 
-- `-h`, `--help` displays a help message and exit.
-
 - `-o`, `--bold` sets bold or extra bright mode.
 
 - `-u`, `--underline` sets underlined mode.
@@ -38,6 +36,6 @@ Not all terminal emulators support all these features.
 \fish
 set_color red; echo "Roses are red"
 set_color blue; echo "Violets are blue"
-set_color 62A ; echo "Eggplants are dark purple"
+set_color 62A; echo "Eggplants are dark purple"
 set_color normal; echo "Normal is nice too"
 \endfish
diff --git a/doc_src/status.txt b/doc_src/status.txt
index c6b46394..b939f6fe 100644
--- a/doc_src/status.txt
+++ b/doc_src/status.txt
@@ -32,5 +32,3 @@ The following options are available:
 - `-j CONTROLTYPE` or `--job-control=CONTROLTYPE` sets the job control type, which can be `none`, `full`, or `interactive`.
 
 - `-t` or `--print-stack-trace` prints a stack trace of all function calls on the call stack.
-
-- `-h` or `--help` displays a help message and exit.
diff --git a/doc_src/trap.txt b/doc_src/trap.txt
index 3537e760..d4380550 100644
--- a/doc_src/trap.txt
+++ b/doc_src/trap.txt
@@ -15,8 +15,6 @@ The following parameters are available:
 
 - `SIGSPEC` is the name of the signal to trap.
 
-- `-h` or `--help` displays help and exits.
-
 - `-l` or `--list-signals` prints a list of signal names.
 
 - `-p` or `--print` prints all defined signal handlers.
diff --git a/doc_src/tutorial.hdr b/doc_src/tutorial.hdr
index aa67cf60..a63808e1 100644
--- a/doc_src/tutorial.hdr
+++ b/doc_src/tutorial.hdr
@@ -581,7 +581,7 @@ vim
 
 \section tut-more  Ready for more?
 
-If you want to learn more about fish, there is <a href="index.html">lots of detailed documentation</a>, an <a href="https://lists.sourceforge.net/lists/listinfo/fish-users">official mailing list</a>, the IRC channel \#fish on `irc.oftc.net`, and the <a href="http://github.com/fish-shell/fish-shell/">github page</a>.
+If you want to learn more about fish, there is <a href="index.html">lots of detailed documentation</a>, an <a href="https://lists.sourceforge.net/lists/listinfo/fish-users">official mailing list</a>, the IRC channel \#fish on `irc.oftc.net`, and the <a href="https://github.com/fish-shell/fish-shell/">github page</a>.
 
 \htmlonly[block]
 </div>
diff --git a/doc_src/ulimit.txt b/doc_src/ulimit.txt
index c6c40a07..86ffe2b6 100644
--- a/doc_src/ulimit.txt
+++ b/doc_src/ulimit.txt
@@ -49,8 +49,6 @@ The following additional options are also understood by `ulimit`:
 
 - `-a` or `--all` prints all current limits
 
-- `-h` or `--help` displays help and exits.
-
 The `fish` implementation of `ulimit` should behave identically to the implementation in bash, except for these differences:
 
 - Fish `ulimit` supports GNU-style long options for all switches
diff --git a/lexicon_filter.in b/lexicon_filter.in
index 33d4bef5..1b813fbb 100644
--- a/lexicon_filter.in
+++ b/lexicon_filter.in
@@ -16,7 +16,7 @@
 # ALIASES  += "endfish=</pre>\endhtmlonly \n"
 #.
 # ALIASES  += "blah{1}=<span class=\"comment\">\1</span>"
-# ALIASES  += "cmnd{1}=<span class=\"command\">\1</span>" and so on...
+# ALIASES  += "bltn{1}=<span class=\"command\">\1</span>" and so on...
 #.
 # And simplify for man pages (Doxyfile.help)…
 # ALIASES   = "fish=<pre>"
@@ -24,7 +24,7 @@
 # ALIASES  += "endfish=</pre>"
 #.
 # ALIASES  += "blah{1}=\1"
-# ALIASES  += "cmnd{1}=<em>\1</em>"...
+# ALIASES  += "bltn{1}=<em>\1</em>"...
 #.
 # It's meant to only ever be run once, during make, as Doxygen's 'INPUT
 # FILTER', though can be run interactively by passing a file in via stdin. It
@@ -301,17 +301,17 @@ s/^PreClean: //
 }
 /@vars/{
     :cleanvars
-    s/\(vars{@optr{$}[^@}]*\)@cmnd{\([^}]*\)}/\1\2/
+    s/\(vars{@optr{$}[^@}]*\)@bltn{\([^}]*\)}/\1\2/
     s/\(vars{@optr{$}[^@}]*\)@func{\([^}]*\)}/\1\2/
-    s/\(vars{@optr{$}[^@}]*\)@sbin{\([^}]*\)}/\1\2/
+    s/\(vars{@optr{$}[^@}]*\)@cmnd{\([^}]*\)}/\1\2/
     s/\(vars{@optr{$}[^@}]*\)@args{\([^}]*\)}/\1\2/
     t cleanvars
 }
 /@redr/{
     :cleanredr
-    s/\(redr{[^@}]*\)@cmnd{\([^}]*\)}/\1\2/
+    s/\(redr{[^@}]*\)@bltn{\([^}]*\)}/\1\2/
     s/\(redr{[^@}]*\)@func{\([^}]*\)}/\1\2/
-    s/\(redr{[^@}]*\)@sbin{\([^}]*\)}/\1\2/
+    s/\(redr{[^@}]*\)@cmnd{\([^}]*\)}/\1\2/
     s/\(redr{[^@}]*\)@fsfo{\([^}]*\)}/\1\2/
     s/\(redr{[^}]*\)}\( *\)@path{\([^}]*\)/\1\2\3/
     t cleanredr
@@ -319,9 +319,9 @@ s/^PreClean: //
 /@sgst/{
     s/@sgst{<@/@sgst{@/
     :cleansgst
-    s/\(sgst{@curs{.}[^@]*\)@cmnd{\([^}]*\)}/\1\2/
+    s/\(sgst{@curs{.}[^@]*\)@bltn{\([^}]*\)}/\1\2/
     s/\(sgst{@curs{.}[^@]*\)@func{\([^}]*\)}/\1\2/
-    s/\(sgst{@curs{.}[^@]*\)@sbin{\([^}]*\)}/\1\2/
+    s/\(sgst{@curs{.}[^@]*\)@cmnd{\([^}]*\)}/\1\2/
     s/\(sgst{@curs{.}[^@]*\)@opts{\([^}]*\)}/\1\2/
     s/\(sgst{@curs{.}[^@]*\)@path{\([^}]*\)}/\1\2/
     s/\(sgst{@curs{.}[^@]*\)@args{\([^}]*\)}/\1\2/
@@ -330,9 +330,9 @@ s/^PreClean: //
 }
 /@fsfo/{
     :cleanfsfo
-    s/\(fsfo{[^@}]*\)@cmnd{\([^}]*\)}/\1\2/
+    s/\(fsfo{[^@}]*\)@bltn{\([^}]*\)}/\1\2/
     s/\(fsfo{[^@}]*\)@func{\([^}]*\)}/\1\2/
-    s/\(fsfo{[^@}]*\)@sbin{\([^}]*\)}/\1\2/
+    s/\(fsfo{[^@}]*\)@cmnd{\([^}]*\)}/\1\2/
     t cleanfsfo
 }
 /@prmt{/{
@@ -372,92 +372,94 @@ x
 s/^@prmt *//
 }
 #.
+# Special case for optional commands
+s/@args{\[@bltn/@args{[@xbln/g
 # Special case for one-line 'if' statements
-/@cmnd{if}/ {
-    s//@xcmd{if}/
-    s/@cmnd{set}/@xcmd{set}/
-    s/@cmnd{not}/@xcmd{not}/
-    s/@cmnd{else}/@xcmd{else}/
-    s/@cmnd{contains}/@xcmd{contains}/
-    s/@cmnd{test}/@xcmd{test}/
-    s/@cmnd{end}/@xcmd{end}/
-    s/@sbin{grep}/@xbin{grep}/
+/@bltn{if}/ {
+    s//@xbln{if}/
+    s/@bltn{set}/@xbln{set}/
+    s/@bltn{not}/@xbln{not}/
+    s/@bltn{else}/@xbln{else}/
+    s/@bltn{contains}/@xbln{contains}/
+    s/@bltn{test}/@xbln{test}/
+    s/@bltn{end}/@xbln{end}/
+    s/@cmnd{grep}/@xcmd{grep}/
 }
 # one-line 'for' statements
-/@cmnd{for}/ {
-    s//@xcmd{for}/
-    s/@args{in}/@xcmd{in}/
+/@bltn{for}/ {
+    s//@xbln{for}/
+    s/@args{in}/@xbln{in}/
 }
 # one-line 'begin' statements
-/@cmnd{begin}/ {
-    s//@xcmd{begin}/
-    s/@cmnd{end}/@xcmd{end}/
+/@bltn{begin}/ {
+    s//@xbln{begin}/
+    s/@bltn{end}/@xbln{end}/
 }
 # one-line 'break' statements
-/@cmnd{break}/ {
-    s//@xcmd{break}/
-    s/@cmnd{end}/@xcmd{end}/
+/@bltn{break}/ {
+    s//@xbln{break}/
+    s/@bltn{end}/@xbln{end}/
 }
 # one-line 'continue' statements
-/@cmnd{continue}/ {
-    s//@xcmd{continue}/
-    s/@cmnd{end}/@xcmd{end}/
+/@bltn{continue}/ {
+    s//@xbln{continue}/
+    s/@bltn{end}/@xbln{end}/
 }
 # one-line 'switch' statements
-/@cmnd{switch}/ {
-    s//@xcmd{switch}/
-    s/@cmnd{case}/@xcmd{case}/
-    s/@cmnd{end}/@xcmd{end}/
+/@bltn{switch}/ {
+    s//@xbln{switch}/
+    s/@bltn{case}/@xbln{case}/
+    s/@bltn{end}/@xbln{end}/
 }
 # one-line 'function' statements
-/@cmnd{function}/ {
-    s//@xcmd{function}/
-    s/@cmnd{return}/@xcmd{return}/
-    s/@cmnd{end}/@xcmd{end}/
+/@bltn{function}/ {
+    s//@xbln{function}/
+    s/@bltn{return}/@xbln{return}/
+    s/@bltn{end}/@xbln{end}/
 }
 # one-line 'bind' statements - special input functions
-/@cmnd{bind}/ {
-    s//@xcmd{bind}/
+/@bltn{bind}/ {
+    s//@xbln{bind}/
     s/@....{\([a-z]*\)}\(-[a-z-]*\)/@args{\1\2}/
 }
 # one-line 'builtin' statements
-s/@cmnd{builtin} @cmnd/@xcmd{builtin} @xcmd/g
-s/@cmnd{builtin} @sbin/@xcmd{builtin} @xbin/g
-s/@cmnd{builtin} @func/@xcmd{builtin} @xfnc/g
+s/@bltn{builtin} @bltn/@xbln{builtin} @xbln/g
+s/@bltn{builtin} @cmnd/@xbln{builtin} @xcmd/g
+s/@bltn{builtin} @func/@xbln{builtin} @xfnc/g
 #.
 # one-line 'command' statements
-s/@cmnd{command} @cmnd/@xcmd{command} @xcmd/g
-s/@cmnd{command} @sbin/@xcmd{command} @xbin/g
-s/@cmnd{command} @func/@xcmd{command} @xfnc/g
+s/@bltn{command} @bltn/@xbln{command} @xbln/g
+s/@bltn{command} @cmnd/@xbln{command} @xcmd/g
+s/@bltn{command} @func/@xbln{command} @xfnc/g
 #.
 # one-line 'and/or' statements
-s/@cmnd{and} @cmnd/@xcmd{and} @xcmd/g
-s/@cmnd{and} @sbin/@xcmd{and} @xbin/g
-s/@cmnd{and} @func/@xcmd{and} @xfnc/g
-s/@cmnd{or} @cmnd/@xcmd{or} @xcmd/g
-s/@cmnd{or} @sbin/@xcmd{or} @xbin/g
-s/@cmnd{or} @func/@xcmd{or} @xfnc/g
-#.
-s/^\( *\)@sbin/\1@xbin/
-s/\( *[;()] *\)@sbin/\1@xbin/g
-s/\( *@redr{|} *\)@sbin/\1@xbin/g
+s/@bltn{and} @bltn/@xbln{and} @xbln/g
+s/@bltn{and} @cmnd/@xbln{and} @xcmd/g
+s/@bltn{and} @func/@xbln{and} @xfnc/g
+s/@bltn{or} @bltn/@xbln{or} @xbln/g
+s/@bltn{or} @cmnd/@xbln{or} @xcmd/g
+s/@bltn{or} @func/@xbln{or} @xfnc/g
+#.
 s/^\( *\)@cmnd/\1@xcmd/
 s/\( *[;()] *\)@cmnd/\1@xcmd/g
 s/\( *@redr{|} *\)@cmnd/\1@xcmd/g
+s/^\( *\)@bltn/\1@xbln/
+s/\( *[;()] *\)@bltn/\1@xbln/g
+s/\( *@redr{|} *\)@bltn/\1@xbln/g
 s/^\( *\)@func/\1@xfnc/
 s/\( *[;()] *\)@func/\1@xfnc/g
 s/\( *@redr{|} *\)@func/\1@xfnc/g
-s/\\@cmnd{\([^}]*\)/@args{@bksl{\1}/g
-s/@cmnd/@args/g
+s/\\@bltn{\([^}]*\)/@args{@bksl{\1}/g
+s/@bltn/@args/g
 s/@func/@args/g
-s/@sbin/@args/g
+s/@cmnd/@args/g
 #.
 s/^.*$/PostArgs: &/w lexicon.log
 s/^PostArgs: //
 #.
-s/xcmd/cmnd/g
+s/xbln/bltn/g
 s/xfnc/func/g
-s/xbin/sbin/g
+s/xcmd/cmnd/g
 x
 /^@prmt/ {
 G
@@ -473,9 +475,23 @@ x
 s/</\&lt;/g
 s/>/\&gt;/g
 s/((d))/@/g
+#.
+# Final post processing
+s/};\([^]]\)/}@redr{;}\1/g
+s/};$/}@redr{;}/
+s/ \[\([@(]\)/ @args{[}\1/g
+s/ \[\([A-Z]*\) / @args{[\1} /g
+s/@args{\([a-zA-Z0-9_.]*\)}\]/@args{\1]}/g
+s/@args{\([a-zA-Z0-9_.]*\)}: /@args{\1:} /g
+s/@bltn{echo} @fsfo/@bltn{echo} @args/g
+s/@bltn{echo}\([a-zA-Z0-9.@{} _-]*\)@fsfo/@bltn{echo}\1@args/g
+s/ \] / @args{]} /g
+s/ \]$/ @args{]}/g
+s/\]}\]$/]]}/
 s/\\\([()]\)/@optr{@bksl{\1}}/g
 s/\([()]\)/@optr{\1}/g
 s/\\n/@bksl{n}/
+s/ \\$//
 #.
 # Uncomment the folowing two lines (ss) to log the final output, sent to Doxygen.
 s/^.*$/Output  : &\
@@ -562,25 +578,25 @@ s/\(@path{[^}]*\)}@fsfo/\1}@fsfo/
 #.
 #### This section is built in the Makefile. Just some formatting examples. #####
 #.
-#   fish commands (cmnd) <- 4 character code that has a Doxygen alias counterpart
-#   template : s/[[:<:]]function[[:>:]]/@cmnd{&}/
+#   Fish builtin (bltn) <- 4 character code that has a Doxygen alias counterpart
+#   template : s/[[:<:]]function[[:>:]]/@bltn{&}/
 #.
-#   s,[[:<:]]function[[:>:]],@cmnd{function},g
-#   s,[[:<:]]begin[[:>:]],@cmnd{begin},g
+#   s,[[:<:]]function[[:>:]],@bltn{function},g
+#   s,[[:<:]]begin[[:>:]],@bltn{begin},g
 #   ...
 #.
-#   fish functions (func)
+#   Fish functions (func)
 #   Populated by 'public' functions' filename.
 #.
 #   s,[[:<:]]fish_pwd[[:>:]],@func{fish_pwd},g
 #   s,[[:<:]]fish_prompt[[:>:]],@func{fish_prompt},g
 #   ...
 #.
-#   Shell Binary (sbin)
+#   Shell Command (cmnd)
 #   Populated from completion filenames
 #.
-#   s,[[:<:]]seq[[:>:]],@sbin{seq},g
-#   s,[[:<:]]rm[[:>:]],@sbin{rm},g
+#   s,[[:<:]]seq[[:>:]],@cmnd{seq},g
+#   s,[[:<:]]rm[[:>:]],@cmnd{rm},g
 #   ...
 #.
 #   Color Variable (clrv)
-- 
cgit v1.2.3


From adbcecb456bc74f7a58dfae3daef0c7a45cd8d32 Mon Sep 17 00:00:00 2001
From: Mark Griffiths <mark@thebespokepixel.com>
Date: Wed, 3 Sep 2014 15:10:53 +0100
Subject: Rebase documentation changes

---
 .gitignore           |   2 +-
 Makefile.in          |   8 --
 doc_src/command.txt  |  16 +--
 doc_src/complete.txt |  71 +++++++-----
 doc_src/design.hdr   |  13 +--
 doc_src/function.txt |  29 +++--
 doc_src/history.txt  |  45 ++++----
 doc_src/index.hdr.in | 151 +++++++++++++-------------
 doc_src/license.hdr  | 300 +++++++++++----------------------------------------
 doc_src/read.txt     |  46 ++++----
 doc_src/test.txt     |  59 +++++-----
 doc_src/type.txt     |  20 ++--
 doc_src/user_doc.css | 126 ++++++++++++++--------
 lexicon_filter.in    |  12 +--
 14 files changed, 376 insertions(+), 522 deletions(-)

(limited to 'Makefile.in')

diff --git a/.gitignore b/.gitignore
index 15484ba5..e613d161 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,5 +38,5 @@ version
 messages.pot
 lexicon.txt
 lexicon_filter
-lexicon-debug.log
+lexicon.log
 
diff --git a/Makefile.in b/Makefile.in
index ab58e56b..48cd2467 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -264,14 +264,6 @@ user_doc: $(HDR_FILES_SRC) Doxyfile.user $(HTML_SRC) $(HELP_SRC) doc.h $(HDR_FIL
 	echo PROJECT_NUMBER=$(FISH_BUILD_VERSION) | sed "s/-.*//") | doxygen - && touch user_doc; \
 	cd user_doc/html; rm -f bc_s.png bdwn.png closed.png ftv2*.png nav*.png open.png sync_*.png tab*.* doxygen.* dynsections.js jquery.js pages.html
 
-#
-# Build the help CSS files, using fish_lexicon_filter
-#
-doc_src/user_doc.css: doc_src/user_doc.css.in doc_src/fish_lexicon_filter
-	-rm $@
-	cd doc_src; \
-	cat user_doc.css.in >> user_doc.css
-
 #
 # Source code documentation. Also includes user documentation.
 #
diff --git a/doc_src/command.txt b/doc_src/command.txt
index f0b79e8d..4f9087d6 100644
--- a/doc_src/command.txt
+++ b/doc_src/command.txt
@@ -1,22 +1,24 @@
 \section command command - run a program
 
 \subsection command-synopsis Synopsis
-<tt>command [OPTIONS] COMMANDNAME [ARGS...]</tt>
+\fish{synopsis}
+command [OPTIONS] COMMANDNAME [ARGS...]
+\endfish
 
 \subsection command-description Description
 
 `command` forces the shell to execute the program `COMMANDNAME` and ignore any functions or builtins with the same name.
 
 The following options are available:
-- \c -h or \c --help prints help and then exits.
-- \c -s or \c --search returns the name of the disk file that would be executed, or nothing if no file with the specified name could be found in the <tt>$PATH</tt>.
 
-With the \c -s option, \c command treats every argument as a separate command to look up and sets the exit status to 0 if any of the specified commands were found, or 1 if no commands could be found.
+- `-s` or `--search` returns the name of the disk file that would be executed, or nothing if no file with the specified name could be found in the `$PATH`.
 
-For basic compatibility with POSIX <tt>command</tt>, the \c -v flag is recognized as an alias for <tt>-s</tt>.
+With the `-s` option, `command` treats every argument as a separate command to look up and sets the exit status to 0 if any of the specified commands were found, or 1 if no commands could be found.
+
+For basic compatibility with POSIX `command`, the `-v` flag is recognized as an alias for `-s`.
 
 \subsection command-example Examples
 
-<tt>command ls</tt> causes fish to execute the \c ls program, even if an 'ls' function exists.
+`command ls` causes fish to execute the `ls` program, even if an `ls` function exists.
 
-<tt>command -s ls</tt> returns the path to the \c ls program.
+`command -s ls` returns the path to the `ls` program.
diff --git a/doc_src/complete.txt b/doc_src/complete.txt
index c1422825..825faf9a 100644
--- a/doc_src/complete.txt
+++ b/doc_src/complete.txt
@@ -1,7 +1,14 @@
 \section complete complete - edit command specific tab-completions
 
 \subsection complete-synopsis Synopsis
-<tt>complete (-c|--command|-p|--path) COMMAND [(-s|--short-option) SHORT_OPTION] [(-l|--long-option|-o|--old-option) LONG_OPTION [(-a||--arguments) OPTION_ARGUMENTS] [(-w|--wraps) WRAPPED_COMMAND] [(-d|--description) DESCRIPTION] </tt>
+\fish{synopsis}
+complete ( -c | --command | -p | --path ) COMMAND
+        [( -s | --short-option ) SHORT_OPTION]
+        [( -l | --long-option | -o | --old-option ) LONG_OPTION]
+        [( -a | --arguments ) OPTION_ARGUMENTS]
+        [( -w | --wraps ) WRAPPED_COMMAND]
+        [( -d | --description ) DESCRIPTION]
+\endfish
 
 \subsection complete-description Description
 
@@ -9,29 +16,39 @@ For an introduction to specifying completions, see <a
 href='index.html#completion-own'>Writing your own completions</a> in
 the fish manual.
 
-- <tt>COMMAND</tt> is the name of the command for which to add a completion
-- <tt>SHORT_OPTION</tt> is a one character option for the command
-- <tt>LONG_OPTION</tt> is a multi character option for the command
-- <tt>OPTION_ARGUMENTS</tt> is parameter containing a space-separated list of possible option-arguments, which may contain subshells
-- <tt>DESCRIPTION</tt> is a description of what the option and/or option arguments do
-- <tt>-C STRING</tt> or <tt>--do-complete=STRING</tt> makes complete try to find all possible completions for the specified string
-- <tt>-e</tt> or <tt>--erase</tt> implies that the specified completion should be deleted
-- <tt>-f</tt> or <tt>--no-files</tt> specifies that the option specified by this completion may not be followed by a filename
-- <tt>-n</tt> or <tt>--condition</tt> specifies a shell command that must return 0 if the completion is to be used. This makes it possible to specify completions that should only be used in some cases.
-- <tt>-o</tt> or <tt>--old-option</tt> implies that the command uses old long style options with only one dash
-- <tt>-p</tt> or <tt>--path</tt> implies that the string COMMAND is the full path of the command
-- <tt>-r</tt> or <tt>--require-parameter</tt> specifies that the option specified by this completion always must have an option argument, i.e. may not be followed by another option
-- <tt>-u</tt> or <tt>--unauthoritative</tt> implies that there may be more options than the ones specified, and that fish should not assume that options not listed are spelling errors
-- <tt>-A</tt> or <tt>--authoritative</tt> implies that there may be no more options than the ones specified, and that fish should assume that options not listed are spelling errors
-- <tt>-x</tt> or <tt>--exclusive</tt> implies both <tt>-r</tt> and <tt>-f</tt>
-- <tt>-w WRAPPED_COMMAND</tt> or <tt>--wraps=WRAPPED_COMMAND</tt> causes the specified command to inherit completions from the wrapped comamnd.
-
-Command specific tab-completions in \c fish are based on the notion
-of options and arguments. An option is a parameter which begins with a
-hyphen, such as '`-h`', '`-help`' or '`--help`'. Arguments are parameters
-that do not begin with a hyphen. Fish recognizes three styles of
-options, the same styles as the GNU version of the getopt
-library. These styles are:
+- `COMMAND` is the name of the command for which to add a completion.
+
+- `SHORT_OPTION` is a one character option for the command.
+
+- `LONG_OPTION` is a multi character option for the command.
+
+- `OPTION_ARGUMENTS` is parameter containing a space-separated list of possible option-arguments, which may contain subshells.
+
+- `DESCRIPTION` is a description of what the option and/or option arguments do.
+
+- `-C STRING` or `--do-complete=STRING` makes complete try to find all possible completions for the specified string.
+
+- `-w WRAPPED_COMMAND` or `--wraps=WRAPPED_COMMAND` causes the specified command to inherit completions from the wrapped command.
+
+- `-e` or `--erase` implies that the specified completion should be deleted.
+
+- `-f` or `--no-files` specifies that the option specified by this completion may not be followed by a filename.
+
+- `-n` or `--condition` specifies a shell command that must return 0 if the completion is to be used. This makes it possible to specify completions that should only be used in some cases.
+
+- `-o` or `--old-option` implies that the command uses old long style options with only one dash.
+
+- `-p` or `--path` implies that the string `COMMAND` is the full path of the command.
+
+- `-r` or `--require-parameter` specifies that the option specified by this completion always must have an option argument, i.e. may not be followed by another option.
+
+- `-u` or `--unauthoritative` implies that there may be more options than the ones specified, and that fish should not assume that options not listed are spelling errors.
+
+- `-A` or `--authoritative` implies that there may be no more options than the ones specified, and that fish should assume that options not listed are spelling errors.
+
+- `-x` or `--exclusive` implies both `-r` and `-f`.
+
+Command specific tab-completions in `fish` are based on the notion of options and arguments. An option is a parameter which begins with a hyphen, such as '`-h`', '`-help`' or '`--help`'. Arguments are parameters that do not begin with a hyphen. Fish recognizes three styles of options, the same styles as the GNU version of the getopt library. These styles are:
 
 - Short options, like '`-a`'. Short options are a single character long, are preceded by a single hyphen and may be grouped together (like '`-la`', which is equivalent to '`-l -a`'). Option arguments may be specified in the following parameter ('`-w 32`') or by appending the option with the value ('`-w32`').
 
@@ -76,9 +93,11 @@ complete -c rpm -n "__fish_contains_opt -s e erase" -l nodeps -d "Don't check de
 
 where `__fish_contains_opt` is a function that checks the commandline buffer for the presence of a specified set of options.
 
-To implement an alias, use the \c -w or \c --wraps option:
+To implement an alias, use the `-w` or `--wraps` option:
 
-<tt>complete -c hub -w git</tt>
+\fish
+complete -c hub -w git
+\endfish
 
 Now hub inherits all of the completions from git. Note this can also be specified in a function declaration.
 
diff --git a/doc_src/design.hdr b/doc_src/design.hdr
index 1cd27662..1bb6f8c8 100644
--- a/doc_src/design.hdr
+++ b/doc_src/design.hdr
@@ -90,18 +90,7 @@ A program should be designed to make its features as easy as possible to discove
 Rationale:
 A program whose features are discoverable turns a new user into an expert in a shorter span of time, since the user will become an expert on the program simply by using it.
 
-A program whose features are discoverable turns a new user into an
-expert in a shorter span of time, since the user will become an expert
-on the program simply by using it.
-
-The main benefit of a graphical program over a command line-based
-program is discoverability. In a graphical program, one can discover
-all the common features by simply looking at the user interface and
-guessing what the different buttons, menus and other widgets do. The
-traditional way to discover features in commandline programs is
-through manual pages. This requires both that the user starts to use a
-different program, and then she/he remembers the new information
-until the next time she/he uses the same program.
+The main benefit of a graphical program over a command line-based program is discoverability. In a graphical program, one can discover all the common features by simply looking at the user interface and guessing what the different buttons, menus and other widgets do. The traditional way to discover features in commandline programs is through manual pages. This requires both that the user starts to use a different program, and then she/he remembers the new information until the next time she/he uses the same program.
 
 Examples:
 - Everything should be tab-completable, and every tab completion should have a description.
diff --git a/doc_src/function.txt b/doc_src/function.txt
index 096be806..8c4ba89b 100644
--- a/doc_src/function.txt
+++ b/doc_src/function.txt
@@ -13,15 +13,23 @@ A function is a list of commands that will be executed when the name of the func
 
 The following options are available:
 
-- <code>-a NAMES</code> or <code>--argument-names NAMES</code> assigns the value of successive command-line arguments to the names given in NAMES.
-- <code>-d DESCRIPTION</code> or \c --description=DESCRIPTION is a description of what the function does, suitable as a completion description.
-- <code>-w WRAPPED_COMMAND</code> or \c --wraps=WRAPPED_COMMAND causes the function to inherit completions from the given wrapped command. See the documentation for \c complete for more information.
-- <code>-e</code> or <code>--on-event EVENT_NAME</code> tells fish to run this function when the specified named event is emitted. Fish internally generates named events e.g. when showing the prompt.
-- <code>-j PID</code> or <code> --on-job-exit PID</code> tells fish to run this function when the job with group ID PID exits. Instead of PID, the string 'caller' can be specified. This is only legal when in a command substitution, and will result in the handler being triggered by the exit of the job which created this command substitution.
-- <code>-p PID</code> or <code> --on-process-exit PID</code> tells fish to run this function when the fish child process with process ID PID exits.
-- <code>-s</code> or <code>--on-signal SIGSPEC</code> tells fish to run this function when the signal SIGSPEC is delivered. SIGSPEC can be a signal number, or the signal name, such as SIGHUP (or just HUP).
-- \c -S or \c --no-scope-shadowing allows the function to access the variables of calling functions. Normally, any variables inside the function that have the same name as variables from the calling function are "shadowed", and their contents is independent of the calling function.
-- <code>-v</code> or <code>--on-variable VARIABLE_NAME</code> tells fish to run this function when the variable VARIABLE_NAME changes value.
+- `-a NAMES` or `--argument-names NAMES` assigns the value of successive command-line arguments to the names given in NAMES.
+
+- `-d DESCRIPTION` or `--description=DESCRIPTION` is a description of what the function does, suitable as a completion description.
+
+- `-w WRAPPED_COMMAND` or `--wraps=WRAPPED_COMMAND` causes the function to inherit completions from the given wrapped command. See the documentation for <a href="#complete">`complete`</a> for more information.
+
+- `-e` or `--on-event EVENT_NAME` tells fish to run this function when the specified named event is emitted. Fish internally generates named events e.g. when showing the prompt.
+
+- `-j PID` or `--on-job-exit PID` tells fish to run this function when the job with group ID PID exits. Instead of PID, the string 'caller' can be specified. This is only legal when in a command substitution, and will result in the handler being triggered by the exit of the job which created this command substitution.
+
+- `-p PID` or `--on-process-exit PID` tells fish to run this function when the fish child process with process ID PID exits.
+
+- `-s` or `--on-signal SIGSPEC` tells fish to run this function when the signal SIGSPEC is delivered. SIGSPEC can be a signal number, or the signal name, such as SIGHUP (or just HUP).
+
+- `-S` or `--no-scope-shadowing` allows the function to access the variables of calling functions. Normally, any variables inside the function that have the same name as variables from the calling function are "shadowed", and their contents is independent of the calling function.
+
+- `-v` or `--on-variable VARIABLE_NAME` tells fish to run this function when the variable VARIABLE_NAME changes value.
 
 If the user enters any additional arguments after the function, they are inserted into the environment <a href="index.html#variables-arrays">variable array</a> `$argv`. If the `--argument-names` option is provided, the arguments are also assigned to names specified in that option.
 
@@ -57,6 +65,5 @@ function mkdir -d "Create a directory and set CWD"
 end
 \endfish
 
-will run the mkdir command, and if it is successful, change the
-current working directory to the one just created.
+This will run the `mkdir` command, and if it is successful, change the current working directory to the one just created.
 
diff --git a/doc_src/history.txt b/doc_src/history.txt
index b6e15340..f7b873a0 100644
--- a/doc_src/history.txt
+++ b/doc_src/history.txt
@@ -1,40 +1,31 @@
 \section history history - Show and manipulate command history
 
 \subsection history-synopsis Synopsis
-<pre>
-history (--save | --clear | --merge)
-history (--search | --delete ) (--prefix "prefix string" | --contains "search string")
-</pre>
+\fish{synopsis}
+history ( --merge | --save | --clear )
+history ( --search | --delete ) [ --prefix "prefix string" | --contains "search string" ]
+\endfish
 
 \subsection history-description Description
 
 `history` is used to list, search and delete the history of commands used.
 
 The following options are available:
+- `--save` saves all changes in the history file. The shell automatically saves the history file; this option is provided for internal use.
+
+- `--clear` clears the history file. A prompt is displayed before the history is erased.
+
+- `--merge` immediately incorporates history changes from other sessions. Ordinarily `fish` ignores history changes from sessions started after the current one. This command applies those changes immediately.- `--search` returns history items in keeping with the `--prefix` or `--contains` options.
+
+- `--delete` deletes history items.
+
+- `--prefix` searches or deletes items in the history that begin with the specified text string.
+
+- `--contains` searches or deletes items in the history that contain the specified text string.
+
+If `--search` is specified without `--contains` or `--prefix`, `--contains` will be assumed.
 
-- `--save` saves all changes in the history file. The shell automatically
-saves the history file; this option is provided for internal use.
-- `--clear` clears the history file. A prompt is displayed before the history
-is erased.
-- \c --merge immediately incorporates history changes from other sessions. Ordinarily
-fish ignores history changes from sessions started after the current one. This command
-applies those changes immediately.
-- \c --search returns history items in keeping with the \c --prefix or
-\c --contains options.
-- \c --delete deletes history items.
-- \c --prefix searches or deletes items in the history that begin with the
-specified text string.
-- `--contains` searches or deletes items in the history that contain the
-specified text string.
-
-If `--search` is specified without `--contains` or `--prefix`,
-`--contains` will be assumed.
-
-If `--delete` is specified without `--contains` or `--prefix`,
-only a history item which exactly matches the parameter will be erased. No
-prompt will be given. If `--delete` is specified with either of these
-parameters, an interactive prompt will be displayed before any items are
-deleted.
+If `--delete` is specified without `--contains` or `--prefix`, only a history item which exactly matches the parameter will be erased. No prompt will be given. If `--delete` is specified with either of these parameters, an interactive prompt will be displayed before any items are deleted.
 
 
 \subsection history-examples Example
diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in
index 326e4d13..8b8fbaff 100644
--- a/doc_src/index.hdr.in
+++ b/doc_src/index.hdr.in
@@ -138,49 +138,46 @@ separation of errors and warnings from regular program output.
 
 Any file descriptor can be directed to a different output than its default through a simple mechanism called a redirection.
 
+An example of a file redirection is `echo hello > output.txt`, which directs the output of the echo command to the file output.txt.
 
-- To read standard input from a file, write <code>\<SOURCE_FILE</code>
-- To write standard output to a file, write <code>\>DESTINATION</code>
-- To write standard error to a file, write <code>^DESTINATION</code>
-- To append standard output to a file, write <code>\>\>DESTINATION_FILE</code>
-- To append standard error to a file, write <code>^^DESTINATION_FILE</code>
+- To read standard input from a file, write `<SOURCE_FILE`
+- To write standard output to a file, write `DESTINATION`
+- To write standard error to a file, write `^DESTINATION`
+- To append standard output to a file, write `>>DESTINATION_FILE`
+- To append standard error to a file, write `^^DESTINATION_FILE`
 
-- To redirect standard input, write `<SOURCE_FILE`
-- To redirect standard output, write `>DESTINATION`
-- To redirect standard error, write `^DESTINATION`
-- To redirect standard output to a file which will be appended, write `>>DESTINATION_FILE`
-- To redirect standard error to a file which will be appended, write `^^DESTINATION_FILE`
+`DESTINATION` can be one of the following:
 
 - A filename. The output will be written to the specified file.
-- An ampersand (\&) followed by the number of another file descriptor. The output will be written to that file descriptor instead.
-- An ampersand followed by a minus sign (\&-). The file descriptor will be closed.
+
+- An ampersand (`&`) followed by the number of another file descriptor. The output will be written to that file descriptor instead.
+
+- An ampersand followed by a minus sign (`&-`). The file descriptor will be closed.
 
 Example:
 
 To redirect both standard output and standard error to the file 'all_output.txt', you can write `echo Hello > all_output.txt ^&1`.
 
-Any FD can be redirected in an arbitrary way by prefixing the redirection with the number of the FD.
-
 Any file descriptor can be redirected in an arbitrary way by prefixing the
 redirection with the file descriptor.
 
-- To redirect input of FD N, write <code>N\<DESTINATION</code>
-- To redirect output of FD N, write <code>N\>DESTINATION</code>
-- To append the output of FD N to a file, write <code>N\>\>DESTINATION_FILE</code>
+- To redirect input of FD N, write `N<DESTINATION`
+- To redirect output of FD N, write `N>DESTINATION`
+- To append the output of FD N to a file, write `N>>DESTINATION_FILE`
 
-Example: <code>echo Hello 2\>output.stderr</code> and <code>echo Hello
-^output.stderr</code> are equivalent, and write the standard error (file
-descriptor 2) of the target program to <code>output.stderr</code>.
+Example: `echo Hello 2>output.stderr` and `echo Hello
+^output.stderr` are equivalent, and write the standard error (file
+descriptor 2) of the target program to `output.stderr`.
 
 \subsection piping Piping
 
-The user can string together multiple commands into a so called pipeline. This means that the standard output of one command will be read in as standard input into the next command. This is done by separating the commands by the pipe character '`|`'. For example
+The user can string together multiple commands into a so called pipeline. This means that the standard output of one command will be read in as standard input into the next command. This is done by separating the commands by the pipe character '`|`'. For example:
 
 \fish
 cat foo.txt | head
 \endfish
 
-will call the `cat` program with the parameter 'foo.txt', which will print the contents of the file 'foo.txt'. The contents of foo.txt will then be filtered through the program 'head', which will pass on the first ten lines of the file to the screen. For more information on how to combine commands through pipes, read the manual pages of the commands you want to use using the `man` command. If you want to find out more about the `cat` program, type `man cat`.
+This will call the `cat` program with the parameter 'foo.txt', which will print the contents of the file 'foo.txt'. The contents of foo.txt will then be filtered through the program 'head', which will pass on the first ten lines of the file to the screen. For more information on how to combine commands through pipes, read the manual pages of the commands you want to use using the `man` command. If you want to find out more about the `cat` program, type `man cat`.
 
 Pipes usually connect file descriptor 1 (standard output) of the first process to file descriptor 0 (standard input) of the second process. It is possible use a different output file descriptor by prepending the desired FD number and then output redirect symbol to the pipe. For example:
 
@@ -188,7 +185,7 @@ Pipes usually connect file descriptor 1 (standard output) of the first process t
 make fish 2> | less
 \endfish
 
-will attempt to build the fish program, and any errors will be shown using the less pager.
+This will attempt to build the fish program, and any errors will be shown using the less pager.
 
 
 \subsection syntax-background Background jobs
@@ -420,12 +417,7 @@ Note that if no matches are found for a specific wildcard, it will expand into z
 
 \subsection expand-command-substitution Command substitution
 
-The output of a series of commands can be used as the parameters to another
-command. If a parameter contains a set of parenthesis, the text enclosed by the
-parenthesis will be interpreted as a list of commands. On expansion,
-this list is executed, and substituted by the output. If the output is
-more than one line long, each line will be expanded to a new
-parameter. Setting \c IFS to the empty string will disable line splitting.
+The output of a series of commands can be used as the parameters to another command. If a parameter contains a set of parenthesis, the text enclosed by the parenthesis will be interpreted as a list of commands. On expansion, this list is executed, and substituted by the output. If the output is more than one line long, each line will be expanded to a new parameter. Setting `IFS` to the empty string will disable line splitting.
 
 The exit status of the last run command substitution is available in the <a href='#variables-status'>status</a> variable.
 
@@ -436,13 +428,14 @@ Examples:
 echo (basename image.jpg .jpg).png
 # Outputs 'image.png'.
 
-The command `echo (basename image.jpg .jpg).png` will output 'image.png'.
-
-The command `for i in *.jpg; convert $i (basename $i .jpg).png; end` will convert all JPEG files in the current directory to the PNG format using the `convert` program.
+for i in *.jpg; convert $i (basename $i .jpg).png; end
+# Convert all JPEG files in the current directory to the
+# PNG format using the 'convert' program.
 
-The command <code>begin; set -l IFS; set data (cat data.txt); end</code>
-will set the \c data variable to the contents of 'data.txt' without
-splitting it into an array.
+begin; set -l IFS; set data (cat data.txt); end
+# Set the `data` variable to the contents of 'data.txt'
+# without splitting it into an array.
+\endfish
 
 
 \subsection expand-brace Brace expansion
@@ -723,31 +716,46 @@ All arrays are one-dimensional and cannot contain other arrays, although it is p
 
 \subsection variables-special Special variables
 
-The user can change the settings of \c fish by changing the values of
+The user can change the settings of `fish` by changing the values of
 certain environment variables.
 
-- \c BROWSER, the user's preferred web browser. If this variable is set, fish will use the specified browser instead of the system default browser to display the fish documentation.
-- \c CDPATH, an array of directories in which to search for the new directory for the \c cd builtin. By default, the fish configuration defines \c CDPATH to be a universal variable with the values \c . and \c ~.
-- A large number of variable starting with the prefixes \c fish_color and \c fish_pager_color. See <a href='#variables-color'>Variables for changing highlighting colors</a> for more information.
-- \c fish_greeting, the greeting message printed on startup.
-- \c LANG, \c LC_ALL, \c LC_COLLATE, \c LC_CTYPE, \c LC_MESSAGES, \c LC_MONETARY, \c LC_NUMERIC and \c LC_TIME set the language option for the shell and subprograms. See the section <a href='#variables-locale'>Locale variables</a> for more information.
-- \c fish_user_paths, an array of directories that are prepended to PATH. This can be a universal variable.
-- \c PATH, an array of directories in which to search for commands
-- \c umask, the current file creation mask. The preferred way to change the umask variable is through the <a href="commands.html#umask">umask function</a>. An attempt to set umask to an invalid value will always fail.
+- `BROWSER`, the user's preferred web browser. If this variable is set, fish will use the specified browser instead of the system default browser to display the fish documentation.
+
+- `CDPATH`, an array of directories in which to search for the new directory for the `cd` builtin. By default, the fish configuration defines `CDPATH` to be a universal variable with the values `.` and `~`.
+
+- A large number of variable starting with the prefixes `fish_color` and `fish_pager_color.` See <a href='#variables-color'>Variables for changing highlighting colors</a> for more information.
 
-\c fish also sends additional information to the user through the
+- `fish_greeting`, the greeting message printed on startup.
+
+- `LANG`, `LC_ALL`, `LC_COLLATE`, `LC_CTYPE`, `LC_MESSAGES`, `LC_MONETARY`, `LC_NUMERIC` and `LC_TIME` set the language option for the shell and subprograms. See the section <a href='#variables-locale'>Locale variables</a> for more information.
+
+- `fish_user_paths`, an array of directories that are prepended to `PATH`. This can be a universal variable.
+
+- `PATH`, an array of directories in which to search for commands
+
+- `umask`, the current file creation mask. The preferred way to change the umask variable is through the <a href="commands.html#umask">umask function</a>. An attempt to set umask to an invalid value will always fail.
+
+`fish` also sends additional information to the user through the
 values of certain environment variables. The user cannot change the
 values of most of these variables.
 
-- \c _, the name of the currently running command.
-- \c argv, an array of arguments to the shell or function. \c argv is only defined when inside a function call, or if fish was invoked with a list of arguments, like 'fish myscript.fish foo bar'. This variable can be changed by the user.
-- \c history, an array containing the last commands that were entered.
-- \c HOME, the user's home directory. This variable can be changed by the user.
-- \c IFS, the internal field separator that is used for word splitting with the <a href="commands.html#read">read builtin</a>. Setting this to the empty string will also disable line splitting in <a href="#expand-command-substitution">command substitution</a>. This variable can be changed by the user.
-- \c PWD, the current working directory.
-- \c status, the <a href="#variables-status">exit status</a> of the last foreground job to exit. If the job was terminated through a signal, the exit status will be 128 plus the signal number.
-- \c USER, the current username. This variable can be changed by the user.
-- \c CMD_DURATION, the runtime of the last command in milliseconds.
+- `_`, the name of the currently running command.
+
+- `argv`, an array of arguments to the shell or function. `argv` is only defined when inside a function call, or if fish was invoked with a list of arguments, like `fish myscript.fish foo bar`. This variable can be changed by the user.
+
+- `history`, an array containing the last commands that were entered.
+
+- `HOME`, the user's home directory. This variable can be changed by the user.
+
+- `IFS`, the internal field separator that is used for word splitting with the <a href="commands.html#read">read builtin</a>. Setting this to the empty string will also disable line splitting in <a href="#expand-command-substitution">command substitution</a>. This variable can be changed by the user.
+
+- `PWD`, the current working directory.
+
+- `status`, the <a href="#variables-status">exit status</a> of the last foreground job to exit. If the job was terminated through a signal, the exit status will be 128 plus the signal number.
+
+- `USER`, the current username. This variable can be changed by the user.
+
+- `CMD_DURATION`, the runtime of the last command in milliseconds.
 
 The names of these variables are mostly derived from the csh family of shells and differ from the ones used by Bourne style shells such as bash.
 
@@ -756,9 +764,9 @@ Variables whose name are in uppercase are exported to the commands started by fi
 Variables whose name are in uppercase are exported to the commands
 started by fish, while those in lowercase are not exported. This rule is not
 enforced by fish, but it is good coding practice to use casing to
-distinguish between exported and unexported variables. \c fish also
+distinguish between exported and unexported variables. `fish` also
 uses several variables internally. Such variables are prefixed with
-the string \c __FISH or \c __fish. These should never be used by the
+the string `__FISH` or `__fish.` These should never be used by the
 user. Changing their value may break fish.
 
 \subsection variables-status The status variable
@@ -1007,7 +1015,6 @@ function on_exit --on-process %self
 end
 \endfish
 
-
 <a href="#variables-universal">Universal variables</a> are stored in the file `.config/fish/fishd.MACHINE_ID`, where MACHINE_ID is typically your MAC address. Do not edit this file directly, as your edits may be overwritten. Edit them through fish scripts or by using fish interactively instead.
 
 
@@ -1038,35 +1045,21 @@ set fish_color_error black --background=red --bold
 
 \subsection title Programmable title
 
-When using most virtual terminals, it is possible to set the message
-displayed in the titlebar of the terminal window. This can be done
-automatically in fish by defining the \c fish_title function. The \c
-fish_title function is executed before and after a new command is
-executed or put into the foreground and the output is used as a
-titlebar message. The $_ environment variable will always contain the
-name of the job to be put into the foreground (Or 'fish' if control is
-returning to the shell) when the \c fish_prompt function is called.
-The first argument to fish_title will contain the most
-recently executed foreground command as a string, starting with fish 2.2.
+When using most virtual terminals, it is possible to set the message displayed in the titlebar of the terminal window. This can be done automatically in fish by defining the `fish_title` function. The `fish_title` function is executed before and after a new command is executed or put into the foreground and the output is used as a titlebar message. The $_ environment variable will always contain the name of the job to be put into the foreground (Or 'fish' if control is returning to the shell) when the `fish_prompt` function is called. The first argument to fish_title will contain the most recently executed foreground command as a string, starting with fish 2.2.
 
 Examples:
-<p>
-The default \c fish title is
-</p>
-<p>
-<pre>
+The default `fish` title is
+
+\fish
 function fish_title
     echo $_ ' '
     pwd
 end
-</pre>
-</p>
+\endfish
 
-<p>
 To show the last command in the title:
-</p>
-<p>
-<pre>
+
+\fish
 function fish_title
     echo $argv[1]
 end
@@ -1117,7 +1110,7 @@ If you install fish in your home directory, fish will not work correctly for any
 If you have a question not answered by this documentation, there are several avenues for help:
 
 -# The official mailing list at <a href='https://lists.sf.net/lists/listinfo/fish-users'>fish-users@lists.sf.net</a>
--# The Internet Relay Chat channel, \c #fish on \c irc.oftc.net
+-# The Internet Relay Chat channel, `#fish` on `irc.oftc.net`
 -# The <a href="https://github.com/fish-shell/fish-shell/">project GitHub page</a>
 
 
diff --git a/doc_src/license.hdr b/doc_src/license.hdr
index 037828ce..eac13766 100644
--- a/doc_src/license.hdr
+++ b/doc_src/license.hdr
@@ -335,241 +335,71 @@ The precise terms and conditions for copying, distribution and modification foll
 
 ## TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-- This License applies to any program or other work which contains a notice
-placed by the copyright holder saying it may be distributed under the terms of
-this General Public License.  The "Program", below, refers to any such program
-or work, and a "work based on the Program" means either the Program or any
-derivative work under copyright law: that is to say, a work containing the
-Program or a portion of it, either verbatim or with modifications and/or
-translated into another language.  (Hereinafter, translation is included
-without limitation in the term "modification".) Each licensee is addressed as
-"you".
-
- Activities other than copying, distribution and modification are not covered
-by this License; they are outside its scope.  The act of running the Program
-is not restricted, and the output from the Program is covered only if its
-contents constitute a work based on the Program (independent of having been
-made by running the Program). Whether that is true depends on what the Program
-does.
-
-1. You may copy and distribute verbatim copies of the Program's source code as
-you receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this License
-and to the absence of any warranty; and give any other recipients of the
-Program a copy of this License along with the Program.
-
- You may charge a fee for the physical act of transferring a copy, and you may
-at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of it,
-thus forming a work based on the Program, and copy and distribute such
-modifications or work under the terms of Section 1 above, provided that you
-also meet all of these conditions:
-
- -# You must cause the modified files to carry prominent notices stating
-that you changed the files and the date of any change.
-
- -# You must cause any work that you distribute or publish, that in whole or
-in part contains or is derived from the Program or any part thereof, to be
-licensed as a whole at no charge to all third parties under the terms of this
-License.
-
- -# If the modified program normally reads commands interactively when run,
-you must cause it, when started running for such interactive use in the most
-ordinary way, to print or display an announcement including an appropriate
-copyright notice and a notice that there is no warranty (or else, saying that
-you provide a warranty) and that users may redistribute the program under
-these conditions, and telling the user how to view a copy of this License.
-(Exception: if the Program itself is interactive but does not normally print
-such an announcement, your work based on the Program is not required to print
-an announcement.)
-
- These requirements apply to the modified work as a whole.  If identifiable
-sections of that work are not derived from the Program, and can be reasonably
-considered independent and separate works in themselves, then this License,
-and its terms, do not apply to those sections when you distribute them as
-separate works.  But when you distribute the same sections as part of a whole
-which is a work based on the Program, the distribution of the whole must be on
-the terms of this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
- Thus, it is not the intent of this section to claim rights or contest your
-rights to work written entirely by you; rather, the intent is to exercise the
-right to control the distribution of derivative or collective works based on
-the Program.
-
- In addition, mere aggregation of another work not based on the Program with
-the Program (or with a work based on the Program) on a volume of a storage or
-distribution medium does not bring the other work under the scope of this
-License.
-
-3. You may copy and distribute the Program (or a work based on it, under
-Section 2) in object code or executable form under the terms of Sections 1 and
-2 above provided that you also do one of the following:
-
- -# Accompany it with the complete corresponding machine-readable source code,
-which must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange; or,
-
- -# Accompany it with a written offer, valid for at least three years, to give
-any third party, for a charge no more than your cost of physically
-performing source distribution, a complete machine-readable copy of the
-corresponding source code, to be distributed under the terms of Sections 1
-and 2 above on a medium customarily used for software interchange; or,
-
- -# Accompany it with the information you received as to the offer to
-distribute corresponding source code.  (This alternative is allowed only
-for noncommercial distribution and only if you received the program in
-object code or executable form with such an offer, in accord with
-Subsection b above.)
-
- The source code for a work means the preferred form of the work for making
-modifications to it.  For an executable work, complete source code means all
-the source code for all modules it contains, plus any associated interface
-definition files, plus the scripts used to control compilation and
-installation of the executable.  However, as a special exception, the source
-code distributed need not include anything that is normally distributed (in
-either source or binary form) with the major components (compiler, kernel, and
-so on) of the operating system on which the executable runs, unless that
-component itself accompanies the executable.
-
- If distribution of executable or object code is made by offering access to
-copy from a designated place, then offering equivalent access to copy the
-source code from the same place counts as distribution of the source code,
-even though third parties are not compelled to copy the source along with the
-object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program except as
-expressly provided under this License. Any attempt otherwise to copy, modify,
-sublicense or distribute the Program is void, and will automatically terminate
-your rights under this License. However, parties who have received copies, or
-rights, from you under this License will not have their licenses terminated so
-long as such parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not signed it.
-However, nothing else grants you permission to modify or distribute the
-Program or its derivative works.  These actions are prohibited by law if you
-do not accept this License.  Therefore, by modifying or distributing the
-Program (or any work based on the Program), you indicate your acceptance of
-this License to do so, and all its terms and conditions for copying,
-distributing or modifying the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the Program),
-the recipient automatically receives a license from the original licensor to
-copy, distribute or modify the Program subject to these terms and conditions.
-You may not impose any further restrictions on the recipients' exercise of the
-rights granted herein. You are not responsible for enforcing compliance by
-third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or otherwise)
-that contradict the conditions of this License, they do not excuse you from
-the conditions of this License.  If you cannot distribute so as to satisfy
-simultaneously your obligations under this License and any other pertinent
-obligations, then as a consequence you may not distribute the Program at all.
-For example, if a patent license would not permit royalty-free redistribution
-of the Program by all those who receive copies directly or indirectly through
-you, then the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-<P>
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-<P>
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-<P>
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-
-<P>
-
-<STRONG>8.</STRONG>
-If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-<P>
-
-<STRONG>9.</STRONG>
-The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-<P>
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-<P>
-
-<STRONG>10.</STRONG>
-If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-
-
-<P><STRONG>NO WARRANTY</STRONG></P>
-
-<P>
-
-<STRONG>11.</STRONG>
-BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-<P>
-
-<STRONG>12.</STRONG>
-
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-<P>
-
-<h2>License for UTF8</h2>
+- This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License.  The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language.  (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+
+ Activities other than copying, distribution and modification are not covered by this License; they are outside its scope.  The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+
+ You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+ -# You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+
+ -# You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
+
+ -# If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
+
+ These requirements apply to the modified work as a whole.  If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works.  But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+ Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+
+ In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+
+ -# Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+ -# Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+ -# Accompany it with the information you received as to the offer to distribute corresponding source code.  (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
+
+ The source code for a work means the preferred form of the work for making modifications to it.  For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable.  However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+ If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works.  These actions are prohibited by law if you do not accept this License.  Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License.  If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
+
+ If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+ It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices.  Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+ This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded.  In such case, this License incorporates the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time.  Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number.  If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation.  If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission.  For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this.  Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+ __NO WARRANTY__
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+
+----
+
 
 ## License for UTF8
 
diff --git a/doc_src/read.txt b/doc_src/read.txt
index 4fce7d54..845e306d 100644
--- a/doc_src/read.txt
+++ b/doc_src/read.txt
@@ -11,32 +11,34 @@ read [OPTIONS] [VARIABLES...]
 
 The following options are available:
 
-- <tt>-c CMD</tt> or <tt>--command=CMD</tt> sets the initial string in the interactive mode command buffer to <tt>CMD</tt>.
-- <tt>-g</tt> or <tt>--global</tt> makes the variables global.
-- <tt>-l</tt> or <tt>--local</tt> makes the variables local.
-- <tt>-m NAME</tt> or <tt>--mode-name=NAME</tt> specifies that the name NAME should be used to save/load the history file. If NAME is fish, the regular fish history will be available.
-- <tt>-p PROMPT_CMD</tt> or <tt>--prompt=PROMPT_CMD</tt> uses the output of the shell command \c PROMPT_CMD as the prompt for the interactive mode. The default prompt command is <tt>set_color green; echo read; set_color normal; echo "> "</tt>.
-- <code>-s</code> or <code>--shell</code> enables syntax highlighting, tab completions and command termination suitable for entering shellscript code in the interactive mode.
-- <code>-u</code> or <code>--unexport</code> prevents the variables from being exported to child processes (default behaviour).
-- <code>-U</code> or <code>--universal</code> causes the specified shell variable to be made universal.
-- <code>-x</code> or <code>--export</code> exports the variables to child processes.
-- <code>-a</code> or <code>--array</code> stores the result as an array.
-
-\c read reads a single line of input from stdin, breaks it into tokens
-based on the <tt>IFS</tt> shell variable, and then assigns one
-token to each variable specified in <tt>VARIABLES</tt>. If there are more
-tokens than variables, the complete remainder is assigned to the last variable.
-As a special case, if \c IFS is set to the empty string, each character of the
-input is considered a separate token.
-
-If \c -a or \c --array is provided, only one variable name is allowed and the
-tokens are stored as an array in this variable.
+- `-c CMD` or `--command=CMD` sets the initial string in the interactive mode command buffer to `CMD`.
+
+- `-g` or `--global` makes the variables global.
+
+- `-l` or `--local` makes the variables local.
+
+- `-m NAME` or `--mode-name=NAME` specifies that the name NAME should be used to save/load the history file. If NAME is fish, the regular fish history will be available.
+
+- `-p PROMPT_CMD` or `--prompt=PROMPT_CMD` uses the output of the shell command `PROMPT_CMD` as the prompt for the interactive mode. The default prompt command is <code>set_color green; echo read; set_color normal; echo "> "</code>.
+
+- `-s` or `--shell` enables syntax highlighting, tab completions and command termination suitable for entering shellscript code in the interactive mode.
+
+- `-u` or `--unexport` prevents the variables from being exported to child processes (default behaviour).
+
+- `-U` or `--universal` causes the specified shell variable to be made universal.
+
+- `-x` or `--export` exports the variables to child processes.
+
+- `-a` or `--array` stores the result as an array.
+
+`read` reads a single line of input from stdin, breaks it into tokens based on the `IFS` shell variable, and then assigns one token to each variable specified in `VARIABLES`. If there are more tokens than variables, the complete remainder is assigned to the last variable. As a special case, if `IFS` is set to the empty string, each character of the input is considered a separate token.
+
+If `-a` or `--array` is provided, only one variable name is allowed and the tokens are stored as an array in this variable.
 
 
 \subsection read-example Example
 
-The following code stores the value 'hello' in the shell variable
-`$foo`.
+The following code stores the value 'hello' in the shell variable `$foo`.
 
 \fish
 echo hello|read foo
diff --git a/doc_src/test.txt b/doc_src/test.txt
index 101cda97..632e7901 100644
--- a/doc_src/test.txt
+++ b/doc_src/test.txt
@@ -7,9 +7,7 @@ test [EXPRESSION]
 
 \subsection test-description Description
 
-Tests the expression given and sets the exit status to 0 if true,
-and 1 if false. An expression is made up of one or more operators
-and their arguments.
+Tests the expression given and sets the exit status to 0 if true, and 1 if false. An expression is made up of one or more operators and their arguments.
 
 The following operators are available to examine files and directories:
 
@@ -24,11 +22,13 @@ The following operators are available to examine files and directories:
 - `-f FILE` returns true if `FILE` is a regular file.
 
 - `-g FILE` returns true if `FILE` has the set-group-ID bit set.
-- `-G FILE` returns true if `FILE` exists and has the same group ID
-as the current user.
+
+- `-G FILE` returns true if `FILE` exists and has the same group ID as the current user.
+
 - `-L FILE` returns true if `FILE` is a symbolic link.
-- `-O FILE` returns true if `FILE` exists and is owned by the current
-user.
+
+- `-O FILE` returns true if `FILE` exists and is owned by the current user.
+
 - `-p FILE` returns true if `FILE` is a named pipe.
 
 - `-r FILE` returns true if `FILE` is marked as readable.
@@ -46,10 +46,11 @@ user.
 - `-x FILE` returns true if `FILE` is marked as executable.
 
 The following operators are available to compare and examine text strings:
-- `STRING1 = STRING2` returns true if the strings `STRING1` and
-`STRING2` are identical.
-- `STRING1 != STRING2` returns true if the strings `STRING1` and
-`STRING2` are not identical.
+
+- `STRING1 = STRING2` returns true if the strings `STRING1` and `STRING2` are identical.
+
+- `STRING1 != STRING2` returns true if the strings `STRING1` and `STRING2` are not identical.
+
 - `-n STRING` returns true if the length of `STRING` is non-zero.
 
 - `-z STRING` returns true if the length of `STRING` is zero.
@@ -68,9 +69,7 @@ The following operators are available to compare and examine numbers:
 
 - `NUM1 -le NUM2` returns true if `NUM1` is less than or equal to `NUM2`.
 
-Note that only integers are supported. For more complex mathematical
-operations, including fractions, the `env` program may be useful. Consult the
-documentation for your operating system.
+Note that only integers are supported. For more complex mathematical operations, including fractions, the `env` program may be useful. Consult the documentation for your operating system.
 
 Expressions can be combined using the following operators:
 
@@ -79,14 +78,15 @@ Expressions can be combined using the following operators:
 - `COND1 -o COND2` returns true if either `COND1` or `COND2` are true.
 
 Expressions can be inverted using the `!` operator:
-- `! EXPRESSION` returns true if `EXPRESSION` is false, and false if
-`EXPRESSION` is true.
+
+- `! EXPRESSION` returns true if `EXPRESSION` is false, and false if `EXPRESSION` is true.
 
 Expressions can be grouped using parentheses.
 
 - `( EXPRESSION )` returns the value of `EXPRESSION`.
-Note that parentheses will usually require escaping with `\\(` to avoid
-being interpreted as a command substitution.
+
+ Note that parentheses will usually require escaping with `\(` to avoid being interpreted as a command substitution.
+
 
 \subsection test-example Examples
 
@@ -98,19 +98,15 @@ if test -d /tmp
 end
 \endfish
 
-If the variable \c MANPATH is defined and not empty, print the contents.
-(If \c MANPATH is not defined, then it will expand to zero arguments, unless
-quoted.)
+If the variable `MANPATH` is defined and not empty, print the contents. (If `MANPATH` is not defined, then it will expand to zero arguments, unless quoted.)
 
-<pre>
+\fish
 if test -n "$MANPATH"
     echo $MANPATH
 end
 \endfish
 
-Parentheses and the `-o` and `-a` operators can be combined to produce
-more complicated expressions. In this example, success is printed if there is
-a `/foo` or `/bar` file as well as a `/baz` or `/bat` file.
+Parentheses and the `-o` and `-a` operators can be combined to produce more complicated expressions. In this example, success is printed if there is a `/foo` or `/bar` file as well as a `/baz` or `/bat` file.
 
 \fish
 if test \( -f /foo -o -f /bar \) -a \( -f /baz -o -f /bat \)
@@ -121,15 +117,10 @@ end.
 
 \subsection test-standards Standards
 
-`test` implements a subset of the
-<a href="http://www.unix.com/man-page/POSIX/1/test/">IEEE Std 1003.1-2008
-(POSIX.1) standard</a>. The following exceptions apply:
+`test` implements a subset of the <a href="http://www.unix.com/man-page/POSIX/1/test/">IEEE Std 1003.1-2008 (POSIX.1) standard</a>. The following exceptions apply:
+
 - The `<` and `>` operators for comparing strings are not implemented.
-- Because this test is a shell builtin and not a standalone utility, using
- the -c flag on a special file descriptors like standard input and output
- may not return the same result when invoked from within a pipe as one
- would expect when invoking the `test` utility in another shell.
 
- In cases such as this, one can use `command` `test` to explicitly
- use the system's standalone `test` rather than this `builtin` `test`.
+- Because this test is a shell builtin and not a standalone utility, using the -c flag on a special file descriptors like standard input and output may not return the same result when invoked from within a pipe as one would expect when invoking the `test` utility in another shell.
 
+ In cases such as this, one can use `command` `test` to explicitly use the system's standalone `test` rather than this `builtin` `test`.
diff --git a/doc_src/type.txt b/doc_src/type.txt
index 7d2193ef..2f55d72a 100644
--- a/doc_src/type.txt
+++ b/doc_src/type.txt
@@ -11,15 +11,17 @@ With no options, `type` indicates how each `NAME` would be interpreted if used a
 
 The following options are available:
 
-- \c -h or \c --help prints help and then exits.
-- \c -a or \c --all prints all of possible definitions of the specified names.
-- \c -f or \c --no-functions suppresses function and builtin lookup.
-- \c -t or \c --type prints <tt>function</tt>, <tt>builtin</tt>, or <tt>file</tt> if \c NAME is a shell function, builtin, or disk file, respectively.
-- \c -p or \c --path returns the name of the disk file that would be executed, or nothing if 'type  -t  name' would not return 'file'.
-- \c -P or \c --force-path returns the name of the disk file that would be executed, or nothing if no file with the specified name could be found in the <tt>$PATH</tt>.
-- \c -q or \c --quiet suppresses all output; this is useful when testing the exit status.
-
-`type` sets the exit status to 0 if the specified command was found, and 1 if it could not be found.
+- `-a` or `--all` prints all of possible definitions of the specified names.
+
+- `-f` or `--no-functions` suppresses function and builtin lookup.
+
+- `-t` or `--type` prints `function`, `builtin`, or `file` if `NAME` is a shell function, builtin, or disk file, respectively.
+
+- `-p` or `--path` returns the name of the disk file that would be executed, or nothing if `type  -t  name` would not return `file`.
+
+- `-P` or `--force-path` returns the name of the disk file that would be executed, or nothing if no file with the specified name could be found in the <tt>$PATH</tt>.
+
+- `-q` or `--quiet` suppresses all output; this is useful when testing the exit status.
 
 
 \subsection type-example Example
diff --git a/doc_src/user_doc.css b/doc_src/user_doc.css
index a6bf54ef..91dc9f32 100644
--- a/doc_src/user_doc.css
+++ b/doc_src/user_doc.css
@@ -127,7 +127,11 @@ h3 {
     padding-bottom: 10px;
     border-bottom: 1px solid #AAA;
 }
-/*Special Formmating for Code and keys*/
+em {
+    font-style: normal;
+}
+/* Special Formmating */
+/* Keyboard */
 .key span {
     display:none;
 }
@@ -144,70 +148,102 @@ h3 {
     white-space: nowrap;
     box-shadow: 0 1px 2px #ddd;
 }
+/* Console display */
 tt, code, pre, .fish {
     font-family: "DejaVu Sans Mono", "Source Code Pro", Menlo, "Ubuntu Mono", "Consolas", Monaco, "Lucida Console", monospace, fixed;
     font-weight: 500;
     text-shadow: 0 0 0 rgba(0,0,0,0.2);
-}
-tt {
-    color: red; /*REMOVE THIS*/
-}
-code, pre, .line {
     white-space: -moz-pre-wrap;
     white-space: -pre-wrap;
     white-space: -o-pre-wrap;
     white-space: pre-wrap;
     word-wrap: break-word;
 }
-h1 > code, h2 > code, h3 > code {
-    font-family: "DejaVu Sans Mono", Menlo, "Source Code Pro", "Consolas", "Lucida Console", Roboto, Verdana, sans-serif;
-    font-weight: 700;
-}
+
+/*Default 'light' console*/
 .fish {
     margin: 1rem 0;
     padding: 0.6rem 1rem;
-    font-size: 1.3rem;
-    line-height: 1.9rem;
+    font-size: 1.2rem;
+    line-height: 1.8rem;
+    color: #111;
+    text-shadow: 0 0 0 #000; /* Stronger anti-aliasing */
     background-color: #fafafa;
-    border: 1px solid #f0f0f0;
-    border-radius: 0.4rem;
+    border: 1px solid #bbb;
+    border-radius: 0.6rem;
+    box-shadow: 0 0.2rem 0.2rem #ddd;
 }
 
-.comment { color: #777; }
-.command { color: #0A0; }
-.function { color: #0A0; }
-.binary { color: #060; }
-.argument { color: #906; }
-.variable { color: #339; }
-.redirect { color: #F00; }
-.operator { color: #990; }
-.file { color: #c97922; }
-.path { color: #c97922; }
-.string { color: #770; }
-.prompt { color: #03C; }
-.suggest { color: cyan ; }
-.error { color: red; font-weight: bold; }
-.cursor { border-bottom: 2px solid green; }
 
+.comment { color: #555; }
+/*.command, .function, .binary { color: #23326b; }*/
+.command { color: #00F; }
+.binary { color: #F0F; }
+.function { color: #0FF; }
+.string { color: #725000; }
+.operator, .variable { color: #741ba3; }
+.path { color: #F00; }
+.file { color: #0F0; }
+.argument { color: #19c9ff; }
+.redirect { color: #f00; }
+.prompt { color: #000; }
+.cursor { border-bottom: 2px solid #444; }
+.underline { text-decoration: underline; }
 
-/*.keyword, .keywordflow { color: #050; }*/
-/*.stringliteral, .charliteral { color: #226; }*/
-/*.preprocessor, .comment { color: #555; text-shadow: none; }*/
+/*.comment { color: #c33; }
+.command, .function, .binary { color: #2568e2; }
+.argument, .variable, .path, .file { color: #00afff; }
+.redirect { color: #fff; }
+.operator, .match, .history { color: #2ff; }
+.string { color: #c07d2f; }
+.suggest { color: #555; }
+.error { color: #f33; font-weight: bold; }
+.match { color: #2ff; }
+.search_match { background-color: #f2f; }
+.cwd { color: #2f2; }
+.prompt { color: #fff; }
+.cursor { border-bottom: 2px solid #ccc; }
+.underline { text-decoration: underline; }*/
 
+.synopsis {
+    border: none;
+    color: #333;
+    text-shadow: 0 0 0 rgba(0,0,0,0.2);
+    background: none;
+    font-size: 1.3rem;
+    padding: 0;
+    box-shadow: none;
+}
+/* Console variants */
 .cli-dark {
-    background-color: #111;
-    color: #ddd;
-    padding: 0.4rem 2rem;
-    border-radius: 0.4rem;
-}
-/*
-.cli .command {
-    color: #0E0;
-    font-weight: bold;
-}
-.cli .function {
-    color: #0C0;
-}*/
+    background-color: #222;
+    color: #ccc;
+    text-shadow: 0 0 0 #222;
+    padding: 0.6rem 1.2rem;
+    border-radius: 0.6rem;
+}
+.cli-dark .comment { color: #c33; }
+.cli-dark .command, .cli-dark .function, .cli-dark .binary { color: #6159de; }
+.cli-dark .argument, .cli-dark .path, .cli-dark .file { color: #00afff; }
+.cli-dark .redirect { color: #fff; }
+.cli-dark .operator,.cli-dark .variable, .cli-dark .match, .cli-dark .history { color: #2ff; }
+.cli-dark .string { color: #b3b206; }
+.cli-dark .suggest, .cli-dark em { color: #777; }
+.cli-dark .match { color: #2ff; }
+.cli-dark .search_match { background-color: #a100a3; }
+.cli-dark .cwd, .cli-dark .prompt .path { color: #2f2; }
+.cli-dark .prompt { color: #999; }
+.cli-dark .cursor { border-bottom: 2px solid #3F3; }
+.cli-dark .underline { color: #00afff; text-decoration: underline; }
+.cli-dark .error, .cli-dark .error .path { color: #f33; font-weight: bold; }
+.cli-dark .key em, .cli-dark .key b {
+    background-color: #ccc;
+    box-shadow: 0 0.1rem 0 #666;
+    border: 1px solid #333;
+    color: #000;
+    padding: 0 3px;
+}
+
 /*Menus*/
 .menu { margin: 1.4rem 0; line-height: 2.2rem; }
 .menu ul { list-style-type: none; }
diff --git a/lexicon_filter.in b/lexicon_filter.in
index c854d21a..0b254a01 100644
--- a/lexicon_filter.in
+++ b/lexicon_filter.in
@@ -272,8 +272,8 @@ x
 G
 #.
 # Uncomment the folowing two lines (ss) to log the buffer join.
-s/^.*$/JOIN: &/w debug-lexicon.log
-s/^JOIN: //
+s/^.*$/Joined  : &/w lexicon.log
+s/^Joined  : //
 #.
 # Iterate over alternate lines, matching '<' to '\'
 :join
@@ -617,8 +617,8 @@ s/\([^@]\)\([A-Za-z0-9_-][A-Za-z0-9_-]*\.[a-z0-9*][a-z0-9*]*\)/\1@fsfo{\2}/g
 # As the lexicon is written into the output lexicon_filter, portability is
 # automatically handled.
 #.
-#!# sbin whoami
-#!# sbin mkdir
-#!# sbin basename
-#!# cmnd sleep
+#!# cmnd whoami
+#!# cmnd mkdir
+#!# cmnd basename
+#!# bltn sleep
 #!# args in
-- 
cgit v1.2.3


From 6a57a50968d404fe74b557aa6a90a61596cf1386 Mon Sep 17 00:00:00 2001
From: Mark Griffiths <mark@thebespokepixel.com>
Date: Thu, 4 Sep 2014 10:54:18 +0100
Subject: Fix comment collision in lexicon

---
 Makefile.in       |  2 +-
 lexicon_filter.in | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 48cd2467..431f24da 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -361,7 +361,7 @@ lexicon.txt: doc_src/commands.hdr $(FUNCTIONS_DIR_FILES) $(COMPLETIONS_DIR_FILES
 	sed <share/functions/__fish_config_interactive.fish >>lexicon.tmp -n \
 		-e '/set_default/s/.*\(fish_[a-z][a-z_]*\).*$$/clrv \1/p'; \
 	sed <lexicon_filter.in >>lexicon.tmp -n \
-		-e '/^#!#/s/^#!# \(.... [a-z][a-z_]*\)/\1/p'; \
+		-e '/^#.!#/s/^#.!# \(.... [a-z][a-z_]*\)/\1/p'; \
 	mv lexicon.tmp lexicon.txt; rm -f lexicon_catalog.tmp lexicon_catalog.txt;
 
 #
diff --git a/lexicon_filter.in b/lexicon_filter.in
index 0b254a01..ff78f72d 100644
--- a/lexicon_filter.in
+++ b/lexicon_filter.in
@@ -617,8 +617,8 @@ s/\([^@]\)\([A-Za-z0-9_-][A-Za-z0-9_-]*\.[a-z0-9*][a-z0-9*]*\)/\1@fsfo{\2}/g
 # As the lexicon is written into the output lexicon_filter, portability is
 # automatically handled.
 #.
-#!# cmnd whoami
-#!# cmnd mkdir
-#!# cmnd basename
-#!# bltn sleep
-#!# args in
+#.!# cmnd whoami
+#.!# cmnd mkdir
+#.!# cmnd basename
+#.!# bltn sleep
+#.!# args in
-- 
cgit v1.2.3


From 6821f5ef4a80ed08e9f0e9fdea08867c3ac95e26 Mon Sep 17 00:00:00 2001
From: Mark Griffiths <mark@thebespokepixel.com>
Date: Thu, 4 Sep 2014 11:34:43 +0100
Subject: Portable Makefile fix

---
 Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 431f24da..f857cec8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -381,7 +381,7 @@ lexicon_filter: lexicon.txt lexicon_filter.in
 	# /bin or /usr/bin and some versions dont allow more than one comment!.
 	sed <$@.in >$@.tmp -e 's|@sed@|'"`which sed`"'|' -e '/^[ ]*#[^!]/d'
 	# Scan through the lexicon, transforming each line to something useful to Doxygen.
-	if `echo "x" | sed "/[[:<:]]x/d"`; then \
+	if `echo "x" | sed "/[[:<:]]x/d" 2>/dev/null`; then \
 		WORDBL='[[:<:]]'; WORDBR='[[:>:]]'; \
 	else\
 		WORDBL='\\<'; WORDBR='\\>'; \
-- 
cgit v1.2.3


From a04d5fd065a8839767bcbe4adafbbdf0889d5c10 Mon Sep 17 00:00:00 2001
From: Mark Griffiths <mark@thebespokepixel.com>
Date: Mon, 8 Sep 2014 06:54:03 +0100
Subject: Makefile changes

---
 Makefile.in | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index f857cec8..bc2376f8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -262,7 +262,7 @@ prof: all
 user_doc: $(HDR_FILES_SRC) Doxyfile.user $(HTML_SRC) $(HELP_SRC) doc.h $(HDR_FILES) lexicon_filter
 	(cat Doxyfile.user; echo INPUT_FILTER=./lexicon_filter; \
 	echo PROJECT_NUMBER=$(FISH_BUILD_VERSION) | sed "s/-.*//") | doxygen - && touch user_doc; \
-	cd user_doc/html; rm -f bc_s.png bdwn.png closed.png ftv2*.png nav*.png open.png sync_*.png tab*.* doxygen.* dynsections.js jquery.js pages.html
+	cd user_doc/html && rm -f bc_s.png bdwn.png closed.png ftv2*.png nav*.png open.png sync_*.png tab*.* doxygen.* dynsections.js jquery.js pages.html
 
 #
 # Source code documentation. Also includes user documentation.
@@ -277,10 +277,9 @@ doc: *.h *.cpp doc.h Doxyfile lexicon_filter
 #
 
 doc/refman.pdf: doc
-	cd doc/latex; \
-	make; \
-	mv refman.pdf ..; \
-	cd ../..; \
+	cd doc/latex && \
+	make &&  \
+	mv refman.pdf ..;
 	rm -r doc/latex;
 
 
@@ -381,10 +380,10 @@ lexicon_filter: lexicon.txt lexicon_filter.in
 	# /bin or /usr/bin and some versions dont allow more than one comment!.
 	sed <$@.in >$@.tmp -e 's|@sed@|'"`which sed`"'|' -e '/^[ ]*#[^!]/d'
 	# Scan through the lexicon, transforming each line to something useful to Doxygen.
-	if `echo "x" | sed "/[[:<:]]x/d" 2>/dev/null`; then \
+	if echo x | sed "/[[:<:]]x/d" 2>/dev/null; then \
 		WORDBL='[[:<:]]'; WORDBR='[[:>:]]'; \
-	else\
-		WORDBL='\\<'; WORDBR='\\>'; \
+	else \
+		WORDBL='\<'; WORDBR='\>'; \
 	fi; \
 	sed <lexicon.txt >>$@.tmp -n \
 		-e "s|^\([a-z][a-z][a-z][a-z]\) \([a-z_-]*\)$$|s,$$WORDBL\2$$WORDBR,@\1{\2},g|p" \
-- 
cgit v1.2.3