Re: 4.3.4-dev-8

[Peter Stephenson <pws@csr.com>]

On Tue, 29 Jan 2008 09:12:18 -0800
Bart Schaefer <schaefer@brasslantern.com> wrote:
> The section numbers in chapter 13 (Prompt Expansion) are wrong, they
> start with 13.0.1, 13.0.2, etc., rather than 13.1, 13.2.

This appears to be sort of deliberate, because the chapter would have just
one section (as the manual does, but chapters appear to be irrelevant to it)
but we can fudge the issue by generating proper sectioning.  This
divides the manual up a bit more but I don't think that's a problem.

> The heading of 18.5.1
> is "Special Widget" from the days when zle-line-init was the only one,
> but it should probably be plural now.

I've changed this, but if anyone wants the nodes and sections of the entire
document realigned any time soon they'll have to volunteer for it.

Index: Doc/Zsh/prompt.yo
===================================================================
RCS file: /cvsroot/zsh/zsh/Doc/Zsh/prompt.yo,v
retrieving revision 1.8
diff -u -r1.8 prompt.yo
--- Doc/Zsh/prompt.yo	1 Apr 2005 12:04:23 -0000	1.8
+++ Doc/Zsh/prompt.yo	29 Jan 2008 17:30:00 -0000
@@ -1,8 +1,6 @@
 texinode(Prompt Expansion)(Expansion)(Conditional Expressions)(Top)
 chapter(Prompt Expansion)
-ifzman(\
-sect(Prompt Expansion)
-)\
+sect(Expansion of Prompt Sequences)
 cindex(prompt expansion)
 cindex(expansion, prompt)
 Prompt sequences undergo a special form of expansion.  This type of expansion
@@ -31,9 +29,13 @@
 pindex(PROMPT_PERCENT, use of)
 If the tt(PROMPT_PERCENT) option is set, certain escape sequences that
 start with `tt(%)' are expanded.
-Some escapes take an optional integer argument, which
+Many escapes are followed by a single character, although some of these
+take an optional integer argument that
 should appear between the `tt(%)' and the next character of the
-sequence.  The following escape sequences are recognized:
+sequence.  More complicated escape sequences are available to provide
+conditional expansion.
+
+sect(Simple Prompt Escapes)
 
 subsect(Special characters)
 startitem()
@@ -188,7 +190,7 @@
 )
 enditem()
 
-subsect(Conditional substrings)
+sect(Conditional Substrings in Prompts)
 startitem()
 item(tt(%v))(
 vindex(psvar, use of)
Index: Doc/Zsh/zle.yo
===================================================================
RCS file: /cvsroot/zsh/zsh/Doc/Zsh/zle.yo,v
retrieving revision 1.57
diff -u -r1.57 zle.yo
--- Doc/Zsh/zle.yo	10 Nov 2007 14:30:23 -0000	1.57
+++ Doc/Zsh/zle.yo	29 Jan 2008 17:30:01 -0000
@@ -784,7 +784,7 @@
 )
 enditem()
 
-subsect(Special Widget)
+subsect(Special Widgets)
 
 There are a few user-defined widgets which are special to the shell.
 If they do not exist, no special action is taken.  The environment


-- 
Peter Stephenson <pws@csr.com>                  Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, UK                          Tel: +44 (0)1223 692070