# HG changeset patch
# User jwe
# Date 947054701 0
# Node ID c4ba3cada9cbc3f1dbaab2d403044376b4538d25
# Parent  6f6dc7a86a993451e85e8d19d41f6a4474a99171
[project @ 2000-01-05 06:45:00 by jwe]

diff -r 6f6dc7a86a99 -r c4ba3cada9cb doc/ChangeLog
--- a/doc/ChangeLog	Wed Jan 05 06:11:14 2000 +0000
+++ b/doc/ChangeLog	Wed Jan 05 06:45:01 2000 +0000
@@ -1,3 +1,12 @@
+2000-01-05  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* interpreter/Makefile.in: Don't generate octave.texi from octave.txi.
+	* interpreter/octave.texi: Rename from octave.txi.
+
+	* interpreter/munge-texi.cc (process_texi_input_file): Undo
+	previous change, since % doesn't work as a comment character after
+	texinfo.tex is included.
+
 2000-01-04  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* texinfo.tex: Update to version from texinfo-4.0.
diff -r 6f6dc7a86a99 -r c4ba3cada9cb doc/interpreter/Makefile.in
--- a/doc/interpreter/Makefile.in	Wed Jan 05 06:11:14 2000 +0000
+++ b/doc/interpreter/Makefile.in	Wed Jan 05 06:45:01 2000 +0000
@@ -18,8 +18,6 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
-MAIN_SOURCE := octave.txi
-
 SUB_SOURCE := arith.txi audio.txi basics.txi bugs.txi control.txi \
 	cp-idx.txi data.txi diffeq.txi emacs.txi errors.txi \
 	eval.txi expr.txi fn-idx.txi func.txi gpl.txi \
@@ -30,9 +28,9 @@
 	strings.txi struct.txi system.txi tips.txi var.txi \
 	vr-idx.txi
 
-SOURCES := $(MAIN_SOURCE) $(SUB_SOURCE)
+SOURCES := $(SUB_SOURCE)
 
-MAIN_TEXINFO := $(MAIN_SOURCE:.txi=.texi)
+MAIN_TEXINFO := octave.texi
 
 SUB_TEXINFO := $(SUB_SOURCE:.txi=.texi)
 
diff -r 6f6dc7a86a99 -r c4ba3cada9cb doc/interpreter/munge-texi.cc
--- a/doc/interpreter/munge-texi.cc	Wed Jan 05 06:11:14 2000 +0000
+++ b/doc/interpreter/munge-texi.cc	Wed Jan 05 06:45:01 2000 +0000
@@ -106,7 +106,7 @@
 static void
 process_texi_input_file (istream& is, ostream& os)
 {
-  os << "% DO NOT EDIT!  Generated automatically by munge-texi.\n\n";
+  os << "@c DO NOT EDIT!  Generated automatically by munge-texi.\n\n";
 
   bool bol = true;