Commit 2886f5c6 authored by Fred Drake's avatar Fred Drake

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.
parent 22e17c39
...@@ -330,7 +330,6 @@ class Job: ...@@ -330,7 +330,6 @@ class Job:
if not os.path.isdir(builddir): if not os.path.isdir(builddir):
os.mkdir(builddir) os.mkdir(builddir)
args = [LATEX2HTML_BINARY, args = [LATEX2HTML_BINARY,
"-init_file", L2H_INIT_FILE,
"-init_file", self.l2h_aux_init_file, "-init_file", self.l2h_aux_init_file,
"-dir", builddir, "-dir", builddir,
texfile texfile
...@@ -362,9 +361,13 @@ class Job: ...@@ -362,9 +361,13 @@ class Job:
def write_l2h_aux_init_file(self): def write_l2h_aux_init_file(self):
fp = open(self.l2h_aux_init_file, "w") fp = open(self.l2h_aux_init_file, "w")
fp.write("# auxillary init file for latex2html\n" fp.write(open(L2H_INIT_FILE).read())
fp.write("\n"
"# auxillary init file for latex2html\n"
"# generated by mkhowto\n" "# generated by mkhowto\n"
"push (@INC, '%s');\n"
"$NO_AUTO_LINK = 1;\n" "$NO_AUTO_LINK = 1;\n"
% os.path.dirname(L2H_INIT_FILE)
) )
options = self.options options = self.options
l2hoption(fp, "ABOUT_FILE", options.about_file) l2hoption(fp, "ABOUT_FILE", options.about_file)
...@@ -373,8 +376,6 @@ class Job: ...@@ -373,8 +376,6 @@ class Job:
l2hoption(fp, "ADDRESS", options.address) l2hoption(fp, "ADDRESS", options.address)
l2hoption(fp, "MAX_LINK_DEPTH", options.max_link_depth) l2hoption(fp, "MAX_LINK_DEPTH", options.max_link_depth)
l2hoption(fp, "MAX_SPLIT_DEPTH", options.max_split_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.write("1;\n")
fp.close() fp.close()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment