Commit e433e0062199338a74f9911153b0f71ebbcf2bd6 - Feedmark

Get a lot closer to round-tripping with reasonable reformatting. Chris Pressey 3 months ago

3 changed file(s) with 20 addition(s) and 17 deletion(s). Raw diff Collapse all Expand all

-3

src/feedmark/formats/markdown.py less more

74	74
75	75	md = "{}\n{}\n\n".format(document.title, "=" * len(document.title))
76	76	md += markdownize_properties(document.properties, property_priority_order)
77		md += document.preamble
	77	md += document.preamble + "\n"
78	78	for section in document.sections:
79	79	md += "\n"
80		md += "### {}\n\n".format(section.title)
	80	md += "### {}\n\n".format(section.title.strip())
81	81	if section.images:
82	82	for entry in section.images:
83	83	if "link" in entry:

93	93	)
94	94	md += "\n"
95	95	md += markdownize_properties(section.properties, property_priority_order)
96		md += section.body
	96	md += section.body.lstrip() # FIXME lstrip this earlier
97	97	md += markdownize_link_ref_defs(document.link_ref_defs)
98	98	md += "\n"
99	99	return md

-2

src/feedmark/models.py less more

41	41
42	42
43	43	class Document(object):
44		def __init__(self, title):
45		self.title = title
	44	def __init__(self):
	45	self.title = "Untitled"
46	46	self.properties = OrderedDict()
47	47
48	48	self.preamble = None

51	51
52	52	def __str__(self):
53	53	return "document '{}'".format(self.title.encode("utf-8"))
	54
	55	def set_title(self, title):
	56	self.title = title
54	57
55	58	def add_property(self, kind, key, value):
56	59	if kind == ":":

+12

-12

src/feedmark/parser.py less more

5	5	from collections import OrderedDict
6	6	import re
7	7
8		from marko.block import Heading, BlankLine, List, Paragraph, LinkRefDef
	8	from marko.block import SetextHeading, Heading, BlankLine, List, Paragraph, LinkRefDef
9	9	from marko.inline import Image, Link
10	10	from marko.parser import Parser as MarkoParser
11	11

68	68
69	69	renderer = CleanMarkdownRenderer()
70	70
71		document = None
	71	document = Document()
72	72	preamble = ""
73	73	section = None
74	74	reading_images = True
75	75	reading_properties = True
76	76
77	77	for child in marko_document.children:
78		if isinstance(child, Heading):
	78	if isinstance(child, SetextHeading):
	79	title_text = child.children[0].children
	80	document.set_title(title_text)
	81	elif isinstance(child, Heading):
79	82	title_text = child.children[0].children
80	83	if child.level == 1:
81		document = Document(title_text)
	84	document.set_title(title_text)
82	85	elif child.level == 3:
83	86	section = Section(title_text)
84	87	reading_images = True
85	88	reading_properties = True
86		if not document:
87		document = Document("Untitled")
88	89	document.sections.append(section)
89	90	section.document = document
	91	elif section:
	92	section.add_to_body(renderer.render(child).strip())
	93	else:
	94	preamble += renderer.render(child)
90	95	elif reading_properties and isinstance(child, List):
91	96	reading_images = False
92	97	reading_properties = False

94	99	listitem_text = renderer.render(listitem).strip()
95	100	kind, key, value = parse_property(listitem_text)
96	101	if not section:
97		if not document:
98		document = Document("Untitled")
99	102	document.add_property(kind, key, value)
100	103	else:
101	104	section.add_property(kind, key, value)
102	105	elif isinstance(child, LinkRefDef):
103	106	# LinkRefDef elements always go in the main document, not sections.
104		# print(child.label.text, child.dest, child.title)
105	107	document.link_ref_defs.add(
106	108	strip_square_brackets(child.label.text), child.dest, child.title
107	109	)

115	117	if section:
116	118	section.add_to_body(renderer.render(child).strip())
117	119	else:
118		preamble += renderer.render(child).strip()
	120	preamble += renderer.render(child)
119	121
120		if not document:
121		document = Document("Untitled")
122	122	document.preamble = preamble.strip()
123	123
124	124	return document