aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaylan Limberg <waylan@gmail.com>2008-08-22 17:45:08 -0400
committerWaylan Limberg <waylan@gmail.com>2008-08-22 17:45:08 -0400
commit4a570659a462593261fd4037946ad681d12b804a (patch)
treeeaa96968d9b269b3224d1a40e604d1935467a04c
parenta5cc42b5e441af8f34a122624d136cfcb772c65e (diff)
parent96576db3bf5f1b035dd312ba567facabd015b142 (diff)
downloadmarkdown-4a570659a462593261fd4037946ad681d12b804a.tar.gz
markdown-4a570659a462593261fd4037946ad681d12b804a.tar.bz2
markdown-4a570659a462593261fd4037946ad681d12b804a.zip
Merge branch 'master' of git@gitorious.org:python-markdown/mainline
-rwxr-xr-xmarkdown.py26
1 files changed, 7 insertions, 19 deletions
diff --git a/markdown.py b/markdown.py
index 93b2bc0..fca4225 100755
--- a/markdown.py
+++ b/markdown.py
@@ -636,7 +636,7 @@ class BacktickPattern (Pattern):
def handleMatch(self, m):
el = etree.Element(self.tag)
- el.text = m.group(3).strip()
+ el.text = AtomicString(m.group(3).strip())
return el
@@ -1439,8 +1439,6 @@ class Markdown:
level = len(m.group(1))
h = etree.SubElement(parentElem, "h%d" % level)
h.text = m.group(2).strip()
- #inline = etree.SubElement(h, "inline")
- #inline.text = m.group(2).strip()
else:
message(CRITICAL, "We've got a problem header!")
@@ -1464,16 +1462,11 @@ class Markdown:
for line in paragraph:
# it's hr
if RE.regExp["isline3"].match(line):
- #inline = etree.SubElement(el, "inline")
- #inline.text = "\n".join(dump)
el.text = "\n".join(dump)
- #etree.SubElement(el, "hr")
self._processHR(el)
dump = []
# it's header
elif line.startswith("#"):
- #inline = etree.SubElement(el, "inline")
- #inline.text = "\n".join(dump)
el.text = "\n".join(dump)
self._processHeader(parentElem, [line])
dump = []
@@ -1481,8 +1474,6 @@ class Markdown:
dump.append(line)
if dump:
text = "\n".join(dump)
- #inline = etree.SubElement(el, "inline")
- #inline.text = text
el.text = text
def _processUList(self, parentElem, lines, inList):
@@ -1667,7 +1658,7 @@ class Markdown:
code = etree.SubElement(pre, "code")
text = "\n".join(detabbed).rstrip()+"\n"
- code.text = text
+ code.text = AtomicString(text)
self._processSection(parentElem, theRest, inList)
def _handleInline(self, data, patternIndex=0):
@@ -1726,8 +1717,8 @@ class Markdown:
if node is None:
return data, True, len(leftData) + match.span(len(match.groups()))[0]
- if not isstr(node):
- if not node.tag in ["code", "pre"]:
+ if not isstr(node):
+ if not isinstance(node.text, AtomicString):
# We need to process current node too
for child in [node] + node.getchildren():
if not isstr(node):
@@ -1875,11 +1866,9 @@ class Markdown:
currElement = stack.pop()
insertQueue = []
for child in currElement.getchildren():
-
- #if child.tag == "inline":
- if not isinstance(child.text, AtomicString) and child.text \
- and not child.tag in ["code", "pre"]:
-
+
+ if not isinstance(child.text, AtomicString) and child.text:
+
text = child.text
child.text = None
lst = self._processPlaceholders(self._handleInline(
@@ -1895,7 +1884,6 @@ class Markdown:
for element, lst in insertQueue:
- #currElement.remove(element)
if element.text:
element.text = handleAttributes(element.text,
element)