Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Markdown Output: Nested list fixes.

Browse Source
This commit is contained in:
John Schember 2011-09-04 17:07:45 -04:00
parent ea3837a3e8
commit 4a6a013bef
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/calibre/ebooks/txt/markdownml.py
View File

@ -59,6 +59,19 @@ class MarkdownMLizer(OEB2HTML):
# pre has 4 spaces. We trimmed 3 so anything with a space left is a pre.
text = re.sub('(?msu)^[ ]', ' ', text)
# Remove tabs that aren't at the beinning of a line
new_text = []
for l in text.splitlines():
start = re.match('\t+', l)
if start:
start = start.group()
else:
start = ''
l = re.sub('\t', '', l)
new_text.append(start + l)
text = '\n'.join(new_text)
print(text)
# Remove spaces from blank lines.
text = re.sub('(?msu)^[ ]+$', '', text)
@ -77,7 +90,7 @@ class MarkdownMLizer(OEB2HTML):
text = text.replace('\r', ' ')
# Condense redundant spaces created by replacing newlines with spaces.
text = re.sub(r'[ ]{2,}', ' ', text)
#text = re.sub(r'\t+', '', text)
text = re.sub(r'\t+', '', text)
if self.remove_space_after_newline == True:
text = re.sub(r'^ +', '', text)
self.remove_space_after_newline = False
@ -212,7 +225,8 @@ class MarkdownMLizer(OEB2HTML):
if li['name'] == 'ul':
text.append('+ ')
elif li['name'] == 'ol':
text.append(unicode(len(self.list)) + '. ')
li['num'] += 1
text.append(unicode(li['num']) + '. ')
# Process tags that contain text.
if hasattr(elem, 'text') and elem.text:
@ -241,7 +255,6 @@ class MarkdownMLizer(OEB2HTML):
elif t in ('ul', 'ol'):
if self.list:
self.list.pop()
if not self.list:
text.append('\n')
else:
if t == '**':