diff options
author | Neil Jerram <neil@ossau.uklinux.net> | 2009-08-04 12:10:16 +0100 |
---|---|---|
committer | Neil Jerram <neil@ossau.uklinux.net> | 2009-08-04 12:10:16 +0100 |
commit | 45867c2ace30469cbc40431756ed144762806d8d (patch) | |
tree | a30974a34024be026203b3c2305eb4ff4c58aadb | |
parent | 650ecada5e96d79b7ad6f2437ee5fecb8b87d5fa (diff) | |
download | guile-45867c2ace30469cbc40431756ed144762806d8d.tar.gz |
Fix overfull hboxes
-rw-r--r-- | doc/ref/api-compound.texi | 33 | ||||
-rwxr-xr-x | doc/ref/api-data.texi | 17 | ||||
-rw-r--r-- | doc/ref/api-debug.texi | 38 | ||||
-rw-r--r-- | doc/ref/api-options.texi | 10 | ||||
-rw-r--r-- | doc/ref/autoconf.texi | 11 | ||||
-rw-r--r-- | doc/ref/compiler.texi | 3 | ||||
-rw-r--r-- | doc/ref/goops.texi | 6 | ||||
-rw-r--r-- | doc/ref/intro.texi | 7 | ||||
-rw-r--r-- | doc/ref/libguile-linking.texi | 3 | ||||
-rw-r--r-- | doc/ref/libguile-smobs.texi | 20 | ||||
-rw-r--r-- | doc/ref/scheme-ideas.texi | 6 | ||||
-rw-r--r-- | doc/ref/vm.texi | 14 |
12 files changed, 102 insertions, 66 deletions
diff --git a/doc/ref/api-compound.texi b/doc/ref/api-compound.texi index ba0875700..059390bb8 100644 --- a/doc/ref/api-compound.texi +++ b/doc/ref/api-compound.texi @@ -2001,13 +2001,24 @@ enclosed array is unspecified. For example, @lisp -(enclose-array '#3(((a b c) (d e f)) ((1 2 3) (4 5 6))) 1) +(enclose-array '#3(((a b c) + (d e f)) + ((1 2 3) + (4 5 6))) + 1) @result{} -#<enclosed-array (#1(a d) #1(b e) #1(c f)) (#1(1 4) #1(2 5) #1(3 6))> - -(enclose-array '#3(((a b c) (d e f)) ((1 2 3) (4 5 6))) 1 0) +#<enclosed-array (#1(a d) #1(b e) #1(c f)) + (#1(1 4) #1(2 5) #1(3 6))> + +(enclose-array '#3(((a b c) + (d e f)) + ((1 2 3) + (4 5 6))) + 1 0) @result{} -#<enclosed-array #2((a 1) (d 4)) #2((b 2) (e 5)) #2((c 3) (f 6))> +#<enclosed-array #2((a 1) (d 4)) + #2((b 2) (e 5)) + #2((c 3) (f 6))> @end lisp @end deffn @@ -3083,8 +3094,10 @@ which can be changed. (color ball) (owner ball))) ball-color)) -(define (color ball) (struct-ref (struct-vtable ball) vtable-offset-user)) -(define (owner ball) (struct-ref ball 0)) +(define (color ball) + (struct-ref (struct-vtable ball) vtable-offset-user)) +(define (owner ball) + (struct-ref ball 0)) (define red (make-ball-type 'red)) (define green (make-ball-type 'green)) @@ -3460,7 +3473,8 @@ whole is not a proper list: (assoc "mary" '((1 . 2) ("key" . "door") . "open sesame")) @result{} ERROR: In procedure assoc in expression (assoc "mary" (quote #)): -ERROR: Wrong type argument in position 2 (expecting association list): ((1 . 2) ("key" . "door") . "open sesame") +ERROR: Wrong type argument in position 2 (expecting + association list): ((1 . 2) ("key" . "door") . "open sesame") (sloppy-assoc "mary" '((1 . 2) ("key" . "door") . "open sesame")) @result{} @@ -3474,7 +3488,8 @@ Secondly, if one of the entries in the specified alist is not a pair: (assoc 2 '((1 . 1) 2 (3 . 9))) @result{} ERROR: In procedure assoc in expression (assoc 2 (quote #)): -ERROR: Wrong type argument in position 2 (expecting association list): ((1 . 1) 2 (3 . 9)) +ERROR: Wrong type argument in position 2 (expecting + association list): ((1 . 1) 2 (3 . 9)) (sloppy-assoc 2 '((1 . 1) 2 (3 . 9))) @result{} diff --git a/doc/ref/api-data.texi b/doc/ref/api-data.texi index 6e1a67ae1..690124ba7 100755 --- a/doc/ref/api-data.texi +++ b/doc/ref/api-data.texi @@ -3535,11 +3535,12 @@ For example, to change characters to alternately upper and lower case, @example (define str (string-copy "studly")) -(string-for-each-index (lambda (i) - (string-set! str i - ((if (even? i) char-upcase char-downcase) - (string-ref str i)))) - str) +(string-for-each-index + (lambda (i) + (string-set! str i + ((if (even? i) char-upcase char-downcase) + (string-ref str i)))) + str) str @result{} "StUdLy" @end example @end deffn @@ -4447,7 +4448,8 @@ Or matching a @sc{yyyymmdd} format date such as @samp{20020828} and re-ordering and hyphenating the fields. @lisp -(define date-regex "([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])") +(define date-regex + "([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])") (define s "Date 20020429 12am.") (regexp-substitute #f (string-match date-regex s) 'pre 2 "-" 3 "-" 1 'post " (" 0 ")") @@ -4507,7 +4509,8 @@ example the following is the date example from @code{string-match} call. @lisp -(define date-regex "([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])") +(define date-regex + "([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])") (define s "Date 20020429 12am.") (regexp-substitute/global #f date-regex s 'pre 2 "-" 3 "-" 1 'post " (" 0 ")") diff --git a/doc/ref/api-debug.texi b/doc/ref/api-debug.texi index 78863665d..28dc73233 100644 --- a/doc/ref/api-debug.texi +++ b/doc/ref/api-debug.texi @@ -1732,16 +1732,16 @@ Frame 2 at matrix.scm:8:3 [mkmatrix] debug> next Frame 3 at matrix.scm:4:3 - (let ((x 1)) (quote this-is-a-matric)) + (let ((x 1)) (quote hi!)) debug> info frame Stack frame: 3 This frame is an evaluation. The expression being evaluated is: matrix.scm:4:3: - (let ((x 1)) (quote this-is-a-matric)) + (let ((x 1)) (quote hi!)) debug> next Frame 3 at matrix.scm:5:21 - (quote this-is-a-matric) + (quote hi!) debug> bt In unknown file: ?: 0* [primitive-eval (do-main 4)] @@ -1750,9 +1750,9 @@ In standard input: In matrix.scm: 8: 2 [mkmatrix] ... - 5: 3 (quote this-is-a-matric) + 5: 3 (quote hi!) debug> quit -this-is-a-matric +hi! guile> @end lisp @@ -1813,7 +1813,7 @@ guile> (do-main 4) | 5: (memq sym bindings) | 5: [memq let (debug)] | 5: =>#f -| 2: (letrec ((yy 23)) (let ((x 1)) (quote this-is-a-matric))) +| 2: (letrec ((yy 23)) (let ((x 1)) (quote hi!))) | 3: [#<procedure #f (a sym definep)> #<autoload # b7c93870> let #f] | 3: [#<procedure #f (a sym definep)> #<autoload # b7c93870> let #f] | 4: (and (memq sym bindings) (let ...)) @@ -1832,7 +1832,7 @@ guile> (do-main 4) | 5: (memq sym bindings) | 5: [memq let (debug)] | 5: =>#f -| 2: (let ((x 1)) (quote this-is-a-matric)) +| 2: (let ((x 1)) (quote hi!)) | 3: [#<procedure #f (a sym definep)> #<autoload # b7c93870> let #f] | 3: [#<procedure #f (a sym definep)> #<autoload # b7c93870> let #f] | 4: (and (memq sym bindings) (let ...)) @@ -1841,15 +1841,15 @@ guile> (do-main 4) | 5: =>#f | 2: [let (let # #) (# # #)] | 2: [let (let # #) (# # #)] -| 2: =>(#@@let* (x 1) #@@let (quote this-is-a-matric)) -this-is-a-matric +| 2: =>(#@@let* (x 1) #@@let (quote hi!)) +hi! guile> (do-main 4) | 2: [mkmatrix] -| 2: (letrec ((yy 23)) (let* ((x 1)) (quote this-is-a-matric))) -| 2: (let* ((x 1)) (quote this-is-a-matric)) -| 2: (quote this-is-a-matric) -| 2: =>this-is-a-matric -this-is-a-matric +| 2: (letrec ((yy 23)) (let* ((x 1)) (quote hi!))) +| 2: (let* ((x 1)) (quote hi!)) +| 2: (quote hi!) +| 2: =>hi! +hi! guile> @end lisp @@ -1881,11 +1881,11 @@ each trace line instead of the stack depth. guile> (set-trace-layout "|~16@@a: ~a\n" trace/source trace/info) guile> (do-main 4) | matrix.scm:7:2: [mkmatrix] -| : (letrec ((yy 23)) (let* ((x 1)) (quote this-is-a-matric))) -| matrix.scm:3:2: (let* ((x 1)) (quote this-is-a-matric)) -| matrix.scm:4:4: (quote this-is-a-matric) -| matrix.scm:4:4: =>this-is-a-matric -this-is-a-matric +| : (letrec ((yy 23)) (let* ((x 1)) (quote hi!))) +| matrix.scm:3:2: (let* ((x 1)) (quote hi!)) +| matrix.scm:4:4: (quote hi!) +| matrix.scm:4:4: =>hi! +hi! guile> @end lisp diff --git a/doc/ref/api-options.texi b/doc/ref/api-options.texi index 20e32c51c..f5441e219 100644 --- a/doc/ref/api-options.texi +++ b/doc/ref/api-options.texi @@ -82,10 +82,11 @@ general are stored. On Unix-like systems, this is usually @deffnx {C Function} scm_sys_library_dir () Return the name of the directory where the Guile Scheme files that belong to the core Guile installation (as opposed to files from a 3rd -party package) are installed. On Unix-like systems, this is usually +party package) are installed. On Unix-like systems this is usually @file{/usr/local/share/guile/<GUILE_EFFECTIVE_VERSION>} or -@file{/usr/share/guile/<GUILE_EFFECTIVE_VERSION>}, for example: -@file{/usr/local/share/guile/1.6}. +@file{/usr/share/guile/<GUILE_EFFECTIVE_VERSION>}; + +@noindent for example @file{/usr/local/share/guile/1.6}. @end deffn @deffn {Scheme Procedure} %site-dir @@ -680,7 +681,8 @@ the maximum stack size, use @code{debug-set!}, for example: @lisp (debug-set! stack 200000) @result{} -(show-file-name #t stack 200000 debug backtrace depth 20 maxdepth 1000 frames 3 indent 10 width 79 procnames cheap) +(show-file-name #t stack 200000 debug backtrace depth 20 + maxdepth 1000 frames 3 indent 10 width 79 procnames cheap) (non-tail-recursive-factorial 500) @result{} diff --git a/doc/ref/autoconf.texi b/doc/ref/autoconf.texi index 1cee3eab4..9c92c53e7 100644 --- a/doc/ref/autoconf.texi +++ b/doc/ref/autoconf.texi @@ -48,12 +48,11 @@ checks. @cindex pkg-config @cindex autoconf -GNU Guile provides a @dfn{pkg-config} description file, installed as -@file{@var{prefix}/lib/pkgconfig/guile-1.8.pc}, which contains all the -information necessary to compile and link C applications that use Guile. -The @code{pkg-config} program is able to read this file and provide this -information to application programmers; it can be obtained at -@url{http://pkg-config.freedesktop.org/}. +GNU Guile provides a @dfn{pkg-config} description file, which contains +all the information necessary to compile and link C applications that +use Guile. The @code{pkg-config} program is able to read this file +and provide this information to application programmers; it can be +obtained at @url{http://pkg-config.freedesktop.org/}. The following command lines give respectively the C compilation and link flags needed to build Guile-using programs: diff --git a/doc/ref/compiler.texi b/doc/ref/compiler.texi index f8d0895d9..1837701ff 100644 --- a/doc/ref/compiler.texi +++ b/doc/ref/compiler.texi @@ -516,7 +516,8 @@ be wrapped in a thunk that declares the arity of the expression: @example scheme@@(guile-user)> ,language glil -Guile Lowlevel Intermediate Language (GLIL) interpreter 0.3 on Guile 1.9.0 +Guile Lowlevel Intermediate Language (GLIL) interpreter 0.3 on + Guile 1.9.0 Copyright (C) 2001-2008 Free Software Foundation, Inc. Enter `,help' for help. diff --git a/doc/ref/goops.texi b/doc/ref/goops.texi index 83a2a51d1..1abac846c 100644 --- a/doc/ref/goops.texi +++ b/doc/ref/goops.texi @@ -1041,7 +1041,8 @@ allocation to do this. (let ((batch-allocation-count 0) (batch-get-n-set #f)) - (define-method (compute-get-n-set (class <batched-allocation-metaclass>) s) + (define-method (compute-get-n-set + (class <batched-allocation-metaclass>) s) (case (slot-definition-allocation s) ((#:batched) ;; If we've already used the same slot storage for 10 instances, @@ -2009,7 +2010,8 @@ is specialized for this metaclass: @example (define-class <can-be-nameless> (<class>)) -(define-method (class-redefinition (old <can-be-nameless>) (new <class>)) +(define-method (class-redefinition (old <can-be-nameless>) + (new <class>)) new) @end example diff --git a/doc/ref/intro.texi b/doc/ref/intro.texi index 7ddaf7cb3..7e248e0e8 100644 --- a/doc/ref/intro.texi +++ b/doc/ref/intro.texi @@ -472,11 +472,12 @@ You can get the version number by invoking the command @example $ guile --version Guile 1.9.0 -Copyright (c) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation +Copyright (c) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, +2005, 2006, 2007, 2008, 2009 Free Software Foundation Guile may be distributed under the terms of the GNU Lesser General Public Licence. For details, see the files `COPYING.LESSER' and -`COPYING', which are included in the Guile distribution. There is no -warranty, to the extent permitted by law. +`COPYING', which are included in the Guile distribution. There is +no warranty, to the extent permitted by law. @end example @item diff --git a/doc/ref/libguile-linking.texi b/doc/ref/libguile-linking.texi index 8869c46d5..72b59bbba 100644 --- a/doc/ref/libguile-linking.texi +++ b/doc/ref/libguile-linking.texi @@ -173,7 +173,8 @@ creating ./config.status creating Makefile $ make gcc -c -I/usr/local/include simple-guile.c -gcc simple-guile.o -L/usr/local/lib -lguile -lqthreads -lpthread -lm -o simple-guile +gcc simple-guile.o -L/usr/local/lib -lguile -lqthreads -lpthread -lm + -o simple-guile $ ./simple-guile guile> (+ 1 2 3) 6 diff --git a/doc/ref/libguile-smobs.texi b/doc/ref/libguile-smobs.texi index 05c72aff0..738809d7a 100644 --- a/doc/ref/libguile-smobs.texi +++ b/doc/ref/libguile-smobs.texi @@ -211,7 +211,8 @@ make_image (SCM name, SCM s_width, SCM s_height) /* Step 1: Allocate the memory block. */ - image = (struct image *) scm_gc_malloc (sizeof (struct image), "image"); + image = (struct image *) + scm_gc_malloc (sizeof (struct image), "image"); /* Step 2: Initialize it with straight code. */ @@ -228,7 +229,8 @@ make_image (SCM name, SCM s_width, SCM s_height) /* Step 4: Finish the initialization. */ image->name = name; - image->pixels = scm_gc_malloc (width * height, "image pixels"); + image->pixels = + scm_gc_malloc (width * height, "image pixels"); return smob; @} @@ -404,7 +406,9 @@ free_image (SCM image_smob) @{ struct image *image = (struct image *) SCM_SMOB_DATA (image_smob); - scm_gc_free (image->pixels, image->width * image->height, "image pixels"); + scm_gc_free (image->pixels, + image->width * image->height, + "image pixels"); scm_gc_free (image, sizeof (struct image), "image"); return 0; @@ -583,7 +587,8 @@ make_image (SCM name, SCM s_width, SCM s_height) /* Step 1: Allocate the memory block. */ - image = (struct image *) scm_gc_malloc (sizeof (struct image), "image"); + image = (struct image *) + scm_gc_malloc (sizeof (struct image), "image"); /* Step 2: Initialize it with straight code. */ @@ -600,7 +605,8 @@ make_image (SCM name, SCM s_width, SCM s_height) /* Step 4: Finish the initialization. */ image->name = name; - image->pixels = scm_gc_malloc (width * height, "image pixels"); + image->pixels = + scm_gc_malloc (width * height, "image pixels"); return smob; @} @@ -642,7 +648,9 @@ free_image (SCM image_smob) @{ struct image *image = (struct image *) SCM_SMOB_DATA (image_smob); - scm_gc_free (image->pixels, image->width * image->height, "image pixels"); + scm_gc_free (image->pixels, + image->width * image->height, + "image pixels"); scm_gc_free (image, sizeof (struct image), "image"); return 0; diff --git a/doc/ref/scheme-ideas.texi b/doc/ref/scheme-ideas.texi index 38b105b94..55093cf92 100644 --- a/doc/ref/scheme-ideas.texi +++ b/doc/ref/scheme-ideas.texi @@ -390,7 +390,11 @@ this: @noindent This is a valid procedure invocation expression, and its result is the -string @code{"Name=FSF:Address=Cambridge"}. +string: + +@lisp +"Name=FSF:Address=Cambridge" +@end lisp It is more common, though, to store the procedure value in a variable --- diff --git a/doc/ref/vm.texi b/doc/ref/vm.texi index fa655238f..28fa43b1b 100644 --- a/doc/ref/vm.texi +++ b/doc/ref/vm.texi @@ -297,19 +297,19 @@ scheme@@(guile-user)> (define (foo a) (lambda (b) (list foo a b))) scheme@@(guile-user)> ,x foo Disassembly of #<program foo (a)>: - 0 (local-ref 0) ;; `a' (arg) - 2 (external-set 0) ;; `a' (arg) - 4 (object-ref 1) ;; #<program b70d2910 at <unknown port>:0:16 (b)> + 0 (local-ref 0) ;; `a' (arg) + 2 (external-set 0) ;; `a' (arg) + 4 (object-ref 1) ;; #<program b70d2910 at <unknown port>:0:16 (b)> 6 (make-closure) 7 (return) ---------------------------------------- Disassembly of #<program b70d2910 at <unknown port>:0:16 (b)>: - 0 (toplevel-ref 1) ;; `foo' - 2 (external-ref 0) ;; (closure variable) - 4 (local-ref 0) ;; `b' (arg) - 6 (list 0 3) ;; 3 elements at (unknown file):0:28 + 0 (toplevel-ref 1) ;; `foo' + 2 (external-ref 0) ;; (closure variable) + 4 (local-ref 0) ;; `b' (arg) + 6 (list 0 3) ;; 3 elements at (unknown file):0:28 9 (return) @end smallexample |