From 46716c7694ac4aa3c4caa9cf267b61ada6cd923c Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Fri, 19 Apr 2013 12:52:15 -0700
Subject: [PATCH] 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.
---
 doc/gtk/check.scm       | 6 ++++--
 doc/gtk/gtk.texinfo     | 7 +++++++
 src/gtk/gtk.pkg         | 1 -
 tests/gtk/gtk-tests.scm | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/doc/gtk/check.scm b/doc/gtk/check.scm
index 8c3965d8c..efae589a9 100644
--- 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 e4838d417..3bcac0ea4 100644
--- 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 0c33b3268..57a5d06d1 100644
--- 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 0f4c47d66..97813ce5b 100644
--- 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)))))
-- 
2.25.1