Mercurial > octave-nkf

changeset 5652:f37b562ec93c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-03-09 15:12:20 by dbateman]
author dbateman
date Thu, 09 Mar 2006 15:12:21 +0000
parents 6d0ea746f50f
children ab9a339fcec8
files doc/ChangeLog doc/interpreter/Makefile.in doc/interpreter/sparse.txi
diffstat 3 files changed, 26 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/doc/ChangeLog	Wed Mar 08 22:57:20 2006 +0000
+++ b/doc/ChangeLog	Thu Mar 09 15:12:21 2006 +0000
@@ -1,3 +1,11 @@
+2006-03-09  David Bateman  <dbateman@free.fr>
+
+	* interpreter/Makefile.in: Change order of commands in HTML/index.html
+	target. Respawn make for stamp-pdf target so that $(wildcard *.eps) is
+	reinterpreted.
+	* interpreter/sparse.txi: Isolate conditionally built targets in
+	"@ifset ... @end ifset".
+
 2006-03-08  David Bateman  <dbateman@free.fr>
 
 	* conf.texi: Remove.
--- a/doc/interpreter/Makefile.in	Wed Mar 08 22:57:20 2006 +0000
+++ b/doc/interpreter/Makefile.in	Thu Mar 09 15:12:21 2006 +0000
@@ -112,8 +112,8 @@
 	mv BUGS ../../BUGS
 
 HTML/index.html: stamp-png $(TEXINFO)
+	-$(MAKEINFO) --html --ifinfo --output=HTML -I.. -I$(srcdir)/.. $(MAIN_TEXINFO)
 	$(INSTALL_DATA) *.png ./HTML
-	-$(MAKEINFO) --html --ifinfo --output=HTML -I.. -I$(srcdir)/.. $(MAIN_TEXINFO)
 
 check: all
 .PHONY: check
@@ -127,6 +127,9 @@
 	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 \
--- a/doc/interpreter/sparse.txi	Wed Mar 08 22:57:20 2006 +0000
+++ b/doc/interpreter/sparse.txi	Thu Mar 09 15:12:21 2006 +0000
@@ -592,9 +592,14 @@
 
 The standard Cholesky factorization of this matrix, can be
 obtained by the same command that would be used for a full
-matrix. This can be visualized with the command @code{r =
-chol(A); spy(r);}, @xref{fig:simplechol}. The original matrix
-had 
+matrix. This can be visualized with the command 
+@code{r = chol(A); spy(r);}.
+@ifset HAVE_CHOLMOD
+@ifset HAVE_COLAMD
+@xref{fig:simplechol}.
+@end ifset
+@end ifset
+The original matrix had 
 @ifinfo
 @ifnothtml
 43
@@ -995,8 +1000,14 @@
 Finally, in order to display the solution, we show each solved voltage 
 value in the z-axis for each simplex vertex.
 @ifset htmltex
+@ifset HAVE_CHOLMOD
+@ifset HAVE_UMFPACK
+@ifset HAVE_COLAMD
 @xref{fig:femmodel}.
 @end ifset
+@end ifset
+@end ifset
+@end ifset
 
 @example
   elemx = elems(:,[1,2,3,1])';