diff options
| -rw-r--r-- | sandbox/OpenDocument/README.txt | 2 | ||||
| -rw-r--r-- | sandbox/OpenDocument/docs/odtwriter.txt | 6 | ||||
| -rw-r--r-- | sandbox/OpenDocument/odtwriter/__init__.py | 5 | ||||
| -rw-r--r-- | sandbox/OpenDocument/setup.py | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/sandbox/OpenDocument/README.txt b/sandbox/OpenDocument/README.txt index 41a903fa3..5c0f324fe 100644 --- a/sandbox/OpenDocument/README.txt +++ b/sandbox/OpenDocument/README.txt @@ -46,6 +46,8 @@ Added command line flags --endnotes-end-doc and of the document instead of at the end of the page. Generates endnotes instead of footnotes. +A fix to table generation. + 2008/10/23 -- Version 1.3c -------------------------- diff --git a/sandbox/OpenDocument/docs/odtwriter.txt b/sandbox/OpenDocument/docs/odtwriter.txt index 7c49326b0..2b69ffec6 100644 --- a/sandbox/OpenDocument/docs/odtwriter.txt +++ b/sandbox/OpenDocument/docs/odtwriter.txt @@ -8,7 +8,7 @@ Odtwriter for Docutils :address: dkuhlman@rexx.com http://www.rexx.com/~dkuhlman -:revision: 1.3c +:revision: 1.3d :date: |date| .. |date| date:: %B %d, %Y @@ -54,8 +54,8 @@ Where to get it The source distribution of ODF/ODT writer for Docutils is here: -`http://www.rexx.com/~dkuhlman/odtwriter-1.3c.tar.gz -<http://www.rexx.com/~dkuhlman/odtwriter-1.3c.tar.gz>`_. +`http://www.rexx.com/~dkuhlman/odtwriter-1.3d.tar.gz +<http://www.rexx.com/~dkuhlman/odtwriter-1.3d.tar.gz>`_. ``odtwriter`` is also available via Subversion from the Docutils repository under diff --git a/sandbox/OpenDocument/odtwriter/__init__.py b/sandbox/OpenDocument/odtwriter/__init__.py index 37ac5109f..989fe930d 100644 --- a/sandbox/OpenDocument/odtwriter/__init__.py +++ b/sandbox/OpenDocument/odtwriter/__init__.py @@ -156,6 +156,8 @@ try: except ImportError, exp: Image = None +## import warnings +## warnings.warn('importing IPShellEmbed', UserWarning) ## from IPython.Shell import IPShellEmbed ## args = ['-pdb', '-pi1', 'In <\\#>: ', '-pi2', ' .\\D.: ', ## '-po', 'Out<\\#>: ', '-nosep'] @@ -2602,6 +2604,9 @@ class ODFTranslator(nodes.GenericNodeVisitor): if morecols > 0: attrib['table:number-columns-spanned'] = '%d' % (morecols + 1,) self.column_count += morecols + morerows = node.get('morerows', 0) + if morerows > 0: + attrib['table:number-rows-spanned'] = '%d' % (morerows + 1,) el1 = self.append_child('table:table-cell', attrib=attrib) self.set_current_element(el1) diff --git a/sandbox/OpenDocument/setup.py b/sandbox/OpenDocument/setup.py index 699c7c42a..f39683169 100644 --- a/sandbox/OpenDocument/setup.py +++ b/sandbox/OpenDocument/setup.py @@ -5,7 +5,7 @@ from setuptools import setup setup(name="odtwriter", - version="1.3c", + version="1.3d", description="convert rst to ODF/odt/odp.", author="Dave Kuhlman", author_email="dkuhlman@rexx.com", |