Mercurial > forge

changeset 2543:85d419c88555 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc updates
author adb014
date Mon, 02 Oct 2006 06:22:48 +0000
parents 966fda525f93
children 0064fb925500
files main/comm/doc/Makefile main/fixed/doc/Makefile main/fixed/doc/fixed.txi
diffstat 3 files changed, 20 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/main/comm/doc/Makefile	Mon Oct 02 05:45:38 2006 +0000
+++ b/main/comm/doc/Makefile	Mon Oct 02 06:22:48 2006 +0000
@@ -18,7 +18,7 @@
 DOCSTRINGS = DOCSTRINGS
 INDEX = ../INDEX
 TMPDELETES = *.log *.dvi $(DOCSTRINGS) $(TEXIDOC) *~
-DELETES = $(TMPDELETES) *.ps *.pdf *.info $(DOCS) *.html comms/
+DELETES = $(TMPDELETES) *.ps *.pdf *.info $(DOCS) *.html comms/ html/
 
 all : $(PDFDOC) ../inst/doc.info
 
@@ -56,17 +56,23 @@
 %.html : %.texi
 	@if test "x$(TEXI2HTML)" != "x"; then \
 	  echo "Making html $@"; \
-	  $(TEXI2HTML) -I . -I ../../.. -expandinfo $< ; \
-	  if test ! -e "$1(@:.html=_toc.html)"; then \
+	  $(TEXI2HTML) -I . -I ../../.. --iftex -expandinfo $< ; \
+	  if test ! -e "$(@:.html=_toc.html)"; then \
 	    if test ! -e "comms/$@"; then \
 	      $(INSTALL_DATA) comms/$(@:.html=_toc.html) comms/$@ ; \
 	    fi; \
 	    $(LN_S) $@ comms/index.html; \
+	    mv comms html; \
+	    $(INSTALL_DATA) *.png html; \
 	  else \
 	    if test ! -e "$@"; then \
 	      $(INSTALL_DATA) $(@:.html=_toc.html) $@ ; \
 	    fi; \
-	    $(LN_S) $@ index.html; \
+	    if [ ! -e "html/" ]; then \
+	      mkdir html; \
+	    fi; \
+	    $(INSTALL_DATA) *.png *.html html; \
+	    $(LN_S) $@ html/index.html; \
 	  fi \
 	fi
 
--- a/main/fixed/doc/Makefile	Mon Oct 02 05:45:38 2006 +0000
+++ b/main/fixed/doc/Makefile	Mon Oct 02 06:22:48 2006 +0000
@@ -19,7 +19,7 @@
 DOCSTRINGS = DOCSTRINGS
 INDEX = ../INDEX
 TMPDELETES = *.log *.dvi $(DOCSTRINGS) $(FIXEDVERTARGET) $(TEXIDOC) *~
-DELETES = $(TMPDELETES) *.ps *.pdf *.info $(DOCS) *.html fixed/
+DELETES = $(TMPDELETES) *.ps *.pdf *.info $(DOCS) *.html fixed/ html/
 
 all : $(PDFDOC) ../inst/doc.info
 
@@ -62,16 +62,22 @@
 	@if test "x$(TEXI2HTML)" != "x"; then \
 	  echo "Making html $@"; \
 	  $(TEXI2HTML) -I . -I ../../.. -expandinfo $< ; \
-	  if test ! -e "$1(@:.html=_toc.html)"; then \
+	  if test ! -e "$(@:.html=_toc.html)"; then \
 	    if test ! -e "fixed/$@"; then \
 	      $(INSTALL_DATA) fixed/$(@:.html=_toc.html) fixed/$@ ; \
 	    fi; \
 	    $(LN_S) $@ fixed/index.html; \
+	    mv fixed html; \
+	    $(INSTALL_DATA) *.png html; \
 	  else \
 	    if test ! -e "$@"; then \
 	      $(INSTALL_DATA) $(@:.html=_toc.html) $@ ; \
 	    fi; \
-	    $(LN_S) $@ index.html; \
+	    if [ ! -e "html/" ]; then \
+	      mkdir html; \
+	    fi; \
+	    $(INSTALL_DATA) *.png *.html html; \
+	    $(LN_S) $@ html/index.html; \
 	  fi \
 	fi
 
--- a/main/fixed/doc/fixed.txi	Mon Oct 02 05:45:38 2006 +0000
+++ b/main/fixed/doc/fixed.txi	Mon Oct 02 06:22:48 2006 +0000
@@ -2887,7 +2887,7 @@
 both the fixed and floating point implementations of the same code. The
 instantiations of this class are
 
-@example @asis
+@example
 template Fft<double,Complex,ComplexRowVector>;
 template Fft<FixedPoint,FixedPointComplex,FixedComplexRowVector>;