29
29
'p', 'ol', 'ul', 'li', 'pre', 'a',
30
30
'table', 'td', 'tr']
32
need_p = [] #format_tags[:]
33
need_p.extend(['ol', 'a', 'pagelink', 'interwiki', 'macro']) #XXX add more
32
need_p = [] # format_tags[:]
33
need_p.extend(['ol', 'a', 'pagelink', 'interwiki', 'macro']) # XXX add more
35
35
no_p_after = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'ol', 'ul', 'pre',
36
36
'small', 'big', 'table', 'td', 'tr', 'dt',
220
220
self.text('\n'.join(lines)) +
221
221
self._set_tag('processor', False))
223
def dynamic_content(self, parser, callback, arg_list = [], arg_dict = {},
224
returns_content = 1):
223
def dynamic_content(self, parser, callback, arg_list=[], arg_dict={},
225
225
content = parser[callback](*arg_list, **arg_dict)
226
226
if returns_content:
232
232
kw['href'] = str(url)
234
234
kw['class'] = str(css)
235
return self._set_tag('a', on, **kw)
235
return self._set_tag('a', on, **kw)
237
237
def attachment_link(self, on, url='', **kw):
262
262
def smiley(self, type):
263
263
return self._add_tag('smiley', type=type)
265
def strong(self, on):
265
def strong(self, on, **kw):
266
266
return self._set_tag('b', on)
268
def emphasis(self, on):
268
def emphasis(self, on, **kw):
269
269
return self._set_tag('em', on)
271
def highlight(self, on):
271
def highlight(self, on, **kw):
272
272
return self._set_tag('highlight', on)
274
def number_list(self, on, type=None, start=None):
274
def number_list(self, on, type=None, start=None, **kw):
275
275
return self._set_tag('ol', on, type=type, start=start)
277
def bullet_list(self, on):
277
def bullet_list(self, on, **kw):
278
278
return self._set_tag('ul', on)
280
280
def listitem(self, on, **kw):
281
281
return self._set_tag('li', on)
283
def sup(self, on, **kw):
284
284
return self._set_tag('sup', on)
286
def sub(self, on, **kw):
287
287
return self._set_tag('sub', on)
289
def strike(self, on):
289
def strike(self, on, **kw):
290
290
return self._set_tag('strike', on)
292
292
def code(self, on, **kw):
293
293
return self._set_tag('code', on)
295
def preformatted(self, on):
295
def preformatted(self, on, **kw):
296
296
self.in_pre = on != 0
297
297
return self._set_tag('pre', on)
299
def paragraph(self, on):
299
def paragraph(self, on, **kw):
300
300
FormatterBase.paragraph(self, on)
301
301
return self._set_tag('p', on)
315
315
result[str(name)] = value
318
def table(self, on, attrs={}):
318
def table(self, on, attrs={}, **kw):
319
319
return self._set_tag('table', on, **self._check_attrs(attrs))
321
def table_row(self, on, attrs={}):
321
def table_row(self, on, attrs={}, **kw):
322
322
return self._set_tag('tr', on, **self._check_attrs(attrs))
324
def table_cell(self, on, attrs={}):
324
def table_cell(self, on, attrs={}, **kw):
325
325
return self._set_tag('td', on, **self._check_attrs(attrs))
327
327
def anchordef(self, name):
328
328
return self._add_tag('anchor', name=name)
330
def anchorlink(self, on, name, id=None):
330
def anchorlink(self, on, name, **kw):
334
331
return self.url(on, "#" + name, **kw)
336
def underline(self, on):
333
def underline(self, on, **kw):
337
334
return self._set_tag('u', on)
339
def definition_list(self, on):
336
def definition_list(self, on, **kw):
340
337
return self._set_tag('dl', on)
342
def definition_term(self, on, compact=0):
339
def definition_term(self, on, compact=0, **kw):
343
340
# XXX may be not correct
344
341
# self._langAttr() missing
345
342
if compact and on:
348
345
return self._set_tag('dt', on)
350
def definition_desc(self, on):
347
def definition_desc(self, on, **kw):
351
348
# self._langAttr() missing
352
349
return self._set_tag('dd', on)
354
def image(self, **kw):
351
def image(self, src=None, **kw):
355
352
""" Take HTML <IMG> tag attributes in `attr`.
357
354
Attribute names have to be lowercase!
359
358
return self._add_tag('img', **kw)
361
def escapedText(self, text):
360
def escapedText(self, text, **kw):
362
361
return wikiutil.escape(text)
363
def small(self, on, **kw):
365
364
return self._set_tag('small', on)
366
def big(self, on, **kw):
368
367
return self._set_tag('big', on)
370
369
def code_area(self, on, code_id, code_type='code', show=0, start=-1, step=-1):
371
kw = {'id' : code_id,
376
375
kw['start'] = start