--- a/DebugClients/Python3/coverage/htmlfiles/pyfile.html	Thu Jan 07 12:31:11 2010 +0000
+++ b/DebugClients/Python3/coverage/htmlfiles/pyfile.html	Thu Jan 07 13:13:31 2010 +0000
@@ -1,19 +1,21 @@
-<!doctype html PUBLIC "-//W3C//DTD html 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
+<meta http-equiv='Content-Type' content='text/html; charset=utf-8'>
 <title>Coverage for {{cu.name|escape}}</title>
 <link rel='stylesheet' href='style.css' type='text/css'>
-<script src='jquery-1.3.2.min.js'></script>
-<script>
+<script type='text/javascript' src='jquery-1.3.2.min.js'></script>
+<script type='text/javascript'>
 function toggle_lines(btn, cls) {
     var btn = $(btn);
-    if (btn.hasClass("hide")) {
-        $("#source ."+cls).removeClass("hide");
-        btn.removeClass("hide");
+    var hide = "hide_"+cls;
+    if (btn.hasClass(hide)) {
+        $("#source ."+cls).removeClass(hide);
+        btn.removeClass(hide);
     }
     else {
-        $("#source ."+cls).addClass("hide");
-        btn.addClass("hide");
+        $("#source ."+cls).addClass(hide);
+        btn.addClass(hide);
     }
 }
 </script>
@@ -22,13 +24,16 @@
 <div id='header'>
     <div class='content'>
         <h1>Coverage for <b>{{cu.name|escape}}</b> :
-            <span class='pc_cov'>{{pc_cov|format_pct}}%</span>
+            <span class='pc_cov'>{{nums.pc_covered|format_pct}}%</span>
         </h1>
         <h2 class='stats'>
-            {{n_stm}} statements
-            <span class='{{c_run.strip}}' onclick='toggle_lines(this, "run")'>{{n_run}} run</span>
-            <span class='{{c_exc.strip}}' onclick='toggle_lines(this, "exc")'>{{n_exc}} excluded</span>
-            <span class='{{c_mis.strip}}' onclick='toggle_lines(this, "mis")'>{{n_mis}} missing</span>
+            {{nums.n_statements}} statements
+            <span class='{{c_run.strip}}' onclick='toggle_lines(this, "run")'>{{nums.n_executed}} run</span>
+            <span class='{{c_exc.strip}}' onclick='toggle_lines(this, "exc")'>{{nums.n_excluded}} excluded</span>
+            <span class='{{c_mis.strip}}' onclick='toggle_lines(this, "mis")'>{{nums.n_missing}} missing</span>
+            {% if arcs %}
+                <span class='{{c_par.strip}}' onclick='toggle_lines(this, "par")'>{{n_par}} partial</span>
+            {% endif %}
         </h2>
     </div>
 </div>
@@ -43,7 +48,7 @@
 </td>
 <td class='text' valign='top'>
     {% for line in lines %}
-    <p class='{{line.class}}'>{{line.text.rstrip|escape|not_empty}}</p>
+    <p class='{{line.class}}'>{% if line.annotate %}<span class='annotate' title='{{line.annotate_title}}'>{{line.annotate}}</span>{% endif %}{{line.html}}<span class='strut'>&nbsp;</span></p>
     {% endfor %}
 </td>
 </tr>