handle generic tables
This commit is contained in:
parent
da302cd9b2
commit
db78bffb2c
2 changed files with 16 additions and 2 deletions
|
@ -147,6 +147,13 @@ line 1
|
||||||
indented 4 characters
|
indented 4 characters
|
||||||
}}}
|
}}}
|
||||||
|
|
||||||
|
= Tables =
|
||||||
|
== General table layout and HTML like options ==
|
||||||
|
{{{
|
||||||
|
||cell 1||cell2||cell 3||
|
||||||
|
}}}
|
||||||
|
||cell 1||cell2||cell 3||
|
||||||
|
|
||||||
= Rules =
|
= Rules =
|
||||||
{{{
|
{{{
|
||||||
--- (not a rule)
|
--- (not a rule)
|
||||||
|
|
|
@ -24,6 +24,7 @@ class Formatter(FormatterBase):
|
||||||
self._current_depth = 1
|
self._current_depth = 1
|
||||||
self._base_depth = 0
|
self._base_depth = 0
|
||||||
self.in_pre = 0
|
self.in_pre = 0
|
||||||
|
self.in_table = 0
|
||||||
self._text = None # XXX does not work with links in headings!!!!!
|
self._text = None # XXX does not work with links in headings!!!!!
|
||||||
|
|
||||||
self.list_depth = 0
|
self.list_depth = 0
|
||||||
|
@ -149,6 +150,8 @@ class Formatter(FormatterBase):
|
||||||
|
|
||||||
def paragraph(self, on, **kw):
|
def paragraph(self, on, **kw):
|
||||||
FormatterBase.paragraph(self, on)
|
FormatterBase.paragraph(self, on)
|
||||||
|
if self.in_table:
|
||||||
|
return ''
|
||||||
return ['', '\n\n'][not on]
|
return ['', '\n\n'][not on]
|
||||||
|
|
||||||
def linebreak(self, preformatted=1):
|
def linebreak(self, preformatted=1):
|
||||||
|
@ -164,13 +167,17 @@ class Formatter(FormatterBase):
|
||||||
return u' %s' % (u'=' * heading_depth)
|
return u' %s' % (u'=' * heading_depth)
|
||||||
|
|
||||||
def table(self, on, attrs={}, **kw):
|
def table(self, on, attrs={}, **kw):
|
||||||
|
if on:
|
||||||
|
self.in_table = 1
|
||||||
|
else:
|
||||||
|
self.in_table = 0
|
||||||
return ''
|
return ''
|
||||||
|
|
||||||
def table_row(self, on, attrs={}, **kw):
|
def table_row(self, on, attrs={}, **kw):
|
||||||
return ['|', ''][on]
|
return ['', '|'][not on]
|
||||||
|
|
||||||
def table_cell(self, on, attrs={}, **kw):
|
def table_cell(self, on, attrs={}, **kw):
|
||||||
return ['|', '|'][not on]
|
return ['|', ''][not on]
|
||||||
|
|
||||||
def anchordef(self, id):
|
def anchordef(self, id):
|
||||||
# not supported
|
# not supported
|
||||||
|
|
Loading…
Reference in a new issue