diff --git a/Doc/Makefile b/Doc/Makefile
index 6c2afb1e1c4..9595fcabbc9 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -58,6 +58,8 @@ L2H= /ufs/guido/l2h/latex2html
L2HARGS= -address $$USER@`domainname` -dont_include myformat
# Destination directory for output of libwww target.
+PARTPARSE= $(PYTHON) ./partparse.pyc
+TEXI2HTML= $(PYTHON) ./texi2html.pyc
LIBHTMLDIR= ./python-lib
# Install destination -- not used now but might be useful some time...
@@ -165,22 +167,27 @@ qua.ps: qua.dvi
# The remaining part of the Makefile is concerned with various
# conversions, as described above. See also the README file.
-lib.texi: lib*.tex texipre.dat texipost.dat partparse.py fix.el
- $(PYTHON) partparse.py -o @lib.texi `./whichlibs`
- $(EMACS) -batch -l fix.el -f save-buffer -kill
- mv @lib.texi lib.texi
+.SUFFIXES: .py .pyc
+
+.py.pyc:
+ $(PYTHON) -c "import $*"
.PRECIOUS: lib.texi
+lib.texi: lib*.tex texipre.dat texipost.dat partparse.pyc fix.el
+ $(PARTPARSE) -o @lib.texi `./whichlibs`
+ $(EMACS) -batch -l fix.el -f save-buffer -kill
+ mv @lib.texi lib.texi
+
python-lib.info: lib.texi
-$(MAKEINFO) --footnote-style end --fill-column 72 \
--paragraph-indent 0 lib.texi
lib.info: python-lib.info
-libwww: lib.texi
+libwww: lib.texi texi2html.pyc
if test ! -d $(LIBHTMLDIR); then mkdir $(LIBHTMLDIR); else true; fi
- $(PYTHON) texi2html.py -d lib.texi $(LIBHTMLDIR)
+ $(TEXI2HTML) -d lib.texi $(LIBHTMLDIR)
# Targets to convert the manuals to HTML using Nikos Drakos' LaTeX to
# HTML converter. For more info on this program, see
diff --git a/Doc/texi2html.py b/Doc/texi2html.py
index 50842842579..c24a01925e5 100644
--- a/Doc/texi2html.py
+++ b/Doc/texi2html.py
@@ -48,7 +48,7 @@ kwprog = regex.compile('@[a-z]+') # Keyword (embedded, usually with {} args)
spprog = regex.compile('[\n@{}&<>]') # Special characters in running text
miprog = regex.compile( \
'^\* \([^:]*\):\(:\|[ \t]*\([^\t,\n.]+\)\([^ \t\n]*\)\)[ \t\n]*')
- # menu item (Yuck!)
+ # menu item (Yuck!)
class Node:
@@ -57,7 +57,7 @@ class Node:
A Node accumulates its contents, takes care of links to other Nodes
and saves itself when it is finished and all links are resolved. """
-
+
def __init__ (self, dir, name, topname, title, next, prev, up):
self.dirname = dir
self.name = name
@@ -72,7 +72,7 @@ class Node:
self.lines = []
self.type = 0
self.cont = ''
-
+
def write (self, *lines):
map(self.lines.append, lines)
@@ -83,7 +83,7 @@ class Node:
fp.write (self.epilogue)
fp.close ()
-
+
def link(self, label, nodename):
if nodename:
if string.lower(nodename) == '(dir)':
@@ -93,7 +93,7 @@ class Node:
self.write(label, ': ', nodename, ' \n')
-
+
def finalize(self):
length = len (self.lines)
self.text = string.joinfields (self.lines, '')
@@ -109,1317 +109,1317 @@ class Node:
self.write ('
\n')
links = string.joinfields(self.lines, '')
self.lines = []
-
+
self.prologue = ('\n'
'\n'
'\n'
' ' + self.title + '\n'
'\n' + \
links)
-
+
if length > 20:
self.epilogue = '\n%s\n' % links
else:
self.epilogue = '
\n'
-
+
class TexinfoParser:
- # Initialize an instance
- def __init__(self):
- self.unknown = {} # statistics about unknown @-commands
- self.filenames = {} # Check for identical filenames
- self.debugging = 0 # larger values produce more output
- self.nodefp = None # open file we're writing to
- self.nodelineno = 0 # Linenumber relative to node
- self.links = None # Links from current node
- self.savetext = None # If not None, save text head instead
- self.savestack = [] # If not None, save text head instead
- self.dirname = 'tmp' # directory where files are created
- self.includedir = '.' # directory to search @include files
- self.nodename = '' # name of current node
- self.topname = '' # name of top node (first node seen)
- self.title = '' # title of this whole Texinfo tree
- self.resetindex() # Reset all indices
- self.contents = [] # Reset table of contents
- self.numbering = [] # Reset section numbering counters
- self.nofill = 0 # Normal operation: fill paragraphs
- self.values={'html': 1} # Names that should be parsed in ifset
- self.stackinfo={} # Keep track of state in the stack
- # XXX The following should be reset per node?!
- self.footnotes = [] # Reset list of footnotes
- self.itemarg = None # Reset command used by @item
- self.itemnumber = None # Reset number for @item in @enumerate
- self.itemindex = None # Reset item index name
- self.node = None
- self.nodestack = []
- self.cont = 0
- self.includedepth = 0
- # Set (output) directory name
- def setdirname(self, dirname):
- self.dirname = dirname
+ # Initialize an instance
+ def __init__(self):
+ self.unknown = {} # statistics about unknown @-commands
+ self.filenames = {} # Check for identical filenames
+ self.debugging = 0 # larger values produce more output
+ self.nodefp = None # open file we're writing to
+ self.nodelineno = 0 # Linenumber relative to node
+ self.links = None # Links from current node
+ self.savetext = None # If not None, save text head instead
+ self.savestack = [] # If not None, save text head instead
+ self.dirname = 'tmp' # directory where files are created
+ self.includedir = '.' # directory to search @include files
+ self.nodename = '' # name of current node
+ self.topname = '' # name of top node (first node seen)
+ self.title = '' # title of this whole Texinfo tree
+ self.resetindex() # Reset all indices
+ self.contents = [] # Reset table of contents
+ self.numbering = [] # Reset section numbering counters
+ self.nofill = 0 # Normal operation: fill paragraphs
+ self.values={'html': 1} # Names that should be parsed in ifset
+ self.stackinfo={} # Keep track of state in the stack
+ # XXX The following should be reset per node?!
+ self.footnotes = [] # Reset list of footnotes
+ self.itemarg = None # Reset command used by @item
+ self.itemnumber = None # Reset number for @item in @enumerate
+ self.itemindex = None # Reset item index name
+ self.node = None
+ self.nodestack = []
+ self.cont = 0
+ self.includedepth = 0
+ # Set (output) directory name
+ def setdirname(self, dirname):
+ self.dirname = dirname
- # Set include directory name
- def setincludedir(self, includedir):
- self.includedir = includedir
+ # Set include directory name
+ def setincludedir(self, includedir):
+ self.includedir = includedir
- # Parse the contents of an entire file
- def parse(self, fp):
- line = fp.readline()
- lineno = 1
- while line and (line[0] == '%' or blprog.match(line) >= 0):
- line = fp.readline()
- lineno = lineno + 1
- if line[:len(MAGIC)] <> MAGIC:
- raise SyntaxError, 'file does not begin with '+`MAGIC`
- self.parserest(fp, lineno)
+ # Parse the contents of an entire file
+ def parse(self, fp):
+ line = fp.readline()
+ lineno = 1
+ while line and (line[0] == '%' or blprog.match(line) >= 0):
+ line = fp.readline()
+ lineno = lineno + 1
+ if line[:len(MAGIC)] <> MAGIC:
+ raise SyntaxError, 'file does not begin with '+`MAGIC`
+ self.parserest(fp, lineno)
- # Parse the contents of a file, not expecting a MAGIC header
- def parserest(self, fp, initial_lineno):
- lineno = initial_lineno
- self.done = 0
- self.skip = 0
- self.stack = []
- accu = []
- while not self.done:
- line = fp.readline()
- self.nodelineno = self.nodelineno + 1
- if not line:
- if accu:
- if not self.skip: self.process(accu)
- accu = []
- if initial_lineno > 0:
- print '*** EOF before @bye'
- break
- lineno = lineno + 1
- if cmprog.match(line) >= 0:
- a, b = cmprog.regs[1]
- cmd = line[a:b]
- if cmd in ('noindent', 'refill'):
- accu.append(line)
- else:
- if accu:
- if not self.skip:
- self.process(accu)
- accu = []
- self.command(line)
- elif blprog.match(line) >= 0 and \
- 'format' not in self.stack and \
- 'example' not in self.stack:
- if accu:
- if not self.skip:
- self.process(accu)
- self.write('