summaryrefslogtreecommitdiff
path: root/helpcontent2
diff options
context:
space:
mode:
authorTimo Richter <timo@iera.de>2011-08-26 20:30:23 +0200
committerJan Holesovsky <kendy@suse.cz>2011-08-26 21:02:11 +0200
commitba72158c682cf13231131637600bea2ec7c79a99 (patch)
tree57015f390e6df84874f6563cf8fb973bacfeebed /helpcontent2
parentaf8137ba2605d156e44a75f3bd1d5c8858a30f25 (diff)
Bugfix in docbook table
Diffstat (limited to 'helpcontent2')
-rwxr-xr-xhelpcontent2/wiki-to-help/convert.py3
-rw-r--r--helpcontent2/wiki-to-help/mwlib_mods/docbook_table_tags.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/helpcontent2/wiki-to-help/convert.py b/helpcontent2/wiki-to-help/convert.py
index 70a660ddc8..323a834d19 100755
--- a/helpcontent2/wiki-to-help/convert.py
+++ b/helpcontent2/wiki-to-help/convert.py
@@ -190,7 +190,8 @@ class Converter(object):
MW.quietCall(MW.render,renderArgs,showErr=self.verbose)
shutil.copy(docbookfile,self.dest)
print "Parsing docbook"
- if not self.ex("/usr/bin/xsltproc","--nonet","--novalid","-o",tmp+'/',self.style,docbookfile): return False
+ xsltreturn = self.ex("/usr/bin/xsltproc","--nonet","--novalid","-o",tmp+'/',self.style,docbookfile)
+ if not xsltreturn: return False
self.setStartpage(self.startpage)
self.writeHhp()
if self.createChm:
diff --git a/helpcontent2/wiki-to-help/mwlib_mods/docbook_table_tags.py b/helpcontent2/wiki-to-help/mwlib_mods/docbook_table_tags.py
index f71ef12e99..7ec527b753 100644
--- a/helpcontent2/wiki-to-help/mwlib_mods/docbook_table_tags.py
+++ b/helpcontent2/wiki-to-help/mwlib_mods/docbook_table_tags.py
@@ -67,7 +67,8 @@ class MyDocBookWriter(mwlib.docbookwriter.DocBookWriter):
nested tables not supported in DocBook V4.4
"""
table = Element("informaltable") #border=1
- tgroup = SubElement(table,"tgroup")
+ tgroup = SubElement(table,"tgroup",cols="1") # FIXME: cols=1 is not always correct
+
tbody = SubElement(tgroup,"tbody")
setVList(table, t)
if t.caption: