1.0.5.13: better wordbreaks in manual

	Patch from Richard Kreuter, sbcl-devel 2006-12-22

	Also fix the Gray input stream example to inherit from an input
	stream rather than from an output stream.

5 files changed, 31 insertions, 3 deletions

diff --git a/doc/manual/docstrings.lisp b/doc/manual/docstrings.lisp
index fbefde629..1177d3db1 100644
--- a/doc/manual/docstrings.lisp
+++ b/doc/manual/docstrings.lisp
@@ -702,7 +702,7 @@ followed another tabulation label or a tabulation body."
   (when (member (get-kind doc) '(class structure condition))
     (let ((name (get-name doc)))
       ;; class precedence list
-      (format *texinfo-output* "Class precedence list: @code{~(~{@w{~A}~^, ~}~)}~%~%"
+      (format *texinfo-output* "Class precedence list: @code{~(~{@lw{~A}~^, ~}~)}~%~%"
               (remove-if (lambda (class)  (hide-superclass-p name class))
                          (mapcar #'class-name (ensure-class-precedence-list (find-class name)))))
       ;; slots
diff --git a/doc/manual/gray-streams-examples.texinfo b/doc/manual/gray-streams-examples.texinfo
index b2d3ed11d..c26d699d0 100644
--- a/doc/manual/gray-streams-examples.texinfo
+++ b/doc/manual/gray-streams-examples.texinfo
@@ -48,7 +48,7 @@ character input streams must implement @codew{stream-read-char} and
 
 @group
 (defclass wrapped-character-input-stream
-    (wrapped-stream fundamental-character-output-stream)
+    (wrapped-stream fundamental-character-input-stream)
   ())
 @end group
 
diff --git a/doc/manual/sbcl.texinfo b/doc/manual/sbcl.texinfo
index a1aa2899a..1bb042d42 100644
--- a/doc/manual/sbcl.texinfo
+++ b/doc/manual/sbcl.texinfo
@@ -4,6 +4,7 @@
 @settitle SBCL User Manual
 @c %**end of header
 
+@include texinfo-macros.texinfo
 @include variables.texinfo
 @set EDITION 0.1
 @settitle SBCL @value{VERSION} User Manual 
diff --git a/doc/manual/texinfo-macros.texinfo b/doc/manual/texinfo-macros.texinfo
new file mode 100644
index 000000000..95f47cf9d
--- /dev/null
+++ b/doc/manual/texinfo-macros.texinfo
@@ -0,0 +1,27 @@
+@c Some plain TeX macrology to wrap text in \hbox{} only if the text
+@c contains no hyphens.
+@iftex
+@tex
+\newif\ifdash
+\long\def\dashp#1{\expandafter\setnext#1-\dashphelper}
+\long\def\setnext#1-{\futurelet\next\dashphelper}
+\long\def\dashphelper#1\dashphelper{
+  \ifx\dashphelper\next\dashfalse\else\dashtrue\fi
+}
+\def\lw#1{\leavevmode\dashp{#1}\ifdash#1\else\hbox{#1}\fi}
+@end tex
+@end iftex
+
+@c A Texinfo binding for the plain TeX above.  Analogous to Texinfo's
+@c @w, but for Lisp symbols.  AFAICT, the comment characters are
+@c necessary to prevent treating the newline as a space.
+@macro lw{word}
+@iftex
+@tex
+\\lw{\word\}%
+@end tex
+@end iftex
+@ifnottex
+\word\@c
+@end ifnottex
+@end macro
diff --git a/version.lisp-expr b/version.lisp-expr
index 6bdba7d15..2c08dfb14 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.5.12"
+"1.0.5.13"