Mercurial > octave

changeset 22013:6267807eb70b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: fix doc build error when building without SuiteSparse * sparseimages.m: Pass correct arguments to sombreroimage, only called when building without SuiteSparse. (sombreroimage): Reformat and reword output. * geometryimages.m (sombreroimage): Reformat and reword output.
author Mike Miller <mtmiller@octave.org>
date Thu, 30 Jun 2016 15:20:46 -0700
parents 22a272df4ac4
children b07c0f27dccc
files doc/interpreter/geometryimages.m doc/interpreter/sparseimages.m
diffstat 2 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/geometryimages.m	Thu Jun 30 17:35:58 2016 -0400
+++ b/doc/interpreter/geometryimages.m	Thu Jun 30 15:20:46 2016 -0700
@@ -126,7 +126,8 @@
     [x, y, z] = sombrero ();
     unwind_protect
       mesh (x, y, z);
-      title ("Sorry, graphics not available because Octave was\\ncompiled without the QHULL library.");
+      title ({"Sorry, graphics are unavailable because Octave was",
+              "compiled without the QHULL library."});
     unwind_protect_cleanup
       print (outfile, d_typ);
       hide_output ();
--- a/doc/interpreter/sparseimages.m	Thu Jun 30 17:35:58 2016 -0400
+++ b/doc/interpreter/sparseimages.m	Thu Jun 30 15:20:46 2016 -0700
@@ -35,7 +35,7 @@
          && __have_feature__ ("UMFPACK")))
     ## There is no sparse matrix implementation available because
     ## of missing libraries, plot sombreros instead.
-    sombreroimage (d, nm, typ);
+    sombreroimage (outfile, typ, d_typ);
   elseif (strcmp (typ, "txt"))
     txtimages (d, nm, 15, typ);
   elseif (strcmp (nm, "gplot"))
@@ -218,17 +218,18 @@
 function sombreroimage (outfile, typ, d_typ)
   if (strcmp (typ, "txt"))
     fid = fopen (outfile, "wt");
-    fputs (fid, "+---------------------------------------+\n");
-    fputs (fid, "| Image unavailable because of a        |\n");
-    fputs (fid, "| missing sparse matrix implementation. |\n");
-    fputs (fid, "+---------------------------------------+\n");
+    fputs (fid, "+--------------------------------+\n");
+    fputs (fid, "| Image unavailable because of a |\n");
+    fputs (fid, "| missing SuiteSparse library.   |\n");
+    fputs (fid, "+--------------------------------+\n");
     fclose (fid);
     return;
   else
     [x, y, z] = sombrero ();
     unwind_protect
       mesh (x, y, z);
-      title ("Sorry, graphics are unavailable because Octave was\ncompiled without a sparse matrix implementation.");
+      title ({"Sorry, graphics are unavailable because Octave was",
+              "compiled without the SuiteSparse library."});
     unwind_protect_cleanup
       print (outfile, d_typ);
       hide_output ();