gtk: Fix documentation and tests.

Match @deffnx and symbol names containing : and /.  Document
gtk-graphics/make; punt gtk-graphics-device-type.  Fix old spelling of
tellurion in tests.

diff --git a/doc/gtk/check.scm b/doc/gtk/check.scm
index 8c3965d8c5539164f3c34095d019432f0e6fde11..efae589a97aae535902f4635ea98cf43f6c10471 100644 (file)
--- a/doc/gtk/check.scm
+++ b/doc/gtk/check.scm
@@ -26,7 +26,9 @@
 
 (define (deffn-name line)
   (let ((regs (re-string-match
-              "@deffn \\(Class\\|Procedure\\|{Generic Procedure}\\) \\([-A-Za-z0-9<>?!+.]+\\)"
+              (string-append "@deffnx?"
+                             " \\(Class\\|Procedure\\|{Generic Procedure}\\)"
+                             " \\([-A-Za-z0-9<>?!+./:]+\\)")
               line)))
     (if regs
        (intern (re-match-extract line regs 2))
@@ -38,7 +40,7 @@
       (if (fix:< i len)
          (let ((line (vector-ref lines i)))
            (loop (fix:1+ i)
-                 (if (string-prefix? "@deffn " line)
+                 (if (string-prefix? "@deffn" line)
                      (cons (deffn-name line) deffns)
                      deffns)))
          deffns))))

diff --git a/doc/gtk/gtk.texinfo b/doc/gtk/gtk.texinfo
index e4838d417faf119797f796070899d62d611df1d3..3bcac0ea4ab8a19329cfb576855a98fb6011578b 100644 (file)
--- a/doc/gtk/gtk.texinfo
+++ b/doc/gtk/gtk.texinfo
@@ -238,6 +238,13 @@ appears in a scrollable window.
 You can draw on the surface with the simple graphics interface and/or
 the following procedures.
 
+@deffn Procedure gtk-graphics/make width height
+Creates a Gtk graphics device even if the output device is not
+available.  The output still goes to a new Cairo image surface with
+@var{width}x@var{height} pixels.  It just can't be displayed (only
+written to a file).
+@end deffn
+
 @deffn Procedure gtk-graphics/fill-polygon-list device points
 Draws a filled polygon.  @var{Points} is a list of flo:vectors each
 containing at least two flonums, the x and y coordinates of a point.

diff --git a/src/gtk/gtk.pkg b/src/gtk/gtk.pkg
index 0c33b32683fb0d1086b64e36ac6cf88dcfad34a5..57a5d06d152b0d1dccc5ada8b83d6bb28d000928 100644 (file)
--- a/src/gtk/gtk.pkg
+++ b/src/gtk/gtk.pkg
@@ -412,7 +412,6 @@ USA.
   (import (runtime graphics)
          %make-graphics-device)
   (export ()
-         gtk-graphics-device-type
          gtk-graphics/set-background-color
          gtk-graphics/set-foreground-color
          gtk-graphics/draw-line

diff --git a/tests/gtk/gtk-tests.scm b/tests/gtk/gtk-tests.scm
index 0f4c47d66dfffd50c0a1fc935f6d95a399526f62..97813ce5b75d2f940df45bd3c1b5abc745cdcd65 100644 (file)
--- a/tests/gtk/gtk-tests.scm
+++ b/tests/gtk/gtk-tests.scm
@@ -95,7 +95,7 @@ USA.
   (make-gtk-event-viewer-demo)
   (make-fix-layout-demo)
   (make-pole-zero)
-  (make-tellurian)
+  (make-tellurion)
   (let loop ()
     (if (not (null? (access toplevel-windows
                            (->environment '(gtk gtk-widget)))))