From: timv <tim.f.vieira@gmail.com>
Date: Thu, 13 Dec 2012 03:20:54 +0000 (-0500)
Subject: ()
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=32767f83743ca0166af1a6d2eda2026d0c905e47;p=dyna2

()
---

diff --git a/bin/prototype.py b/bin/prototype.py
index 3c4500d..5389a8d 100644
--- a/bin/prototype.py
+++ b/bin/prototype.py
@@ -206,9 +206,6 @@ def graph_styles(g):
 
 def main(dynafile):
 
-    with file(dynafile) as f:
-        code = f.read()
-
     d = dynafile + '.d'
     os.system('mkdir -p %s' % d)
 
@@ -255,21 +252,20 @@ function selectline(lineno) {
 </head>
 """
 
-#        print >> html, '<h1>%s</h1>' % dynafile
-#        print >> html, '<h2>Dyna source</h2>'
-
         print >> html, '<div id="dyna-source">'
         print >> html, '  <pre>'
+
         with file(dynafile) as f:
+            code = f.read().strip()
 
-            lexer = get_lexer_by_name("haskell", stripall=True)
-            formatter = HtmlFormatter(linenos=False)
-            c = re.sub('%', '--', f.read())
-            pretty_code = highlight(c, lexer, formatter)
-            pretty_code = re.sub('--', '%', pretty_code)
+        lexer = get_lexer_by_name("haskell")
+        formatter = HtmlFormatter(linenos=False)
+        c = re.sub('%', '--', code)
+        pretty_code = highlight(c, lexer, formatter)
+        pretty_code = re.sub('--', '%', pretty_code)
 
-            for lineno, line in enumerate(pretty_code.split('\n'), start=1):
-                print >> html, '<a onclick="selectline(%s)">%s</a>' % (lineno, line.rstrip())
+        for lineno, line in enumerate(pretty_code.split('\n'), start=1):
+            print >> html, '<a onclick="selectline(%s)">%s</a>' % (lineno, line.rstrip())
 
         print >> html, '  </pre>'
         print >> html, '</div>'
diff --git a/examples/matrixops.dyna b/examples/matrixops.dyna
index fe9ee98..9cf7d91 100644
--- a/examples/matrixops.dyna
+++ b/examples/matrixops.dyna
@@ -1,4 +1,5 @@
 
+
 % A and B are names of matricies
 times(A, B, I, J)    += m(A, I, K) * m(B, K, J).
 times(A, B, C, I, L) += m(A, I, K) * m(B, K, J) * m(C, J, L).