diff options
Diffstat (limited to 'asciidoc/a2x.py')
| -rw-r--r-- | asciidoc/a2x.py | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/asciidoc/a2x.py b/asciidoc/a2x.py index 756ae96..d55eeda 100644 --- a/asciidoc/a2x.py +++ b/asciidoc/a2x.py @@ -124,6 +124,16 @@ def verbose(msg): infomsg(msg) +def flatten(array): + ret = [] + for x in array: + if isinstance(x, (list, tuple)): + ret += x + else: + ret.append(x) + return ret + + class AttrDict(dict): """ Like a dictionary except values can be accessed as attributes i.e. obj.foo @@ -442,9 +452,8 @@ class A2X(AttrDict): Load a2x configuration file from default locations and --conf-file option. ''' - global ASCIIDOC CONF_FILE = 'a2x.conf' - a2xdir = os.path.dirname(os.path.realpath(__file__)) + a2xdir = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'resources') conf_files = [] # From a2x.py directory. conf_files.append(os.path.join(a2xdir, CONF_FILE)) @@ -546,7 +555,7 @@ class A2X(AttrDict): self.asciidoc_opts.append(('--attribute', attr)) # self.xsltproc_opts += ' --nonet' if self.verbose: - self.asciidoc_opts.append((' --verbose')) + self.asciidoc_opts.append(('--verbose',)) self.dblatex_opts += ' -V' if self.icons or self.icons_dir: params = [ @@ -700,8 +709,7 @@ class A2X(AttrDict): options.append(('--backend', 'docbook')) options.append(('-a', 'a2x-format=%s' % self.format)) options.append(('--out-file', docbook_file)) - asciidoc.reset_asciidoc() - asciidoc.execute('asciidoc', options, [self.asciidoc_file]) + asciidoc.cli(flatten(['asciidoc'] + options + [self.asciidoc_file])) if not self.no_xmllint and XMLLINT: shell('"%s" --nonet --noout --valid "%s"' % (XMLLINT, docbook_file)) @@ -877,8 +885,7 @@ class A2X(AttrDict): options.append(('-b', 'html4')) options.append(('-a', 'a2x-format=%s' % self.format)) options.append(('-o', html_file)) - asciidoc.reset_asciidoc() - asciidoc.execute('asciidoc', options, [self.asciidoc_file]) + asciidoc.cli(flatten(['asciidoc'] + options + [self.asciidoc_file])) cmd = '"%s" %s "%s" > "%s"' % (LYNX, LYNX_OPTS, html_file, text_file) shell(cmd) else: |