found")
-+ logg.warning("\n%s", ET.tostring(funcsynopsis))
-+ text += ".fi" + "\n"
-+ text += ".sp" + "\n"
-+ return text
-
--def refsections2(refentry, title = ""):
-+def refsynopsisdiv2htm(refsynopsisdiv, title = ""):
-+ text = 'Synopsis
' + "\n"
-+ text += '' + "\n"
-+ for funcsynopsis in refsynopsisdiv.findall("funcsynopsis"):
-+ funcsynopsisinfo = ""
-+ found = funcsynopsis.find("funcsynopsisinfo")
-+ if found is not None: funcsynopsisinfo = found.text
-+ if funcsynopsisinfo:
-+ for info in funcsynopsisinfo.split("\n"):
-+ text += '%s' % htm(info)
-+ text += "\n"
-+ text += "\n"
-+ else:
-+ logg.debug("no found")
-+ logg.debug("\n%s", ET.tostring(funcsynopsis))
-+ funcs = 0
-+ for funcprototype in funcsynopsis.findall("funcprototype"):
-+ item = ET.tostring(funcprototype)
-+ item = str(item)
-+ item = item.replace("","")
-+ item = item.replace("","")
-+ item = item.replace("","")
-+ item = re.sub(r"([_\w]+)", lambda x: "%s" % x.group(1), item)
-+ item = item.replace("",'')
-+ item = item.replace("",'')
-+ text += item
-+ text += "\n"
-+ funcs += 1
-+ if not funcs:
-+ logg.warning("no found")
-+ logg.warning("\n%s", ET.tostring(funcsynopsis))
-+ text += "" + "\n"
-+ return text
-+
-+def refsections2(man, refentry, title = ""):
- text = ""
- for refsect in refentry.findall("refsect1"):
-- head = refsect.find("title")
-- if head is not None:
-- text += '.SH "%s"' % (esc(head.text.upper()))
-- text += "\n"
-- for para in list(refsect):
-- if para.tag == 'title':
-- continue
-- if para.tag == 'para':
-- text += cleanpara(para) + "\n"
-+ if man:
-+ text += refsect2man(refsect, title)
-+ text += ".sp\n"
-+ else:
-+ text += refsect2htm(refsect, title)
-+ return text
-+
-+
-+def refsect2man(refsect, title = ""):
-+ text = ""
-+ head = refsect.find("title")
-+ if head is not None:
-+ text += '.SH "%s"' % (esc(head.text.upper()))
-+ text += "\n"
-+ for para in list(refsect):
-+ if para.tag == 'title':
-+ continue
-+ if para.tag == 'para':
-+ text += para2man(para) + "\n"
-+ text += ".sp\n"
-+ continue
-+ if para.tag == 'itemizedlist':
-+ for item in list(para):
-+ text += para2man(item) + "\n"
- text += ".sp\n"
-- continue
-- if para.tag == 'itemizedlist':
-- for item in list(para):
-- text += cleanpara(item) + "\n"
-- text += ".sp\n"
-- continue
-- logg.warning("unknown para <%s>", para.tag)
-- text += ".sp\n"
-+ continue
-+ logg.warning("unknown para <%s>", para.tag)
-+ return text
-+
-+def refsect2htm(refsect, title = ""):
-+ text = ""
-+ head = refsect.find("title")
-+ if head is not None:
-+ text += '%s
' % htm(head.text)
-+ text += "\n"
-+ for para in list(refsect):
-+ if para.tag == 'title':
-+ continue
-+ if para.tag == 'para':
-+ text += "" + para2htm(para)
-+ text += "
" + "\n"
-+ continue
-+ if para.tag == 'itemizedlist':
-+ text += "" + "\n"
-+ continue
-+ logg.warning("unknown para <%s>", para.tag)
- return text
-
--def cleanpara(para):
-+def para2man(para):
- item = unescape(ET.tostring(para))
-+ item = str(item)
- item = item.replace("\n", " ")
- item = item.replace(" ", " ")
- item = item.replace(" ", " ")
-@@ -193,24 +311,53 @@
- item = item.replace("", "\\fP")
- return item
-
--def styleinfo():
-- styles = []
-- styles += [ ".ie \\n(.g .ds Aq \\(aq" ]
-- styles += [ ".el .ds Aq " ] # http://bugs.debian.org/507673
-- styles += [ ".nh" ] # disable hyphenation
-- styles += [ ".ad l" ] # align left, no justification
-- return "".join([ "%s\n" % part for part in styles ])
-+def para2htm(para):
-+ item = unescape(ET.tostring(para))
-+ item = str(item)
-+ item = item.replace("\n", " ")
-+ item = item.replace(" ", " ")
-+ item = item.replace(" ", " ")
-+ item = item.replace(" ", " ")
-+ item = item.replace(" ", " ")
-+ item = item.replace("", "")
-+ item = item.replace("", "")
-+ item = item.replace("", "")
-+ item = item.replace("", "")
-+ item = item.replace("", "")
-+ item = item.replace("", "")
-+ item = item.replace("", "")
-+ item = item.replace("", "")
-+ item = mailhref(item)
-+ return item
-+
-+def styleinfo2(man):
-+ if man:
-+ styles = []
-+ styles += [ ".ie \\n(.g .ds Aq \\(aq" ]
-+ styles += [ ".el .ds Aq " ] # http://bugs.debian.org/507673
-+ styles += [ ".nh" ] # disable hyphenation
-+ styles += [ ".ad l" ] # align left, no justification
-+ return "".join([ "%s\n" % part for part in styles ])
-+ else:
-+ return ""
-+
-+def refends2(man):
-+ if man:
-+ return ""
-+ else:
-+ return "" + "\n"
-
--def refentry2man(refentry, subdirectory = ".", title = ""):
-+def refentry2(man, refentry, subdirectory = ".", title = ""):
- if refentry.tag != "refentry":
- logg.warning("no found, not a docbook file?")
- logg.warning("found <%s> instead", refentry.tag)
- text = ""
-- text += refentryinfo2(refentry, title)
-- text += styleinfo()
-- text += refentrytitle2(refentry, title)
-- text += refsynopsisdiv2(refentry)
-- text += refsections2(refentry)
-+ text += refentryinfo2(man, refentry, title)
-+ text += styleinfo2(man)
-+ text += refentrytitle2(man, refentry, title)
-+ text += refsynopsisdiv2(man, refentry)
-+ text += refsections2(man, refentry)
-+ text += refends2(man)
-
- ### write the files
- refentrytitle = ""
-@@ -221,24 +368,70 @@
- if found is not None: refentrytitle = found.text
- found = section.find("manvolnum")
- if found is not None: manvolnum = found.text
-- written = 0
-+ #
-+ refpurpose = ""
- section = refentry.find("refnamediv")
-- for refname in section.findall("refname"):
-- if not refentrytitle:
-- refentrytitle = refname.text
-- manpage = refname.text
-- filename = "%s/man%s/%s.%s" % (subdirectory, manvolnum, manpage, manvolnum)
-- if manpage != refentrytitle:
-- manpagetext = ".so %s.%s\n" % (refentrytitle, manvolnum)
-- writefile(filename, manpagetext)
-- else:
-- manpagetext = text
-+ if not section:
-+ logg.warning("no found in for '%s', bad docbook?", refentrytitle)
-+ if not refentrytitle: raise Exception("not even a refentrytitle")
-+ manpages = [ refentrytitle ]
-+ else:
-+ manpages = [ refname.text for refname in section.findall("refname") ]
-+ found = section.find("refpurpose")
-+ if found is not None: refpurpose = found.text
-+ #
-+ overview = {}
-+ if man:
-+ written = 0
-+ for manpage in manpages:
-+ if not refentrytitle:
-+ refentrytitle = manpage
-+ filename = "%s/man%s/%s.%s" % (subdirectory, manvolnum, manpage, manvolnum)
-+ if manpage != refentrytitle:
-+ manpagetext = ".so %s.%s\n" % (refentrytitle, manvolnum)
-+ writefile(filename, manpagetext)
-+ else:
-+ manpagetext = text
-+ writefile(filename, manpagetext)
-+ written += 1
-+ overview[filename] = OverviewEntry(manpage, manvolnum, refpurpose)
-+ if not written:
-+ manpage = refentrytitle
-+ filename = "%s/man%s/%s.%s" % (subdirectory, manvolnum, manpage, manvolnum)
- writefile(filename, manpagetext)
-- written += 1
-- if not written:
-+ overview[filename] = OverviewEntry(manpage, manvolnum, refpurpose)
-+ else:
- manpage = refentrytitle
-- filename = "%s/man%s/%s.%s" % (subdirectory, manvolnum, manpage, manvolnum)
-- writefile(filename, manpagetext)
-+ filename = "%s/%s.%s.%s" % (subdirectory, manpage, manvolnum, "html")
-+ writefile(filename, text)
-+ overview[filename] = OverviewEntry(manpage, manvolnum, refpurpose)
-+ #
-+ return overview
-+
-+def splitname(filename):
-+ base = os.path.basename(filename)
-+ name, ext = os.path.splitext(base)
-+ return name
-+
-+def overview2(man, overview, subdirectory, docbook_filename):
-+ if not man:
-+ overview2htm(overview, subdirectory, docbook_filename)
-+
-+def overview2htm(overview, subdirectory, docbook_filename):
-+ basename = splitname(docbook_filename)
-+ text = "%s %s\n" % (htm(basename), htm("overview"))
-+ text += "\n"
-+ text += "%s %s
\n" % (htm(basename), htm("overview"))
-+ text += "\n"
-+ for filename in sorted(overview):
-+ entry = overview[filename]
-+ subdir_filename = os.path.basename(filename)
-+ text += '- %s - %s
' % (subdir_filename, entry.manpage, htm(entry.refpurpose))
-+ text += "\n"
-+ text += "
\n"
-+ text += "\n"
-+ filename = "%s/%s.%s" % (subdirectory, basename, "html")
-+ writefile(filename, text)
-
- def writefile(filename, manpagetext):
- dirname = os.path.dirname(filename)
-@@ -252,11 +445,17 @@
- if __name__ == "__main__":
- from optparse import OptionParser
- _o = OptionParser("%prog [options] docbookfiles...")
-- _o.add_option("-d","--into", metavar="DIR", default=".",
-+ _o.add_option("-o","--into", metavar="DIR", default=".",
- help="specify base directory for output [%default]")
-+ _o.add_option("-t","--make", metavar="DIR", default="man",
-+ help="make 'man'/'html' output pages [%default]")
- _o.add_option("-v","--verbose", action="count", default=0,
- help="increase logging level [%default]")
- opt, args = _o.parse_args()
- logging.basicConfig(level = max(0, logging.WARNING - 10 * opt.verbose))
-- for arg in args:
-- dbk2man(arg, opt.into)
-+ # ensure commandline is compatible with "xmlto -o DIR TYPE INPUTFILE"
-+ make = opt.make
-+ if args and args[0] in ("man", "html"):
-+ make = args[0]
-+ args = args[1:]
-+ dbk2(make == 'man', args, opt.into)
-diff -Nur zziplib-0.13.69/docs/make-doc.py zziplib-master/docs/make-doc.py
---- zziplib-0.13.69/docs/make-doc.py 2018-03-17 13:46:45.000000000 +0100
-+++ zziplib-master/docs/make-doc.py 2019-08-04 20:00:21.000000000 +0200
-@@ -215,7 +215,7 @@
- #else
- try:
- input = open(name, "r")
-- except IOError, error:
-+ except IOError as error:
- warn(#...... (scan_options) ...............
- "can not open input file: "+name, error)
- continue
-@@ -524,7 +524,7 @@
- # and finally print the html-formatted output
- try:
- F = open(o.libhtmlfile, "w")
--except IOError, error:
-+except IOError as error:
- warn(# ............. open(o.libhtmlfile, "w") ..............
- "can not open html output file: "+o.libhtmlfile, error)
- else:
-@@ -987,7 +987,7 @@
-
- try:
- F = open(o.docbookfile,"w")
--except IOError, error:
-+except IOError as error:
- warn("can not open docbook output file: "+o.docbookfile, error)
- else:
- print >> F, doctype, 'Manual Pages'
-@@ -1009,7 +1009,7 @@
- # _____________________________________________________________________
- try:
- F = open( o.dumpdocfile, "w")
--except IOError, error:
-+except IOError as error:
- warn ("can not open"+o.dumpdocfile,error)
- else:
- for func in function_list:
-diff -Nur zziplib-0.13.69/docs/makedocs.py zziplib-master/docs/makedocs.py
---- zziplib-0.13.69/docs/makedocs.py 2018-03-17 13:46:45.000000000 +0100
-+++ zziplib-master/docs/makedocs.py 2019-08-04 20:00:21.000000000 +0200
-@@ -1,3 +1,4 @@
-+from __future__ import print_function
- import sys
- from zzipdoc.match import *
- from zzipdoc.options import *
-@@ -37,7 +38,7 @@
- return None
- def print_list_mainheader(self):
- for t_fileheader in self.headers:
-- print t_fileheader.get_filename(), t_fileheader.src_mainheader()
-+ print (t_fileheader.get_filename(), t_fileheader.src_mainheader())
-
- class PerFunctionEntry:
- def __init__(self, header, comment, prototype):
-@@ -66,10 +67,10 @@
- functionprototype) ]
- def print_list_titleline(self):
- for funcheader in self.headers:
-- print funcheader.get_filename(), "[=>]", funcheader.get_titleline()
-+ print (funcheader.get_filename(), "[=>]", funcheader.get_titleline())
- def print_list_name(self):
- for funcheader in self.prototypes:
-- print funcheader.get_filename(), "[>>]", funcheader.get_name()
-+ print (funcheader.get_filename(), "[>>]", funcheader.get_name())
-
- class PerFunctionFamilyEntry:
- def __init__(self, leader):
-@@ -141,7 +142,7 @@
- entry.add(func) # the first
- self.entries += [ entry ]
- else:
-- print "head function '"+name+" has no entry"
-+ print ("head function '"+name+" has no entry")
- for func in self.functions:
- name = func.get_name()
- if name in self.retarget:
-@@ -150,14 +151,14 @@
- if entry is not None:
- entry.add(func) # will not add duplicates
- else:
-- print "into function '"+name+" has no entry"
-+ print ("into function '"+name+" has no entry")
- def print_list_name(self):
- for family in self.entries:
- name = family.get_name()
-- print name, ":",
-+ print (name, ":", end = " ")
- for item in family.functions:
-- print item.get_name(), ",",
-- print ""
-+ print (item.get_name(), ",", end = " ")
-+ print ("")
- class HtmlManualPageAdapter:
- def __init__(self, entry):
- """ usually takes a PerFunctionEntry """
-diff -Nur zziplib-0.13.69/docs/zzipdoc/commentmarkup.py zziplib-master/docs/zzipdoc/commentmarkup.py
---- zziplib-0.13.69/docs/zzipdoc/commentmarkup.py 2018-03-17 13:46:45.000000000 +0100
-+++ zziplib-master/docs/zzipdoc/commentmarkup.py 2019-08-04 20:00:21.000000000 +0200
-@@ -31,7 +31,7 @@
- comment = self.header.comment
- try:
- comment = self.header.get_otherlines()
-- except Exception, e:
-+ except Exception as e:
- pass
- mode = ""
- text = ""
-diff -Nur zziplib-0.13.69/docs/zzipdoc/docbookdocument.py zziplib-master/docs/zzipdoc/docbookdocument.py
---- zziplib-0.13.69/docs/zzipdoc/docbookdocument.py 2018-03-17 13:46:45.000000000 +0100
-+++ zziplib-master/docs/zzipdoc/docbookdocument.py 2019-08-04 20:00:21.000000000 +0200
-@@ -23,14 +23,14 @@
- def get_title(self):
- if self.title: return title
- try: return self.text[0].get_title()
-- except Exception, e: pass
-+ except Exception as e: pass
- return self.title
- def _xml_doctype(self, rootnode):
- return ""
- def _xml_text(self, xml):
- """ accepts adapter objects with .xml_text() """
- try: return xml.xml_text()
-- except Exception, e: print "DocbookDocument/text", e; pass
-+ except Exception as e: print "DocbookDocument/text", e; pass
- return str(xml)
- def _fetch_rootnode(self, text):
- fetch = Match(r"^[^<>]*<(\w+)\b")
-@@ -62,7 +62,7 @@
- print >>fd, xml_text
- fd.close()
- return True
-- except IOError, e:
-+ except IOError as e:
- print "could not open '"+filename+"'file", e
- return False
- def save_all(self, filename):
-@@ -90,6 +90,6 @@
- print >>fd, ""
- fd.close()
- return True
-- except IOError, e:
-+ except IOError as e:
- print "could not open '"+filename+"'file", e
- return False
-diff -Nur zziplib-0.13.69/docs/zzipdoc/functionlisthtmlpage.py zziplib-master/docs/zzipdoc/functionlisthtmlpage.py
---- zziplib-0.13.69/docs/zzipdoc/functionlisthtmlpage.py 2018-03-17 13:46:45.000000000 +0100
-+++ zziplib-master/docs/zzipdoc/functionlisthtmlpage.py 2019-08-04 20:00:21.000000000 +0200
-@@ -43,7 +43,7 @@
- callspec = entry.head_get_callspec()
- head_text = (""+namespec+""
- +callspec+" : "+prespec+"")
-- except Exception, e:
-+ except Exception as e:
- pass
- try:
- extraline = ""
-@@ -56,7 +56,7 @@
- ''+filename+''+
- '')
- body_text = extraline + body_text
-- except Exception, e:
-+ except Exception as e:
- pass
- def link(text):
- return (text & Match("(\w*)")
-diff -Nur zziplib-0.13.69/docs/zzipdoc/htm2dbk.py zziplib-master/docs/zzipdoc/htm2dbk.py
---- zziplib-0.13.69/docs/zzipdoc/htm2dbk.py 2018-03-17 13:46:45.000000000 +0100
-+++ zziplib-master/docs/zzipdoc/htm2dbk.py 2019-08-04 20:00:21.000000000 +0200
-@@ -146,7 +146,7 @@
- doc.filename = filename
- doc.add(f.read())
- f.close()
-- except IOError, e:
-+ except IOError as e:
- print >> sys.stderr, "can not open "+filename
- return doc.value()
-
-diff -Nur zziplib-0.13.69/docs/zzipdoc/htmldocument.py zziplib-master/docs/zzipdoc/htmldocument.py
---- zziplib-0.13.69/docs/zzipdoc/htmldocument.py 2018-03-17 13:46:45.000000000 +0100
-+++ zziplib-master/docs/zzipdoc/htmldocument.py 2019-08-04 20:00:21.000000000 +0200
-@@ -29,31 +29,31 @@
- def get_title(self):
- if self.title: return self.title
- try: return self.text[0].get_title()
-- except Exception, e: pass
-+ except Exception as e: pass
- return self.title
- def _html_meta(self, meta):
- """ accepts adapter objects with .html_meta() """
- try: return meta.html_meta()
-- except Exception, e: pass
-+ except Exception as e: pass
- return str(meta)
- def _html_style(self, style):
- """ accepts adapter objects with .html_style() and .xml_style() """
- ee = None
- try: return style.html_style()
-- except Exception, e: ee = e; pass
-+ except Exception as e: ee = e; pass
- try: return style.xml_style()
-- except Exception, e: print "HtmlDocument/style", ee, e; pass
-+ except Exception as e: print "HtmlDocument/style", ee, e; pass
- try: return str(style)
-- except Exception, e: print "HtmlDocument/style", e; return ""
-+ except Exception as e: print "HtmlDocument/style", e; return ""
- def _html_text(self, html):
- """ accepts adapter objects with .html_text() and .xml_text() """
- ee = None
- try: return html.html_text()
-- except Exception, e: ee = e; pass
-+ except Exception as e: ee = e; pass
- try: return html.xml_text()
-- except Exception, e: print "HtmlDocument/text", ee, e; pass
-+ except Exception as e: print "HtmlDocument/text", ee, e; pass
- try: return str(html)
-- except Exception, e: print "HtmlDocument/text", e; return " "
-+ except Exception as e: print "HtmlDocument/text", e; return " "
- def navigation(self):
- if self.navi:
- return self.navi
-@@ -63,7 +63,7 @@
- self.navi = fd.read()
- fd.close()
- return self.navi
-- except Exception, e:
-+ except Exception as e:
- pass
- return None
- def html_header(self):
-@@ -112,6 +112,6 @@
- print >>fd, self.html_footer()
- fd.close()
- return True
-- except IOError, e:
-+ except IOError as e:
- print "could not open '"+filename+"'file", e
- return False
-diff -Nur zziplib-0.13.69/docs/zzipdoc/textfile.py zziplib-master/docs/zzipdoc/textfile.py
---- zziplib-0.13.69/docs/zzipdoc/textfile.py 2018-03-17 13:46:45.000000000 +0100
-+++ zziplib-master/docs/zzipdoc/textfile.py 2019-08-04 20:00:21.000000000 +0200
-@@ -17,7 +17,7 @@
- self.src_text = fd.read()
- fd.close()
- return True
-- except IOError, e:
-+ except IOError as e:
- pass
- return False
- def assert_src_text(self):
-