Commit ce96ea71 authored by glondu's avatar glondu

On change les puces pour des tirets.

Tentative d'amelioration de la gestion des liens.

darcs-hash:20060430091013-68412-2b4c85ac52ad741467cdcb8d6fb0969b8ea45ae1.gz
parent 7d45b34d
......@@ -48,14 +48,12 @@ class Formatter(FormatterBase):
return u''
else:
if "".join(self._text) == self._url:
self._url = None
self._text = None
return ''
res = u''
else:
self._url = None
self._text = None
return u' [%s]' % (self._url)
res = u' [lien wiki]'
self._url = None
self._text = None
return res
def url(self, on, url='', css=None, **kw):
if on:
......@@ -64,13 +62,12 @@ class Formatter(FormatterBase):
return u''
else:
if "".join(self._text) == self._url:
self._url = None
self._text = None
return ''
res = u''
else:
self._url = None
self._text = None
return u' [%s]' % (self._url)
res = u' [cf wiki]'
self._url = None
self._text = None
return res
def text(self, text):
self._did_para = False
......@@ -120,13 +117,13 @@ class Formatter(FormatterBase):
if self._nested_lists:
number = self._nested_lists[-1]
if number:
bullet = '%d.' % number
bullet = u'%d. ' % number
self._nested_lists[-1] = number + 1
else:
bullet = '*'
return ' %s%s ' % (' ' * (len(self._nested_lists)-1), bullet)
bullet = u'-'
return u' %s%s' % (u' ' * (len(self._nested_lists)-1), bullet)
else:
return u' * '
return u' - '
else:
if self._did_para:
return u''
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment