Menu
▾
▴
[Docutils-checkins] r4702 - in trunk/sandbox/dkuhlman/OpenDocument: odtwriter/__init__.py tools/rst2odt.py
|
From: <dku...@us...> - 2006-08-28 22:17:23
|
Author: dkuhlman
Date: 2006-08-29 00:17:16 +0200 (Tue, 29 Aug 2006)
New Revision: 4702
Modified:
trunk/sandbox/dkuhlman/OpenDocument/odtwriter/__init__.py
trunk/sandbox/dkuhlman/OpenDocument/tools/rst2odt.py
Log:
Fixes so that rst2odt.py/odtwriter will work when it is installed
under site-packages/docutils.
Fixes so that odtwriter will find the default styles.odt file in the
directory where odtwriter.py lives.
Added visit_/depart_ methods in support of the source link and
docutils footer.
Modified: trunk/sandbox/dkuhlman/OpenDocument/odtwriter/__init__.py
===================================================================
--- trunk/sandbox/dkuhlman/OpenDocument/odtwriter/__init__.py 2006-08-25 18:10:05 UTC (rev 4701)
+++ trunk/sandbox/dkuhlman/OpenDocument/odtwriter/__init__.py 2006-08-28 22:17:16 UTC (rev 4702)
@@ -226,11 +226,6 @@
'keeping email links usable with standards-compliant browsers.',
['--cloak-email-addresses'],
{'action': 'store_true', 'validator': frontend.validate_boolean}),
- ('Specify transistion (separator) character string. '
- 'Default: "**********"',
- ['--transition-string'],
- {'default': '**********', 'metavar': '<string>', }
- ),
))
settings_defaults = {
@@ -267,7 +262,6 @@
zfile = zipfile.ZipFile(f, 'w', zipfile.ZIP_DEFLATED)
zinfo = zipfile.ZipInfo('content.xml')
zfile.writestr(zinfo, self.visitor.content_astext())
- #zfile.writestr('styles.xml', self.visitor.styles_astext())
zfile.writestr('mimetype', MIME_TYPE)
s1 = self.create_manifest()
zinfo = zipfile.ZipInfo('META-INF/manifest.xml')
@@ -290,7 +284,8 @@
"""Retrieve the stylesheet from either a .xml file or from
a .odt (zip) file. Return the content as a string.
"""
- stylespath = utils.get_stylesheet_reference(self.settings)
+ stylespath = utils.get_stylesheet_reference(self.settings,
+ os.path.join(os.getcwd(), 'dummy'))
ext = os.path.splitext(stylespath)[1]
if ext == '.xml':
stylesfile = open(stylespath, 'r')
@@ -392,6 +387,7 @@
self.column_count = ord('A') - 1
self.trace_level = -1
self.optiontablestyles_generated = False
+ self.footer_element = None
def astext(self):
root = self.content_tree.getroot()
@@ -524,7 +520,7 @@
def visit_bullet_list(self, node):
#import pdb; pdb.set_trace()
- #ipshell('At visit_document')
+ #ipshell('At visit_bullet_list')
#print '(visit_bullet_list) node: %s' % node.astext()
el = etree.SubElement(self.current_element, 'text:list', attrib={
'text:style-name': 'rststyle-bulletlist',
@@ -554,6 +550,30 @@
def depart_copyright(self, node):
self.set_to_parent()
+ def visit_decoration(self, node):
+ global DEBUG
+ #ipshell('At visit_decoration')
+ #DEBUG = 1
+ #self.trace_visit_node(node)
+
+ def depart_decoration(self, node):
+ #global DEBUG
+ #self.trace_depart_node(node)
+ #DEBUG = 0
+ #ipshell('At depart_decoration')
+ el = self.current_element.getchildren()[-1]
+ self.current_element.remove(el)
+ self.footer_element = el
+
+ def visit_footer(self, node):
+ #ipshell('At visit_footer')
+ #self.trace_visit_node(node)
+ pass
+
+ def depart_footer(self, node):
+ #self.trace_depart_node(node)
+ pass
+
def visit_date(self, node):
el = self.append_child('text:p', attrib={
'text:style-name': 'Text_20_body'})
@@ -607,6 +627,8 @@
pass
def depart_document(self, node):
+ if self.footer_element is not None:
+ self.current_element.append(self.footer_element)
pass
def visit_docinfo(self, node):
@@ -707,11 +729,12 @@
def show_message(self, msg):
#print '*** tagname: [[%s]] msg: %s' % (msg.starttag(), msg.astext(), )
#print '*** msg: %s' % (dir(msg), )
- print '*** msg.asdom(): %s' % (msg.asdom(), )
+ #print '*** msg.asdom(): %s' % (msg.asdom(), )
+ print '*** msg.astext(): %s' % (msg.astext(), )
def visit_option_list(self, node):
- #self.document.reporter.debug_flag = 1
- #self.document.reporter.attach_observer(self.show_message)
+ self.document.reporter.debug_flag = 1
+ self.document.reporter.attach_observer(self.show_message)
table_name = 'rststyle-tableoption'
#
# Generate automatic styles
@@ -796,7 +819,7 @@
self.set_current_element(el)
def depart_option_list(self, node):
- #self.document.reporter.debug_flag = 0
+ self.document.reporter.debug_flag = 0
self.set_to_parent()
def visit_option_list_item(self, node):
@@ -852,6 +875,7 @@
def visit_paragraph(self, node):
#ipshell('At visit_paragraph')
+ #self.trace_visit_node(node)
if self.omit:
return
style_name = self.paragraph_style_stack[-1]
@@ -860,6 +884,7 @@
self.set_current_element(el)
def depart_paragraph(self, node):
+ #self.trace_depart_node(node)
if self.omit:
return
self.set_to_parent()
@@ -871,6 +896,7 @@
pass
def visit_reference(self, node):
+ #self.trace_visit_node(node)
text = node.astext()
if node.has_key('refuri'):
href = node['refuri']
@@ -889,6 +915,7 @@
self.set_current_element(el)
def depart_reference(self, node):
+ #self.trace_depart_node(node)
self.set_to_parent()
def visit_revision(self, node):
@@ -932,7 +959,7 @@
pass
def visit_table(self, node):
- self.trace_visit_node(node)
+ #self.trace_visit_node(node)
#ipshell('At visit_table')
self.table_count += 1
table_name = 'Table%d' % self.table_count
@@ -953,23 +980,23 @@
self.table_width = 0
def depart_table(self, node):
- self.trace_depart_node(node)
+ #self.trace_depart_node(node)
#ipshell('At depart_table')
self.current_table_style.attrib['style:width'] = \
'%dcm' % self.table_width
self.set_to_parent()
def visit_tgroup(self, node):
- self.trace_visit_node(node)
+ #self.trace_visit_node(node)
#ipshell('At visit_tgroup')
self.column_count = ord('A') - 1
def depart_tgroup(self, node):
- self.trace_depart_node(node)
+ #self.trace_depart_node(node)
pass
def visit_colspec(self, node):
- self.trace_visit_node(node)
+ #self.trace_visit_node(node)
#ipshell('At visit_colspec')
self.column_count += 1
table_name = 'Table%d' % (self.table_count, )
@@ -985,11 +1012,11 @@
self.table_width += colwidth
def depart_colspec(self, node):
- self.trace_depart_node(node)
+ #self.trace_depart_node(node)
pass
def visit_thead(self, node):
- self.trace_visit_node(node)
+ #self.trace_visit_node(node)
#ipshell('At visit_thead')
el = self.append_child('table:table-header-rows')
self.set_current_element(el)
@@ -997,24 +1024,24 @@
self.paragraph_style_stack.append('Table_20_Heading')
def depart_thead(self, node):
- self.trace_depart_node(node)
+ #self.trace_depart_node(node)
self.set_to_parent()
self.in_thead = False
self.paragraph_style_stack.pop()
def visit_row(self, node):
- self.trace_visit_node(node)
+ #self.trace_visit_node(node)
#ipshell('At visit_row')
self.column_count = ord('A') - 1
el = self.append_child('table:table-row')
self.set_current_element(el)
def depart_row(self, node):
- self.trace_depart_node(node)
+ #self.trace_depart_node(node)
self.set_to_parent()
def visit_entry(self, node):
- self.trace_visit_node(node)
+ #self.trace_visit_node(node)
#ipshell('At visit_entry')
table_name = 'Table%d' % (self.table_count, )
self.column_count += 1
@@ -1029,16 +1056,16 @@
self.set_current_element(el1)
def depart_entry(self, node):
- self.trace_depart_node(node)
+ #self.trace_depart_node(node)
self.set_to_parent()
def visit_tbody(self, node):
- self.trace_visit_node(node)
+ #self.trace_visit_node(node)
#ipshell('At visit_')
pass
def depart_tbody(self, node):
- self.trace_depart_node(node)
+ #self.trace_depart_node(node)
pass
@@ -1098,4 +1125,3 @@
def depart_transition(self, node):
pass
-
Modified: trunk/sandbox/dkuhlman/OpenDocument/tools/rst2odt.py
===================================================================
--- trunk/sandbox/dkuhlman/OpenDocument/tools/rst2odt.py 2006-08-25 18:10:05 UTC (rev 4701)
+++ trunk/sandbox/dkuhlman/OpenDocument/tools/rst2odt.py 2006-08-28 22:17:16 UTC (rev 4702)
@@ -18,7 +18,7 @@
#from docutils.writers.docutils_xml import Writer
#from docutils.writers.html4css1 import Writer
#from OOwriter import Writer
-from odtwriter import Writer
+from docutils.writers.odtwriter import Writer
description = ('Generates Docutils-native XML from standalone '
|