On change les puces pour des tirets.
Tentative d'amelioration de la gestion des liens. darcs-hash:20060430091013-68412-2b4c85ac52ad741467cdcb8d6fb0969b8ea45ae1.gz
This commit is contained in:
parent
7d45b34de9
commit
ce96ea7173
1 changed files with 14 additions and 17 deletions
|
@ -48,14 +48,12 @@ class Formatter(FormatterBase):
|
||||||
return u''
|
return u''
|
||||||
else:
|
else:
|
||||||
if "".join(self._text) == self._url:
|
if "".join(self._text) == self._url:
|
||||||
self._url = None
|
res = u''
|
||||||
self._text = None
|
|
||||||
return ''
|
|
||||||
else:
|
else:
|
||||||
self._url = None
|
res = u' [lien wiki]'
|
||||||
self._text = None
|
self._url = None
|
||||||
return u' [%s]' % (self._url)
|
self._text = None
|
||||||
|
return res
|
||||||
|
|
||||||
def url(self, on, url='', css=None, **kw):
|
def url(self, on, url='', css=None, **kw):
|
||||||
if on:
|
if on:
|
||||||
|
@ -64,13 +62,12 @@ class Formatter(FormatterBase):
|
||||||
return u''
|
return u''
|
||||||
else:
|
else:
|
||||||
if "".join(self._text) == self._url:
|
if "".join(self._text) == self._url:
|
||||||
self._url = None
|
res = u''
|
||||||
self._text = None
|
|
||||||
return ''
|
|
||||||
else:
|
else:
|
||||||
self._url = None
|
res = u' [cf wiki]'
|
||||||
self._text = None
|
self._url = None
|
||||||
return u' [%s]' % (self._url)
|
self._text = None
|
||||||
|
return res
|
||||||
|
|
||||||
def text(self, text):
|
def text(self, text):
|
||||||
self._did_para = False
|
self._did_para = False
|
||||||
|
@ -120,13 +117,13 @@ class Formatter(FormatterBase):
|
||||||
if self._nested_lists:
|
if self._nested_lists:
|
||||||
number = self._nested_lists[-1]
|
number = self._nested_lists[-1]
|
||||||
if number:
|
if number:
|
||||||
bullet = '%d.' % number
|
bullet = u'%d. ' % number
|
||||||
self._nested_lists[-1] = number + 1
|
self._nested_lists[-1] = number + 1
|
||||||
else:
|
else:
|
||||||
bullet = '*'
|
bullet = u'-'
|
||||||
return ' %s%s ' % (' ' * (len(self._nested_lists)-1), bullet)
|
return u' %s%s' % (u' ' * (len(self._nested_lists)-1), bullet)
|
||||||
else:
|
else:
|
||||||
return u' * '
|
return u' - '
|
||||||
else:
|
else:
|
||||||
if self._did_para:
|
if self._did_para:
|
||||||
return u''
|
return u''
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue