improve breaks in 8.5x11

10 files changed, 58 insertions, 39 deletions

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 6cbe742cb5..6eaa9482cb 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,17 @@
+2007-04-11  Karl Berry  <karl@gnu.org>
+
+	* anti.texi (Antinews),
+	* display.texi (Overlay Properties) and (Defining Images),
+	* processes.texi (Synchronous Processes) and (Sentinels),
+	* syntax.texi (Syntax Table Internals),
+	* searching.texi (Regexp Special),
+	* nonascii.texi (Default Coding Systems),
+	* text.texi (Special Properties),
+	* minibuf.texi (Basic Completion): Wording to improve breaks in
+	8.5x11 format.
+	* elisp.texi (smallbook): new @set to more easily switch between
+	smallbook and 8.5x11.
+
 2007-04-11  Richard Stallman  <rms@gnu.org>
 
 	* text.texi (Lazy Properties): Minor fix.
diff --git a/lispref/anti.texi b/lispref/anti.texi
index de07936d2f..b258e959a4 100644
--- a/lispref/anti.texi
+++ b/lispref/anti.texi
@@ -433,11 +433,10 @@ The @code{table} argument to @code{translate-region} can no longer be
 a char-table; it has to be a string.
 
 @item
-The two functions @code{merge-coding-systems} and
-@code{decode-coding-inserted-region}, and the variable
-@code{auto-coding-functions}, have been deleted.  The
-@code{mime-text-unsuitable} coding system property no longer has any
-special meaning.
+The variable @code{auto-coding-functions} and the two functions
+@code{merge-coding-systems} and @code{decode-coding-inserted-region}
+have been deleted.  The coding system property
+@code{mime-text-unsuitable} no longer has any special meaning.
 
 @item
 If pure storage overflows while dumping, Emacs won't tell you how much
diff --git a/lispref/display.texi b/lispref/display.texi
index 4d94ba1ec4..0d2a8da875 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -1365,7 +1365,7 @@ specify a particular attribute for certain text.  @xref{Face
 Attributes}.
 
 @item
-A cons cell of the form @code{(foreground-color . @var{color-name})} or
+A cons cell, either of the form @code{(foreground-color . @var{color-name})} or
 @code{(background-color . @var{color-name})}.  These elements specify
 just the foreground color or just the background color.
 
@@ -4138,8 +4138,8 @@ should specify the image as follows:
 This function returns a suitable search path for images used by the
 Lisp package @var{library}.
 
-The function searches for @var{image} first in @code{image-load-path}
-(excluding @file{@code{data-directory}/images}) and then in
+The function searches for @var{image} first using @code{image-load-path},
+excluding @file{@code{data-directory}/images}, and then in
 @code{load-path}, followed by a path suitable for @var{library}, which
 includes @file{../../etc/images} and @file{../etc/images} relative to
 the library file itself, and finally in
diff --git a/lispref/elisp.texi b/lispref/elisp.texi
index 5c05a17a95..5d5d03315c 100644
--- a/lispref/elisp.texi
+++ b/lispref/elisp.texi
@@ -14,17 +14,22 @@
 * Elisp: (elisp).       The Emacs Lisp Reference Manual.
 @end direntry
 
-@c So that anyone making the printed manual gets the version we have
-@c tuned to avoid bad line breaks, etc.
+@c for full 8.5x11, comment this out.
+@set smallbook
+
+@ifset smallbook
 @smallbook
+@end ifset
 
 @c per rms and peterb, use 10pt fonts for the main text, mostly to
 @c save on paper cost.  Also, do not declare @setchapternewpage odd,
 @c for the same reason. Do this inside @tex for now, so the
 @c last-released makeinfo does not complain.
 @tex
+@ifset smallbook
 @fonttextsize 10
-\global\hbadness=6000 % don't worry about not-too-underfull boxes
+@end ifset
+\global\hbadness=6666 % don't worry about not-too-underfull boxes
 @end tex
 
 @c Combine indices.
@@ -61,7 +66,7 @@ Software Foundation raise funds for GNU development.''
 @titlepage
 @title GNU Emacs Lisp Reference Manual
 @subtitle For Emacs Version @value{EMACSVER}
-@subtitle Revision @value{VERSION}, January 2002
+@subtitle Revision @value{VERSION}, April 2007
 
 @author by Bil Lewis, Dan LaLiberte, Richard Stallman
 @author and the GNU Manual Group
diff --git a/lispref/minibuf.texi b/lispref/minibuf.texi
index efe2d7575c..98901df87f 100644
--- a/lispref/minibuf.texi
+++ b/lispref/minibuf.texi
@@ -767,7 +767,7 @@ completion possibility specified by @var{collection} and
 strings, this is true if @var{string} appears in the list and
 @var{predicate} is satisfied.
 
-@code{test-completion} uses @code{completion-regexp-list} in the same
+This function uses @code{completion-regexp-list} in the same
 way that @code{try-completion} does.
 
 If @var{predicate} is non-@code{nil} and if @var{collection} contains
diff --git a/lispref/nonascii.texi b/lispref/nonascii.texi
index 899899f8f9..dd0f15c817 100644
--- a/lispref/nonascii.texi
+++ b/lispref/nonascii.texi
@@ -1105,11 +1105,11 @@ for decoding (in case @var{operation} does decoding), and
 @var{encoding-system} is the coding system for encoding (in case
 @var{operation} does encoding).
 
-The argument @var{operation} should be a symbol, any one of
-@code{insert-file-contents}, @code{write-region},
+The argument @var{operation} is a symbol, one of @code{write-region},
 @code{start-process}, @code{call-process}, @code{call-process-region},
-or @code{open-network-stream}.  These are the names of the Emacs I/O
-primitives that can do character code and eol conversion.
+@code{insert-file-contents}, or @code{open-network-stream}.  These are
+the names of the Emacs I/O primitives that can do character code and
+eol conversion.
 
 The remaining arguments should be the same arguments that might be given
 to the corresponding I/O primitive.  Depending on the primitive, one
@@ -1165,9 +1165,9 @@ of the right way to use the variable:
   (insert-file-contents filename))
 @end example
 
-When its value is non-@code{nil}, @code{coding-system-for-read} takes
-precedence over all other methods of specifying a coding system to use for
-input, including @code{file-coding-system-alist},
+When its value is non-@code{nil}, this variable takes precedence over
+all other methods of specifying a coding system to use for input,
+including @code{file-coding-system-alist},
 @code{process-coding-system-alist} and
 @code{network-coding-system-alist}.
 @end defvar
diff --git a/lispref/processes.texi b/lispref/processes.texi
index 34b9b34e76..fbc8b785c1 100644
--- a/lispref/processes.texi
+++ b/lispref/processes.texi
@@ -349,7 +349,7 @@ handler could be different from the handler chosen for the
 @var{infile} is on another remote host.  Or @code{default-directory}
 could be non-special, whereas @var{infile} is on a remote host.)
 
-If @var{buffer} has the form @code{(@var{real-destination}
+If @var{buffer} is a list of the form @code{(@var{real-destination}
 @var{error-destination})}, and @var{error-destination} names a file,
 then the same remarks as for @var{infile} apply.
 
@@ -2066,8 +2066,9 @@ number @var{p}.  @code{format-network-address} converts that to the
 string @code{"@var{a}.@var{b}.@var{c}.@var{d}:@var{p}"}.
 
 A nine-element vector @code{[@var{a} @var{b} @var{c} @var{d} @var{e}
-@var{f} @var{g} @var{h} @var{p}]} represents an IPv6 address and port
-number.  @code{format-network-address} converts that to the string
+@var{f} @var{g} @var{h} @var{p}]} represents an IPv6 address along
+with a port number.  @code{format-network-address} converts that to
+the string
 @code{"[@var{a}:@var{b}:@var{c}:@var{d}:@var{e}:@var{f}:@var{g}:@var{h}]:@var{p}"}.
 
 If the vector does not include the port number, @var{p}, or if
diff --git a/lispref/searching.texi b/lispref/searching.texi
index 056e1bd51a..10e8c67296 100644
--- a/lispref/searching.texi
+++ b/lispref/searching.texi
@@ -309,17 +309,16 @@ first tries to match all three @samp{a}s; but the rest of the pattern is
 The next alternative is for @samp{a*} to match only two @samp{a}s.  With
 this choice, the rest of the regexp matches successfully.
 
-@strong{Warning:} Nested repetition operators take a long time,
-or even forever, if they
-lead to ambiguous matching.  For example, trying to match the regular
-expression @samp{\(x+y*\)*a} against the string
-@samp{xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxz} could take hours before it
-ultimately fails.  Emacs must try each way of grouping the 35
-@samp{x}s before concluding that none of them can work.  Even worse,
-@samp{\(x*\)*} can match the null string in infinitely many ways, so
-it causes an infinite loop.  To avoid these problems, check nested
-repetitions carefully, to make sure that they do not cause combinatorial
-explosions in backtracking.
+@strong{Warning:} Nested repetition operators can run for an
+indefinitely long time, if they lead to ambiguous matching.  For
+example, trying to match the regular expression @samp{\(x+y*\)*a}
+against the string @samp{xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxz} could
+take hours before it ultimately fails.  Emacs must try each way of
+grouping the @samp{x}s before concluding that none of them can work.
+Even worse, @samp{\(x*\)*} can match the null string in infinitely
+many ways, so it causes an infinite loop.  To avoid these problems,
+check nested repetitions carefully, to make sure that they do not
+cause combinatorial explosions in backtracking.
 
 @item @samp{+}
 @cindex @samp{+} in regexp
diff --git a/lispref/syntax.texi b/lispref/syntax.texi
index 1e4b1b1fef..340f74632b 100644
--- a/lispref/syntax.texi
+++ b/lispref/syntax.texi
@@ -1011,8 +1011,9 @@ corresponds to each syntax flag.
 @end multitable
 
 @defun string-to-syntax @var{desc}
-This function returns the internal form @code{(@var{syntax-code} .
-@var{matching-char})} corresponding to the syntax descriptor @var{desc}.
+This function returns the internal form corresponding to the syntax
+descriptor @var{desc}, a cons cell @code{(@var{syntax-code}
+. @var{matching-char})}.
 @end defun
 
 @defun syntax-after pos
diff --git a/lispref/text.texi b/lispref/text.texi
index f56f95b70d..148bf0025a 100644
--- a/lispref/text.texi
+++ b/lispref/text.texi
@@ -2987,13 +2987,13 @@ time you want to specify a particular attribute for certain text.
 @xref{Face Attributes}.
 
 @item
-A cons cell of the form @code{(foreground-color . @var{color-name})} or
+A cons cell with the form @code{(foreground-color . @var{color-name})} or
 @code{(background-color . @var{color-name})}.  These elements specify
 just the foreground color or just the background color.  @xref{Color
 Names}, for the supported forms of @var{color-name}.
 
-@code{(foreground-color . @var{color-name})} is equivalent to
-specifying @code{(:foreground @var{color-name})}, and likewise for the
+A cons cell of @code{(foreground-color . @var{color-name})} is equivalent to
+specifying @code{(:foreground @var{color-name})}; likewise for the
 background.
 @end itemize