Mercurial > octave-nkf
changeset 5704:3d8d8ce93c2c
[project @ 2006-03-21 21:53:56 by jwe]
author | jwe |
---|---|
date | Tue, 21 Mar 2006 21:53:56 +0000 |
parents | 1199fc86582d |
children | 0a26811c98be |
files | doc/ChangeLog doc/interpreter/Makefile.in doc/interpreter/sparse.txi |
diffstat | 3 files changed, 35 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/ChangeLog Tue Mar 21 19:46:19 2006 +0000 +++ b/doc/ChangeLog Tue Mar 21 21:53:56 2006 +0000 @@ -1,3 +1,12 @@ +2006-03-21 John W. Eaton <jwe@octave.org> + + * interpreter/sparse.txi: Temporarily omit figures. + * interpreter/Makefile.in: Temporarily omit actions for making figures. + + * interpreter/Makefile.in (real-pdf): Depend on stamp-eps + (stamp-pdf): Depend on real-pdf. Touch stamp-pdf here. + (real-pdf): Not here. + 2006-03-16 David Bateman <dbateman@free.fr> * interpreter/images/sparseimages.m: set terminal type to dummy to
--- a/doc/interpreter/Makefile.in Tue Mar 21 19:46:19 2006 +0000 +++ b/doc/interpreter/Makefile.in Tue Mar 21 21:53:56 2006 +0000 @@ -47,6 +47,7 @@ MAN_BASE := mkoctfile octave octave-bug octave-config MAN_SRC := $(addsuffix .1, $(MAN_BASE)) +# XXX FIXME XXX -- need to include generated figures here... DISTFILES = Makefile.in dir munge-texi.cc $(MAN_SRC) \ $(SOURCES) $(TEXINFO) $(FORMATTED) @@ -119,26 +120,25 @@ .PHONY: check stamp-png: - make -C $(IMAGEDIR) png +## make -C $(IMAGEDIR) png touch $@ stamp-eps: - make -C $(IMAGEDIR) eps +## make -C $(IMAGEDIR) eps + touch $@ + +stamp-pdf: real-pdf touch $@ -stamp-pdf: stamp-eps - make -C ./ real-pdf - -real-pdf: - for F in $(wildcard *.eps); do \ - G=`basename $$F .eps`.pdf; \ - gs -dBATCH -dEPSCrop -dNOPAUSE -q -sDEVICE=pdfwrite \ - -sOutputFile=$$G $$F; \ - done - 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 +## make -C $(IMAGEDIR) txt touch $@ install install-strip: all
--- a/doc/interpreter/sparse.txi Tue Mar 21 19:46:19 2006 +0000 +++ b/doc/interpreter/sparse.txi Tue Mar 21 21:53:56 2006 +0000 @@ -327,10 +327,11 @@ sparse matrices. The first is the @dfn{spy} command, which displays the structure of the non-zero elements of the matrix. @xref{fig:spmatrix}, for an exaple of the use of -@dfn{spy}.More advanced graphical information can be obtained with the +@dfn{spy}. More advanced graphical information can be obtained with the @dfn{treeplot}, @dfn{etreeplot} and @dfn{gplot} commands. @float Figure,fig:spmatrix +@ifset INCLUDE_FIGURES @ifinfo @example @include spmatrix.txt @@ -339,6 +340,7 @@ @ifset htmltex @image{spmatrix,8cm} @end ifset +@end ifest @caption{Structure of simple sparse matrix.} @end float @@ -367,7 +369,9 @@ @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 @@ -579,6 +583,7 @@ positive definite matrix. @float Figure,fig:simplematrix +@ifset INCLUDE_FIGURES @ifinfo @example @include spmatrix.txt @@ -587,6 +592,7 @@ @ifset htmltex @image{spmatrix,8cm} @end ifset +@end ifset @caption{Structure of simple sparse matrix.} @end float @@ -644,6 +650,7 @@ @ifset HAVE_CHOLMOD @ifset HAVE_COLAMD @float Figure,fig:simplechol +@ifset INCLUDE_FIGURES @ifinfo @example @include spchol.txt @@ -652,10 +659,12 @@ @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 @@ -664,6 +673,7 @@ @ifset htmltex @image{spcholperm,8cm} @end ifset +@end ifset @caption{Structure of the permuted Cholesky factorization of the above matrix.} @end float @end ifset @@ -1031,7 +1041,9 @@ @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