summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Rackham <srackham@methods.co.nz>2010-11-13 13:53:27 +1300
committerStuart Rackham <srackham@methods.co.nz>2010-11-13 13:53:27 +1300
commit79287498c52ba7503c08f65e317efb44fecb9154 (patch)
treeef059f0dd6cd9fc3a180599fe2a664db08a4cfd3
parent7b0eb2d6802b868cf9f8c5fe3383826fff26b2c5 (diff)
downloadasciidoc-79287498c52ba7503c08f65e317efb44fecb9154.tar.gz
- a2x: fixed: --xsl-file problem if relative file paths are used.
- a2x: fixed: default to chapter level chunking in EPUB files. - Updated configure.ac version number.
-rwxr-xr-xa2x.py7
-rw-r--r--configure.ac2
2 files changed, 4 insertions, 5 deletions
diff --git a/a2x.py b/a2x.py
index 614598a..a709921 100755
--- a/a2x.py
+++ b/a2x.py
@@ -385,6 +385,7 @@ class A2X(AttrDict):
if self.xsl_file is not None:
if not os.path.isfile(self.xsl_file):
die('missing XSL file: %s' % self.xsl_file)
+ self.xsl_file = os.path.abspath(self.xsl_file)
# Load ordered files.
for f in conf_files:
if os.path.isfile(f):
@@ -459,10 +460,6 @@ class A2X(AttrDict):
]
if self.stylesheet:
params += ['html.stylesheet "%s"' % self.stylesheet]
- if self.format == 'chunked':
- # Books chunked at chapter level (articles at section level).
- if self.doctype == 'book':
- params += ['chunk.section.depth 0']
if self.format == 'htmlhelp':
params += ['htmlhelp.chm "%s"' % self.basename('.chm'),
'htmlhelp.hhp "%s"' % self.basename('.hhp'),
@@ -470,6 +467,8 @@ class A2X(AttrDict):
'htmlhelp.hhc "%s"' % self.basename('.hhc')]
if self.doctype == 'book':
params += ['toc.section.depth 1']
+ # Books are chunked at chapter level.
+ params += ['chunk.section.depth 0']
for o in params:
if o.split()[0]+' ' not in self.xsltproc_opts:
self.xsltproc_opts += ' --stringparam ' + o
diff --git a/configure.ac b/configure.ac
index ce855f0..cd9f4ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(asciidoc, 8.3.1)
+AC_INIT(asciidoc, 8.6.3)
AC_CONFIG_FILES(Makefile)