[Python-checkins] CVS: python/dist/src/Doc/tools mkhowto,1.9,1.10

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Doc/tools
In directory slayer.i.sourceforge.net:/tmp/cvs-serv5251/tools

Modified Files:
	mkhowto 
Log Message:

Only use one initialization file for LaTeX2HTML; more recent versions only
use the last one specified on the command line instead of all of them.
Smaller changes to reflect updated support.


Index: mkhowto
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/mkhowto,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** mkhowto	2000/06/29 23:01:40	1.9
--- mkhowto	2000/07/24 23:03:32	1.10
***************
*** 331,335 ****
              os.mkdir(builddir)
          args = [LATEX2HTML_BINARY,
-                 "-init_file", L2H_INIT_FILE,
                  "-init_file", self.l2h_aux_init_file,
                  "-dir", builddir,
--- 331,334 ----
***************
*** 363,369 ****
      def write_l2h_aux_init_file(self):
          fp = open(self.l2h_aux_init_file, "w")
!         fp.write("# auxillary init file for latex2html\n"
                   "# generated by mkhowto\n"
                   "$NO_AUTO_LINK = 1;\n"
                   )
          options = self.options
--- 362,372 ----
      def write_l2h_aux_init_file(self):
          fp = open(self.l2h_aux_init_file, "w")
!         fp.write(open(L2H_INIT_FILE).read())
!         fp.write("\n"
!                  "# auxillary init file for latex2html\n"
                   "# generated by mkhowto\n"
+                  "push (@INC, '%s');\n"
                   "$NO_AUTO_LINK = 1;\n"
+                  % os.path.dirname(L2H_INIT_FILE)
                   )
          options = self.options
***************
*** 374,379 ****
          l2hoption(fp, "MAX_LINK_DEPTH", options.max_link_depth)
          l2hoption(fp, "MAX_SPLIT_DEPTH", options.max_split_depth)
-         # this line needed in case $IMAGE_TYPE changed
-         fp.write("adjust_icon_information();\n")
          fp.write("1;\n")
          fp.close()
--- 377,380 ----