# HG changeset patch # User jwe # Date 1143066404 0 # Node ID dec8dd15a57465a011528592387e075cb5128c85 # Parent 6286c96121c2e41d3471e9a5519c002cdf0a4f0e [project @ 2006-03-22 22:25:58 by jwe] diff -r 6286c96121c2 -r dec8dd15a574 ChangeLog --- a/ChangeLog Wed Mar 22 05:07:29 2006 +0000 +++ b/ChangeLog Wed Mar 22 22:26:44 2006 +0000 @@ -1,3 +1,13 @@ +2006-03-22 John W. Eaton + + * Makeconf.in: (TEXINFO_COLAMD, TEXINFO_CHOLMOD, TEXINFO_UMFPACK): + Substitute here. + (do-subst-texinfo-vals): New macro definition. + + * configure.in: Don't substitute OCTAVE_VERSION, OCTAVE_HOSTTYPE, + or OCTAVE_HOME. + (AC_CONFIG_FILES): Remove doc/conf.texi from the list. + 2006-03-21 John W. Eaton * configure.in: Only print warnings for missing functionality in diff -r 6286c96121c2 -r dec8dd15a574 Makeconf.in --- a/Makeconf.in Wed Mar 22 05:07:29 2006 +0000 +++ b/Makeconf.in Wed Mar 22 22:26:44 2006 +0000 @@ -205,6 +205,10 @@ USE_64_BIT_IDX_T = @USE_64_BIT_IDX_T@ +TEXINFO_COLAMD = @TEXINFO_COLAMD@ +TEXINFO_CHOLMOD = @TEXINFO_CHOLMOD@ +TEXINFO_UMFPACK = @TEXINFO_UMFPACK@ + # The arguments passed to configure. config_opts = @config_opts@ @@ -540,6 +544,19 @@ $(top_srcdir)/move-if-change $@-t $@ endef +define do-subst-texinfo-vals +echo "making $@ from $<" +$(SED) < $< \ + -e "s|%CANONICAL_HOST_TYPE%|${canonical_host_type}|" \ + -e "s|%OCTAVE_HOME%|${prefix}|" \ + -e "s|%OCTAVE_VERSION%|${version}|" \ + -e "s|%TEXINFO_COLAMD%|${TEXINFO_COLAMD}|" \ + -e "s|%TEXINFO_CHOLMOD%|${TEXINFO_CHOLMOD}|" \ + -e "s|%TEXINFO_UMFPACK%|${TEXINFO_UMFPACK}|" | \ + $(SED) -e "s|%OCTAVE_CONF_DEFS%|\"${UGLY_DEFS}\"|" > $@-t +$(top_srcdir)/move-if-change $@-t $@ +endef + define do-mkpkgadd $(top_srcdir)/mkpkgadd $(srcdir) > PKG_ADD.t if [ -n "`cat PKG_ADD.t`" ]; then \ diff -r 6286c96121c2 -r dec8dd15a574 configure.in --- a/configure.in Wed Mar 22 05:07:29 2006 +0000 +++ b/configure.in Wed Mar 22 22:26:44 2006 +0000 @@ -29,7 +29,7 @@ EXTERN_CXXFLAGS="$CXXFLAGS" AC_INIT -AC_REVISION($Revision: 1.502 $) +AC_REVISION($Revision: 1.503 $) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -418,17 +418,6 @@ ;; esac -### Extract versioning information from src/version.h, etc -AC_MSG_CHECKING(for octave version) -OCTAVE_VERSION=`cat src/version.h | grep "^#define OCTAVE_VERSION" | \ - sed -e 's/^.*OCTAVE_VERSION \"//' -e 's/\"//'` -AC_MSG_RESULT($OCTAVE_VERSION) -AC_SUBST(OCTAVE_VERSION) -OCTAVE_HOME=$prefix -AC_SUBST(OCTAVE_HOME) -OCTAVE_HOSTTYPE=$canonical_host_type -AC_SUBST(OCTAVE_HOSTTYPE) - ### Check for pcre/regex library. AC_SUBST(REGEX_LIBS) WITH_PCRE_CONFIG=no @@ -1790,7 +1779,7 @@ ### Do the substitutions in all the Makefiles. AC_CONFIG_FILES([Makefile octMakefile Makeconf test/Makefile \ - dlfcn/Makefile doc/Makefile doc/conf.texi doc/faq/Makefile \ + dlfcn/Makefile doc/Makefile doc/faq/Makefile \ doc/interpreter/Makefile doc/interpreter/images/Makefile \ doc/liboctave/Makefile doc/refcard/Makefile emacs/Makefile \ examples/Makefile liboctave/Makefile liboctave/oct-types.h \ diff -r 6286c96121c2 -r dec8dd15a574 doc/ChangeLog --- a/doc/ChangeLog Wed Mar 22 05:07:29 2006 +0000 +++ b/doc/ChangeLog Wed Mar 22 22:26:44 2006 +0000 @@ -1,3 +1,27 @@ +2006-03-22 John W. Eaton + + * interpreter/sparse.txi: Always use @image to include image files. + + * interpreter/Makefile.in: Eliminate stamp files. + (clean, mostlyclean, distclean, maintainer-clean): Now + double-colon targets. + (stamp-images): New target. + (octave.info, octave.dvi, octave.pdf, HTML/index.html): Depend on it. + * interpreter/images/Makefile.in: Explicitly list images to be + created and their dependencies. + * interpreter/images/sparseimages.m: Delete dirc arg. + Sleep for 1 second before returning from main function. + (sparseimages): Don't redirect output here. + New arg, nm. Only output a single figure at a time. + (bury_output): New function. Use it before plotting commands and + after every print function. + + * interpreter/sparse.txi: Undo previous change. + * Makefile.in (conf.texi): New target. + (DISTFILES): Include conf.texi in the list. + (all, dist): Depend on conf.texi. + * conf.texi.in: Values come from Makeconf, not configure. + 2006-03-21 John W. Eaton * liboctave/Makefile.in (FORMATTED): Omit .html files here. diff -r 6286c96121c2 -r dec8dd15a574 doc/Makefile.in --- a/doc/Makefile.in Wed Mar 22 05:07:29 2006 +0000 +++ b/doc/Makefile.in Wed Mar 22 22:26:44 2006 +0000 @@ -20,15 +20,18 @@ SOURCES = -DISTFILES = Makefile.in ChangeLog conf.texi.in texinfo.tex +DISTFILES = Makefile.in ChangeLog conf.texi.in conf.texi texinfo.tex SUBDIRS = faq interpreter liboctave refcard DISTSUBDIRS = $(SUBDIRS) -all: $(SUBDIRS) +all: conf.texi $(SUBDIRS) .PHONY: all +conf.texi: conf.texi.in $(TOPDIR)/Makeconf + @$(do-subst-texinfo-vals) + ../BUGS ../INSTALL.OCTAVE: $(MAKE) -C interpreter ../$@ .PHONY: ../BUGS ../INSTALL.OCTAVE @@ -57,7 +60,7 @@ maintainer-clean:: rm -f tags TAGS Makefile -dist: +dist: conf.texi ln $(DISTFILES) ../`cat ../.fname`/doc for dir in $(DISTSUBDIRS); do mkdir ../`cat ../.fname`/doc/$$dir; $(MAKE) -C $$dir $@; done .PHONY: dist diff -r 6286c96121c2 -r dec8dd15a574 doc/conf.texi.in --- a/doc/conf.texi.in Wed Mar 22 05:07:29 2006 +0000 +++ b/doc/conf.texi.in Wed Mar 22 22:26:44 2006 +0000 @@ -3,9 +3,9 @@ @c For copying conditions, see the file gpl.texi. @set OCTAVE_MANUAL -@set VERSION @OCTAVE_VERSION@ -@set OCTAVEHOME @OCTAVE_HOME@ -@set TARGETHOSTTYPE @OCTAVE_HOSTTYPE@ -@TEXINFO_COLAMD@ -@TEXINFO_CHOLMOD@ -@TEXINFO_UMFPACK@ +@set TARGETHOSTTYPE %CANONICAL_HOSTTYPE% +@set OCTAVEHOME %OCTAVE_HOME% +@set VERSION %OCTAVE_VERSION% +%TEXINFO_COLAMD% +%TEXINFO_CHOLMOD% +%TEXINFO_UMFPACK% diff -r 6286c96121c2 -r dec8dd15a574 doc/faq/Makefile.in --- a/doc/faq/Makefile.in Wed Mar 22 05:07:29 2006 +0000 +++ b/doc/faq/Makefile.in Wed Mar 22 22:26:44 2006 +0000 @@ -39,19 +39,19 @@ .PHONY: all Octave-FAQ.info: $(TEXINFO) - -$(MAKEINFO) -I$(srcdir) $< + -$(MAKEINFO) -I.. -I$(srcdir) -I$(srcdir)/.. $< Octave-FAQ.dvi: $(TEXINFO) - -TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2DVI) $< + -TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2DVI) $< Octave-FAQ.ps: Octave-FAQ.dvi -dvips -o $@ $< Octave-FAQ.pdf: $(TEXINFO) - -TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2PDF) $< + -TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2PDF) $< HTML/index.html: $(TEXINFO) - -$(MAKEINFO) --html --ifinfo --output=HTML $< + -$(MAKEINFO) --html --ifinfo --output=HTML -I.. -I$(srcdir) -I$(srcdir)/.. $< check install install-strip uninstall: .PHONY: check install install-strip uninstall diff -r 6286c96121c2 -r dec8dd15a574 doc/interpreter/Makefile.in --- a/doc/interpreter/Makefile.in Wed Mar 22 05:07:29 2006 +0000 +++ b/doc/interpreter/Makefile.in Wed Mar 22 22:26:44 2006 +0000 @@ -19,7 +19,6 @@ INSTALL_DATA = @INSTALL_DATA@ IMAGEDIR = images -STAMPS = stamp-png stamp-eps stamp-pdf stamp-txt SUB_SOURCE := arith.txi audio.txi basics.txi bugs.txi \ container.txi control.txi cp-idx.txi data.txi \ @@ -89,17 +88,21 @@ -d $(TOPDIR)/scripts/DOCSTRINGS < $< > $@.t @$(top_srcdir)/move-if-change $@.t $@ -octave.info: stamp-txt $(TEXINFO) - -$(MAKEINFO) -I.. -I$(srcdir) -I$(srcdir)/.. $(MAIN_TEXINFO) +stamp-images: + $(MAKE) -C images + touch $@ -octave.dvi: stamp-eps $(TEXINFO) - -TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2DVI) $(MAIN_TEXINFO) +octave.info: stamp-images $(TEXINFO) + -$(MAKEINFO) -I.. -I$(srcdir) -I$(srcdir)/.. -I$(IMAGEDIR) $(MAIN_TEXINFO) + +octave.dvi: stamp-images $(TEXINFO) + -TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(IMAGEDIR):$(TEXINPUTS):" $(TEXI2DVI) $(MAIN_TEXINFO) octave.ps: octave.dvi -dvips -o $@ $< -octave.pdf: stamp-pdf $(TEXINFO) - -TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2PDF) $(MAIN_TEXINFO) +octave.pdf: stamp-images $(TEXINFO) + -TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(IMAGEDIR):$(TEXINPUTS):" $(TEXI2PDF) $(MAIN_TEXINFO) ../../INSTALL.OCTAVE: install.texi rm -f INSTALL @@ -115,35 +118,19 @@ -I.. -I$(srcdir) -I$(srcdir)/.. $< mv BUGS ../../BUGS -HTML/index.html: stamp-png $(TEXINFO) - -$(MAKEINFO) --html --ifinfo --output=HTML -I.. -I$(srcdir)/.. $(MAIN_TEXINFO) -## $(INSTALL_DATA) *.png ./HTML +HTML/index.html: html-figs $(TEXINFO) + -$(MAKEINFO) --html --ifinfo --output=HTML -I.. -I$(srcdir) -I$(srcdir)/.. -I$(IMAGEDIR) $(MAIN_TEXINFO) + +html-figs: stamp-images html-dir + $(INSTALL_DATA) images/*.png HTML +.PHONY: html-figs + +html-dir: + if [ -d HTML ]; then true; else mkdir HTML; fi check: all .PHONY: check -stamp-png: -## make -C $(IMAGEDIR) png - touch $@ - -stamp-eps: -## make -C $(IMAGEDIR) eps - touch $@ - -stamp-pdf: real-pdf - touch $@ - -real-pdf: stamp-eps -## for F in $(wildcard *.eps); do \ -## G=`basename $$F .eps`.pdf; \ -## gs -dBATCH -dEPSCrop -dNOPAUSE -q -sDEVICE=pdfwrite \ -## -sOutputFile=$$G $$F; \ -## done - -stamp-txt: -## make -C $(IMAGEDIR) txt - touch $@ - install install-strip: all $(top_srcdir)/mkinstalldirs $(DESTDIR)$(man1dir) $(DESTDIR)$(infodir) @if test -d $(DESTDIR)$(man1dir); then \ @@ -199,21 +186,20 @@ spell: $(SPELL) .PHONY: spell -mostlyclean clean: +mostlyclean clean:: rm -f octave.cp octave.fn octave.in \ octave.ky octave.op octave.pg octave.rd octave.tp octave.vr \ octave.cps octave.fns octave.ins octave.kys octave.ops \ octave.pgs octave.rds octave.tps octave.vrs octave.aux \ octave.log octave.toc \ - munge-texi$(BUILD_EXEEXT) munge-texi.o $(STAMPS) \ - *.eps *.png *.txt *.pdf + munge-texi$(BUILD_EXEEXT) munge-texi.o \ .PHONY: mostlyclean clean -distclean: clean +distclean:: clean rm -f Makefile .PHONY: distclean -maintainer-clean: distclean clean-texi +maintainer-clean:: distclean clean-texi rm -f tags TAGS $(FORMATTED) rm -rf HTML .PHONY: maintainer-clean diff -r 6286c96121c2 -r dec8dd15a574 doc/interpreter/images/Makefile.in --- a/doc/interpreter/images/Makefile.in Wed Mar 22 05:07:29 2006 +0000 +++ b/doc/interpreter/images/Makefile.in Wed Mar 22 22:26:44 2006 +0000 @@ -6,11 +6,16 @@ include $(TOPDIR)/Makeconf -SOURCES = $(wildcard $(srcdir)/*.m) +SOURCES = sparseimages.m -FUNCTIONS = $(patsubst %.m, %, $(notdir $(SOURCES))) +SPARSEIMAGES_1 = gplot grid spmatrix spchol spcholperm +SPARSEIMAGES = \ + $(addsuffix .eps, $(SPARSEIMAGES_1)) \ + $(addsuffix .png, $(SPARSEIMAGES_1)) \ + $(addsuffix .txt, $(SPARSEIMAGES_1)) +IMAGES += $(SPARSEIMAGES) $(addsuffix .pdf, $(SPARSEIMAGES_1)) -DISTFILES = Makefile.in $(SOURCES) +DISTFILES = Makefile.in $(SOURCES) $(IMAGES) OCTAVE_BINARY = $(TOPDIR)/src/octave @@ -26,18 +31,21 @@ SET_LD_LIBRARY_PATH = @library_path_var@="$(XLD_LIBRARY_PATH)" endif -all: png eps txt +all: $(IMAGES) .PHONY: all -png eps txt: - for F in $(FUNCTIONS); do \ - $(SET_LD_LIBRARY_PATH) $(OCTAVE_BINARY) \ - -f -q -H -p $(OCTAVE_SCRIPT_PATH) --eval "$$F ('../','$@')"; \ - done -.PHONY: png eps txt +define run-octave + $(SET_LD_LIBRARY_PATH) $(OCTAVE_BINARY) -f -q -H -p $(OCTAVE_SCRIPT_PATH) \ + --eval "$(notdir $(basename $<)) ('$(notdir $(basename $@))', '$(patsubst .%,%, $(suffix $@))')" +endef + +$(SPARSEIMAGES): sparseimages.m + $(run-octave) + +%.pdf : %.eps + if [ -f $< ] ; then gs -dBATCH -dEPSCrop -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=$@ $< ; fi install install-strip: - .PHONY: install install-strip uninstall: @@ -61,6 +69,7 @@ maintainer-clean: distclean rm -f tags TAGS + rm -f $(IMAGES) .PHONY: maintainer-clean dist: diff -r 6286c96121c2 -r dec8dd15a574 doc/interpreter/images/sparseimages.m --- a/doc/interpreter/images/sparseimages.m Wed Mar 22 05:07:29 2006 +0000 +++ b/doc/interpreter/images/sparseimages.m Wed Mar 22 22:26:44 2006 +0000 @@ -1,62 +1,90 @@ -function sparseimages(dirc,typ) - ## XXX FIXME XXX - ## How do we set terminal and direct the output to /dev/null without - ## gnuplot? Note that due to replot in print.m, the redirection to - ## /dev/null effectively doesn't work at the moment. +function sparseimages(nm,typ) + if (strcmp(typ,"txt")) + txtimages(nm,15,typ); + else + otherimages(nm,200,typ); + if (strcmp (nm, "gplot")) + gplotimages("gplot",typ); + endif + if (strcmp (nm, "grid")) + femimages("grid",typ); + endif + endif + ## Kluge to give gnuplot enough time to process last figure before we + ## exit. Otherwise, Octave will delete the temporary data files when + ## it exits and gnuplot will fail... + sleep (1); +endfunction + +## Use this function before plotting commands and after every call to +## print since print() resets output to stdout (unfortunately, gnpulot +## can't pop output as it can the terminal type). +function bury_output () + automatic_replot = false; __gnuplot_set__ term dumb [status, dummy] = fileattrib("/dev/null"); if (status) __gnuplot_set__ output '/dev/null' endif - plot(1) # FIXME bypass 2.9.4 bug!! - if (strcmp(typ,"txt")) - txtimages(15,dirc,typ); - else - otherimages(200,dirc,typ); - gplotimages("gplot",dirc,typ); - femimages("grid",dirc,typ); - endif endfunction -function gplotimages(nm,dirc,typ) +function gplotimages(nm,typ) + bury_output (); A = sparse([2,6,1,3,2,4,3,5,4,6,1,5], [1,1,2,2,3,3,4,4,5,5,6,6],1,6,6); xy = [0,4,8,6,4,2;5,0,5,7,5,7]'; gplot(A,xy) - print(strcat(dirc,filesep,nm,".",typ),strcat("-d",typ)) + print(strcat(nm,".",typ),strcat("-d",typ)) + bury_output (); endfunction -function txtimages(n,dirc,typ) +function txtimages(nm,n,typ) a = 10*speye(n) + sparse(1:n,ceil([1:n]/2),1,n,n) + ... sparse(ceil([1:n]/2),1:n,1,n,n); - printsparse(a,strcat(dirc,filesep,"spmatrix.",typ)); + if (strcmp (nm, "spmatrix")) + printsparse(a,strcat("spmatrix.",typ)); + endif if (!isempty(findstr(octave_config_info ("DEFS"),"HAVE_COLAMD")) && !isempty(findstr(octave_config_info ("DEFS"),"HAVE_CHOLMOD"))) r1 = chol(a); - printsparse(r1,strcat(dirc,filesep,"spchol.",typ)); + if (strcmp (nm, "spchol")) + printsparse(r1,strcat("spchol.",typ)); + endif [r2,p2,q2]=chol(a); - printsparse(r2,strcat(dirc,filesep,"spcholperm.",typ)); - printf("Text NNZ: Matrix %d, Chol %d, PermChol %d\n",nnz(a),nnz(r1),nnz(r2)); + if (strcmp (nm, "spcholperm")) + printsparse(r2,strcat("spcholperm.",typ)); + endif + ## printf("Text NNZ: Matrix %d, Chol %d, PermChol %d\n",nnz(a),nnz(r1),nnz(r2)); endif endfunction -function otherimages(n,dirc,typ) +function otherimages(nm,n,typ) + bury_output (); a = 10*speye(n) + sparse(1:n,ceil([1:n]/2),1,n,n) + ... sparse(ceil([1:n]/2),1:n,1,n,n); spy(a); axis("ij") - print(strcat(dirc,filesep,"spmatrix.",typ),strcat("-d",typ)) + if (strcmp (nm, "spmatrix")) + print(strcat("spmatrix.",typ),strcat("-d",typ)) + bury_output (); + endif if (!isempty(findstr(octave_config_info ("DEFS"),"HAVE_COLAMD")) && !isempty(findstr(octave_config_info ("DEFS"),"HAVE_CHOLMOD"))) r1 = chol(a); spy(r1); axis("ij") - print(strcat(dirc,filesep,"spchol.",typ),strcat("-d",typ)) + if (strcmp (nm, "spchol")) + print(strcat("spchol.",typ),strcat("-d",typ)) + bury_output (); + endif [r2,p2,q2]=chol(a); spy(r2); axis("ij") - print(strcat(dirc,filesep,"spcholperm.",typ),strcat("-d",typ)) - printf("Image NNZ: Matrix %d, Chol %d, PermChol %d\n",nnz(a),nnz(r1),nnz(r2)); + if (strcmp (nm, "spcholperm")) + print(strcat("spcholperm.",typ),strcat("-d",typ)) + bury_output (); + endif + ## printf("Image NNZ: Matrix %d, Chol %d, PermChol %d\n",nnz(a),nnz(r1),nnz(r2)); axis("xy") endif endfunction @@ -98,7 +126,8 @@ fclose(fid); endfunction -function femimages (nm,dirc,typ) +function femimages (nm,typ) + bury_output (); if (!isempty(findstr(octave_config_info ("DEFS"),"HAVE_COLAMD")) && !isempty(findstr(octave_config_info ("DEFS"),"HAVE_CHOLMOD")) && !isempty(findstr(octave_config_info ("DEFS"),"HAVE_UMFPACK"))) @@ -178,7 +207,8 @@ tmp = [([xelems; NaN*ones(1,sz)])(:), ([yelems; NaN*ones(1,sz)])(:), ([velems; NaN*ones(1,sz)])(:)]; __gnuplot_splot__(tmp); __gnuplot_raw__ ("set view 80,10;\n") - print(strcat(dirc,filesep,nm,".",typ),strcat("-d",typ)) + print(strcat(nm,".",typ),strcat("-d",typ)) + bury_output (); unwind_protect_cleanup __gnuplot_set__ noparametric; end_unwind_protect diff -r 6286c96121c2 -r dec8dd15a574 doc/interpreter/sparse.txi --- a/doc/interpreter/sparse.txi Wed Mar 22 05:07:29 2006 +0000 +++ b/doc/interpreter/sparse.txi Wed Mar 22 22:26:44 2006 +0000 @@ -331,16 +331,7 @@ @dfn{treeplot}, @dfn{etreeplot} and @dfn{gplot} commands. @float Figure,fig:spmatrix -@ifset INCLUDE_FIGURES -@ifinfo -@example -@include spmatrix.txt -@end example -@end ifinfo -@ifset htmltex @image{spmatrix,8cm} -@end ifset -@end ifset @caption{Structure of simple sparse matrix.} @end float @@ -369,9 +360,7 @@ @xref{fig:gplot}. @float Figure,fig:gplot -@ifset INCLUDE_FIGURES @image{gplot,8cm} -@end ifset @caption{Simple use of the @dfn{gplot} command.} @end float @end ifset @@ -583,16 +572,7 @@ positive definite matrix. @float Figure,fig:simplematrix -@ifset INCLUDE_FIGURES -@ifinfo -@example -@include spmatrix.txt -@end example -@end ifinfo -@ifset htmltex @image{spmatrix,8cm} -@end ifset -@end ifset @caption{Structure of simple sparse matrix.} @end float @@ -650,30 +630,12 @@ @ifset HAVE_CHOLMOD @ifset HAVE_COLAMD @float Figure,fig:simplechol -@ifset INCLUDE_FIGURES -@ifinfo -@example -@include spchol.txt -@end example -@end ifinfo -@ifset htmltex @image{spchol,8cm} -@end ifset -@end ifset @caption{Structure of the un-permuted Cholesky factorization of the above matrix.} @end float @float Figure,fig:simplecholperm -@ifset INCLUDE_FIGURES -@ifinfo -@example -@include spcholperm.txt -@end example -@end ifinfo -@ifset htmltex @image{spcholperm,8cm} -@end ifset -@end ifset @caption{Structure of the permuted Cholesky factorization of the above matrix.} @end float @end ifset @@ -1041,9 +1003,7 @@ @ifset HAVE_UMFPACK @ifset HAVE_COLAMD @float Figure,fig:femmodel -@ifset INCLUDE_FIGURES @image{grid,8cm} -@end ifset @caption{Example finite element model the showing triangular elements. The height of each vertex corresponds to the solution value.} @end float diff -r 6286c96121c2 -r dec8dd15a574 doc/liboctave/Makefile.in --- a/doc/liboctave/Makefile.in Wed Mar 22 05:07:29 2006 +0000 +++ b/doc/liboctave/Makefile.in Wed Mar 22 22:26:44 2006 +0000 @@ -59,7 +59,7 @@ -TEXINPUTS="..:$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2PDF) $< HTML/index.html: $(TEXINFO) - -$(MAKEINFO) --html --ifinfo --output=HTML -I.. -I$(srcdir)/.. $< + -$(MAKEINFO) --html --ifinfo --output=HTML -I.. -I$(srcdir) -I$(srcdir)/.. $< check: .PHONY: check diff -r 6286c96121c2 -r dec8dd15a574 scripts/ChangeLog --- a/scripts/ChangeLog Wed Mar 22 05:07:29 2006 +0000 +++ b/scripts/ChangeLog Wed Mar 22 22:26:44 2006 +0000 @@ -1,3 +1,7 @@ +2006-03-22 John W. Eaton + + * plot/print.m: Don't replot after popping terminal setting. + 2006-03-20 John W. Eaton * miscellaneous/mkoctfile.m: Use version-specific name of diff -r 6286c96121c2 -r dec8dd15a574 scripts/plot/print.m --- a/scripts/plot/print.m Wed Mar 22 05:07:29 2006 +0000 +++ b/scripts/plot/print.m Wed Mar 22 22:26:44 2006 +0000 @@ -336,7 +336,6 @@ ## Restore init state __gnuplot_raw__ ("set terminal pop;\n"); __gnuplot_raw__ ("set output;\n") - __gnuplot_replot__ end_unwind_protect diff -r 6286c96121c2 -r dec8dd15a574 src/ChangeLog --- a/src/ChangeLog Wed Mar 22 05:07:29 2006 +0000 +++ b/src/ChangeLog Wed Mar 22 22:26:44 2006 +0000 @@ -1,8 +1,10 @@ -2006-03-21 John W. Eaton +2006-03-22 John W. Eaton * version.h (OCTAVE_VERSION): Now 2.9.5. (OCTAVE_API_VERSION): Now api-v18. - (OCTAVE_RELEASE_DATE): Now 2006-03-20. + (OCTAVE_RELEASE_DATE): Now 2006-03-22. + +2006-03-21 John W. Eaton * ov-cell.h (octave_cell::convert_to_str_internal): Ignore pad and force args. diff -r 6286c96121c2 -r dec8dd15a574 src/version.h --- a/src/version.h Wed Mar 22 05:07:29 2006 +0000 +++ b/src/version.h Wed Mar 22 22:26:44 2006 +0000 @@ -29,7 +29,7 @@ #define OCTAVE_API_VERSION "api-v18" -#define OCTAVE_RELEASE_DATE "2006-03-20" +#define OCTAVE_RELEASE_DATE "2006-03-22" #define OCTAVE_COPYRIGHT \ "Copyright (C) 2006 John W. Eaton."