Fix typo.

diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index caf5f7b25a133c7ed10307d6b44d6eedb7455db1..61cee6ddb53f5ed5dd8c28cd31613647923fc514 100644 (file)
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/runtime.pkg,v 14.131 1992/01/30 00:38:28 arthur Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/runtime.pkg,v 14.132 1992/02/04 23:59:37 cph Exp $
 
-Copyright (c) 1988-91 Massachusetts Institute of Technology
+Copyright (c) 1988-92 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -2029,6 +2029,11 @@ MIT in each case. |#
   (files "x11graph")
   (parent ())
   (export ()
+         x-character-bounds/ascent
+         x-character-bounds/descent
+         x-character-bounds/lbearing
+         x-character-bounds/rbearing
+         x-character-bounds/width
          x-close-all-displays
          x-close-display
          x-colormap/allocate-color
@@ -2037,6 +2042,16 @@ MIT in each case. |#
          x-colormap/store-color
          x-colormap/store-colors
          x-colormap?
+         x-font-structure/all-chars-exist?
+         x-font-structure/character-bounds
+         x-font-structure/default-char
+         x-font-structure/direction
+         x-font-structure/max-ascent
+         x-font-structure/max-bounds
+         x-font-structure/max-descent
+         x-font-structure/min-bounds
+         x-font-structure/name
+         x-font-structure/start-index
          x-geometry-string
          x-graphics-device-type
          x-image/destroy
@@ -2049,21 +2064,7 @@ MIT in each case. |#
          x-image/width
          x-image?
          x-open-display
-         x-font-structure/name
-         x-font-structure/direction
-         x-font-structure/all-chars-exist
-         x-font-structure/default-char
-         x-font-structure/min-bounds
-         x-font-structure/max-bounds
-         x-font-structure/start-index
-         x-font-structure/character-bounds
-         x-font-structure/max-ascent
-         x-font-structure/max-descent
-         x-character-bounds/lbearing
-         x-character-bounds/rbearing
-         x-character-bounds/width
-         x-character-bounds/ascent
-         x-character-bounds/descent)
+         )
   (initialization (initialize-package!)))
 
 (define-package (runtime starbase-graphics)

diff --git a/v7/src/runtime/starbase.scm b/v7/src/runtime/starbase.scm
index 05b014cbec34957a6e4b45d27c254ad64c7a2e4c..45a3b22c69eba9df333e5b2929ee443779e2c493 100644 (file)
--- a/v7/src/runtime/starbase.scm
+++ b/v7/src/runtime/starbase.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/starbase.scm,v 1.8 1992/01/30 23:29:01 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/starbase.scm,v 1.9 1992/02/04 23:59:26 cph Exp $
 
-Copyright (c) 1989-91 Massachusetts Institute of Technology
+Copyright (c) 1989-92 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -97,9 +97,9 @@ MIT in each case. |#
   unspecific)
 
 (define starbase-graphics-device-type)
-
+\f
 (define-structure (starbase-graphics-descriptor
-                  (conc-name starbase-descriptor/)
+                  (conc-name starbase-graphics-descriptor/)
                   (constructor make-starbase-descriptor (identifier)))
   (identifier false read-only true)
   x-left
@@ -115,18 +115,18 @@ MIT in each case. |#
   (starbase-graphics-descriptor/identifier
    (graphics-device/descriptor device)))
 
-(let-syntax ((define-accessors-and-mutators
-              (macro (name)
-                `(begin
-                   (define (,(symbol-append 'starbase-device/ name) device)
-                     (,(symbol-append 'starbase-graphics-descriptor/ name)
-                      (graphics-device/descriptor device)))
-                   (define (,(symbol-append 'set-starbase-device/ name '!)
-                            device value)
-                     (,(symbol-append
-                        'set-starbase-graphics-descriptor/ name '!)
-                      (graphics-device/descriptor device)
-                      value))))))
+(let-syntax
+    ((define-accessors-and-mutators
+       (macro (name)
+        `(BEGIN
+           (DEFINE (,(symbol-append 'STARBASE-DEVICE/ name) DEVICE)
+             (,(symbol-append 'STARBASE-GRAPHICS-DESCRIPTOR/ name)
+              (GRAPHICS-DEVICE/DESCRIPTOR DEVICE)))
+           (DEFINE (,(symbol-append 'SET-STARBASE-DEVICE/ name '!)
+                    DEVICE VALUE)
+             (,(symbol-append 'SET-STARBASE-GRAPHICS-DESCRIPTOR/ name '!)
+              (GRAPHICS-DEVICE/DESCRIPTOR DEVICE)
+              VALUE))))))
   (define-accessors-and-mutators x-left)
   (define-accessors-and-mutators y-bottom)
   (define-accessors-and-mutators x-right)

diff --git a/v8/src/runtime/runtime.pkg b/v8/src/runtime/runtime.pkg
index c8c6eb8de9cf3b14202ed069e2c1dbc88f12b771..0f83cc56d60eb002d87cb0c01500c5cf4350fc1f 100644 (file)
--- a/v8/src/runtime/runtime.pkg
+++ b/v8/src/runtime/runtime.pkg
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/runtime.pkg,v 14.131 1992/01/30 00:38:28 arthur Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/runtime.pkg,v 14.132 1992/02/04 23:59:37 cph Exp $
 
-Copyright (c) 1988-91 Massachusetts Institute of Technology
+Copyright (c) 1988-92 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -2029,6 +2029,11 @@ MIT in each case. |#
   (files "x11graph")
   (parent ())
   (export ()
+         x-character-bounds/ascent
+         x-character-bounds/descent
+         x-character-bounds/lbearing
+         x-character-bounds/rbearing
+         x-character-bounds/width
          x-close-all-displays
          x-close-display
          x-colormap/allocate-color
@@ -2037,6 +2042,16 @@ MIT in each case. |#
          x-colormap/store-color
          x-colormap/store-colors
          x-colormap?
+         x-font-structure/all-chars-exist?
+         x-font-structure/character-bounds
+         x-font-structure/default-char
+         x-font-structure/direction
+         x-font-structure/max-ascent
+         x-font-structure/max-bounds
+         x-font-structure/max-descent
+         x-font-structure/min-bounds
+         x-font-structure/name
+         x-font-structure/start-index
          x-geometry-string
          x-graphics-device-type
          x-image/destroy
@@ -2049,21 +2064,7 @@ MIT in each case. |#
          x-image/width
          x-image?
          x-open-display
-         x-font-structure/name
-         x-font-structure/direction
-         x-font-structure/all-chars-exist
-         x-font-structure/default-char
-         x-font-structure/min-bounds
-         x-font-structure/max-bounds
-         x-font-structure/start-index
-         x-font-structure/character-bounds
-         x-font-structure/max-ascent
-         x-font-structure/max-descent
-         x-character-bounds/lbearing
-         x-character-bounds/rbearing
-         x-character-bounds/width
-         x-character-bounds/ascent
-         x-character-bounds/descent)
+         )
   (initialization (initialize-package!)))
 
 (define-package (runtime starbase-graphics)