Changeset 724:22b21a40da4e in hatta-dev for hatta.py

Timestamp:

01/10/10 20:36:38 (2 years ago)

Author:

Radomir Dopieralski <devel@…>

Branch:

default

Message:

make the html generated by the code highlighter validate -- use spans instead of divs

File:

• hatta.py (modified) (2 diffs)

hatta.py

@@ -2018 +2018 @@
             yield 0, '<div class="highlight"><pre>'
             for lineno, line in source:
-                if line.strip():
-                    yield (lineno,
-                           werkzeug.html.div(line.strip('\n'), id_="line_%d" %
-                                             formatter.line_no))
-                else:
-                    yield (lineno,
-                           werkzeug.html.div('&nbsp;', id_="line_%d" %
-                                             formatter.line_no))
+                yield (lineno,
+                       werkzeug.html.span(line, id_="line_%d" %
+                                         formatter.line_no))
                 formatter.line_no += 1
             yield 0, '</pre></div>'
@@ -2365 +2360 @@
 document.getElementsByTagName('link');for(var i=0;i<m.length;++i){var n=m[i];
 if(n.getAttribute('type')==='application/wiki'){l=n.getAttribute('href')}}if(
-l===''){return}var o=['p','h1','h2','h3','h4','h5','h6','pre','ul','div'];for(
-var j=0;j<o.length;++j){var m=document.getElementsByTagName(o[j]);for(var i=0;
-i<m.length;++i){var n=m[i];if(n.id&&n.id.match(/^line_\d+$/)){n.ondblclick=
-function(){var a=l+'#'+this.id.replace('line_','');document.location.href=a
-}}}}}}window.onload=function(){hatta_dates();hatta_edit()}"""
+l===''){return}var o=['p','h1','h2','h3','h4','h5','h6','pre','ul','div',
+'span'];for(var j=0;j<o.length;++j){var m=document.getElementsByTagName(o[j]);
+for(var i=0;i<m.length;++i){var n=m[i];if(n.id&&n.id.match(/^line_\d+$/)){
+n.ondblclick=function(){var a=l+'#'+this.id.replace('line_','');
+document.location.href=a}}}}}}
+window.onload=function(){hatta_dates();hatta_edit()}"""
     style = """\
 html { background: #fff; color: #2e3436;