Detect "See also" blocks, also when they're on multiple lines

cbonte · Apr 21, 2012 · 4764b55 · 4764b55
1 parent cf569dd
commit 4764b55
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 14 deletions.
diff --git a/css/page.css b/css/page.css
@@ -166,6 +166,8 @@ h5 {
 
 h5,
 .table th, .table td,
+.unpre,
 .example-desc {
 	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+        white-space: normal;
 }
diff --git a/parser/__init__.py b/parser/__init__.py
@@ -15,6 +15,13 @@ def __init__(self, pctxt):
     def parse(self, line):
         return line
 
+    def get_indent(self, line):
+        indent = 0
+        length = len(line)
+        while indent < length and line[indent] == ' ':
+            indent += 1
+        return indent
+
 
 class PContext:
     def __init__(self, templates):

diff --git a/parser/example.py b/parser/example.py
@@ -71,11 +71,3 @@ def parse(self, line):
                 content=content
             )
         return line
-
-    def get_indent(self, line):
-        indent = 0
-        length = len(line)
-        while indent < length and line[indent] == ' ':
-            indent += 1
-        return indent
-
diff --git a/parser/seealso.py b/parser/seealso.py
@@ -4,8 +4,34 @@
 class Parser(parser.Parser):
     def __init__(self, pctxt):
         parser.Parser.__init__(self, pctxt)
-        template = pctxt.templates.get_template("parser/seealso.tpl")
-        self.replace = template.render().strip()
+        #template = pctxt.templates.get_template("parser/seealso.tpl")
+        #self.replace = template.render().strip()
 
     def parse(self, line):
-        return re.sub(r'(See also *:)', self.replace, line)
+        #return re.sub(r'(See also *:)', self.replace, line)
+        pctxt = self.pctxt
+
+        result = re.search(r'(See also *:)', line)
+        if result:
+            label = result.group(0)
+
+            desc = re.sub(r'.*See also *:', '', line).strip()
+
+            indent = self.get_indent(line)
+
+            # Some descriptions are on multiple lines
+            while pctxt.has_more_lines(1) and self.get_indent(pctxt.get_line(1)) > indent:
+                desc += " " + pctxt.get_line(1).strip()
+                pctxt.next()
+
+            pctxt.eat_empty_lines()
+            pctxt.next()
+            pctxt.stop = True
+
+            template = pctxt.templates.get_template("parser/seealso.tpl")
+            return template.render(
+                label=label,
+                desc=desc,
+            )
+
+        return line
diff --git a/templates/parser/seealso.tpl b/templates/parser/seealso.tpl
@@ -1 +1,3 @@
-<span class="label label-see-also">\1</span>
+<div class="page-header unpre">
+    <b>${label}</b> ${desc}
+</div>
diff --git a/templates/parser/table/row.tpl b/templates/parser/table/row.tpl
@@ -17,9 +17,9 @@
 % for extra in col['extra']:
 <span class="pull-right">${extra}</span>\
 % endfor
-${data}</a>
+${data}</a>\
 % else:
-${data}
+${data}\
 % endif
 </td>\
 % endfor