# HG changeset patch
# User jwe
# Date 847422940 0
# Node ID eac91893f3fc57fe9ef9df9ea45ed7a3db550bc7
# Parent  ccaffe93c32f45783268aec9ba44a74254b5ff02
[project @ 1996-11-08 03:14:36 by jwe]

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Thu Nov  7 12:43:36 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* octMakefile.in (bin-dist-tar): Delete references to octtopnm.
+
 	* configure.in (RLD_FLAG): Define if x86-linux.
 
 	* Version 1.91.
diff --git a/doc/interpreter/special.texi b/doc/interpreter/special.texi
--- a/doc/interpreter/special.texi
+++ b/doc/interpreter/special.texi
@@ -197,7 +197,15 @@
 
 @deftypefn {Function File} {} logspace (@var{base}, @var{limit}, @var{n})
 Similar to @code{linspace} except that the values are logarithmically
-spaced.
+spaced from
+@iftex
+@tex
+$10^{base}$ to $10^{limit}$.
+@end tex
+@end iftex
+@ifinfo
+10^base to 10^limit.
+@end ifinfo
 
 If @var{limit} is equal to
 @iftex
diff --git a/octMakefile.in b/octMakefile.in
--- a/octMakefile.in
+++ b/octMakefile.in
@@ -190,8 +190,6 @@
 	-strip src/octave
 	echo octave-$(version) > .fname
 	ln src/octave `cat .fname`/octave
-	-strip scripts/image/octtopnm
-	ln scripts/image/octtopnm `cat .fname`/octtopnm
 	tar chf `cat .fname`.tar `cat .fname`
 	rm -rf `cat .fname`
 .PHONY: bin-dist-tar
diff --git a/scripts/general/logspace.m b/scripts/general/logspace.m
--- a/scripts/general/logspace.m
+++ b/scripts/general/logspace.m
@@ -20,7 +20,7 @@
 ## usage: logspace (x1, x2, n)
 ##
 ## Return a vector of n logarithmically equally spaced points between
-## x1 and x2 inclusive.
+## 10^x1 and 10^x2 inclusive.
 ##
 ## If the final argument is omitted, n = 50 is assumed.
 ##
diff --git a/scripts/image/Makefile.in b/scripts/image/Makefile.in
--- a/scripts/image/Makefile.in
+++ b/scripts/image/Makefile.in
@@ -20,7 +20,7 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
-SOURCES = *.m octtopnm.c
+SOURCES = *.m
 IMAGES = *.img
 
 DISTFILES = Makefile.in $(SOURCES) $(IMAGES)
@@ -34,9 +34,6 @@
 all:
 .PHONY: all
 
-octtopnm: octtopnm.o
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) octtopnm.o -o octtopnm
-
 install:
 	$(top_srcdir)/mkinstalldirs $(fcnfiledir)/$(script_sub_dir)
 	for f in $(FCN_FILES_NO_DIR) ; do \
@@ -49,7 +46,6 @@
 	  $(INSTALL_DATA) $(srcdir)/$$f $(imagedir)/$$f ; \
 	done
 	$(top_srcdir)/mkinstalldirs $(archlibdir)
-#	$(INSTALL_PROGRAM) octtopnm $(archlibdir)/octtopnm
 .PHONY: install
 
 uninstall:
@@ -59,11 +55,9 @@
 	for f in $(IMAGE_FILES_NO_DIR) ; \
 	  do rm -f $(imagedir)/$$f ; \
 	done
-#	rm -f $(archlibdir)/octtopnm
 .PHONY: uninstall
 
 clean:
-	rm -f octtopnm.o octtopnm
 .PHONY: clean
 
 tags: $(SOURCES)
diff --git a/scripts/image/saveimage.m b/scripts/image/saveimage.m
--- a/scripts/image/saveimage.m
+++ b/scripts/image/saveimage.m
@@ -259,7 +259,7 @@
     fid = fopen (filename, "w");
 
     fprintf (fid, "%%!PS-Adobe-2.0 EPSF-2.0\n");
-    fprintf (fid, "%%%%Creator: pnmtops\n");
+    fprintf (fid, "%%%%Creator: Octave %s (saveimage.m)\n", OCTAVE_VERSION);
     fprintf (fid, "%%%%Title: %s\n", filename);
     fprintf (fid, "%%%%Pages: 1\n");
     fprintf (fid, "%%%%BoundingBox: %d %d %d %d\n",
@@ -282,19 +282,13 @@
 
     img = map(img);
 
-    ## XXX FIXME XXX -- this would be much faster if fprintf knew about
-    ## vector arguments.
+    fmt = "%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x\n";
+    fprintf (fid, fmt, img);
 
-    count = 0;
-    for i = 1:img_sz
-      fprintf (fid, "%x", img (i));
-      if (++count == 30)
-	count = 0;
-	fprintf (fid, "\n");
-      endif
-    endfor
+    if (rem (img_sz, 30) != 0)
+      fprintf (fid, "\n" );
+    endif
 
-    fprintf (fid, "\n" );
     fprintf (fid, "grestore\n" );
     fprintf (fid, "showpage\n" );
     fprintf (fid, "%%%%Trailer\n" );