[devtools] Fix more bad HTML

Caught by data_lang/htm8-test.sh

There is some in the clang-coverage report, which is not too surprising!

data_lang/htm8-test.sh

@@ -91,7 +91,7 @@ test-site() {
   popd
 }
 
-readonly SOIL_ID=8913
+readonly SOIL_ID=8915
 readonly WWZ_DIR=_tmp/$SOIL_ID
 
 sync-wwz() {

doc/proc-func.md

@@ -300,9 +300,6 @@ This table shows simpler, more common cases.
     <td colspan=3 style="text-align: center; padding: 3em">...</td>
   </tr>
 
-</td>
-  </tr>
-
   <tr>
     <td>Named Args</td>
 <td>

lazylex/html.py

@@ -41,6 +41,21 @@ def __str__(self):
         return '(LexError %r)' % (self.s[self.start_pos:self.start_pos + 20])
 
 
+def FindLineNum(s, error_pos):
+    current_pos = 0
+    line_num = 1
+    while True:
+        newline_pos = s.find('\n', current_pos)
+        #log('current = %d, N %d, line %d', current_pos, newline_pos, line_num)
+
+        if newline_pos == -1:  # this is the last line
+            return line_num
+        if newline_pos >= error_pos:
+            return line_num
+        line_num += 1
+        current_pos = newline_pos + 1
+
+
 class ParseError(Exception):
     """
     Examples of parse errors
@@ -58,9 +73,13 @@ def __str__(self):
         if self.s is not None:
             assert self.start_pos != -1, self.start_pos
             snippet = (self.s[self.start_pos:self.start_pos + 20])
+
+            line_num = FindLineNum(self.s, self.start_pos)
         else:
             snippet = ''
-        return '(ParseError %r %r)' % (self.msg, snippet)
+            line_num = -1
+        msg = 'line %d: %r %r' % (line_num, self.msg, snippet)
+        return msg
 
 
 class Output(object):

lazylex/html_test.py

@@ -46,6 +46,15 @@ def testDotAll(self):
         print(p4.match('\n'))
 
 
+class FunctionsTest(unittest.TestCase):
+
+    def testFindLineNum(self):
+        s = 'foo\n' * 3
+        for pos in [1, 5, 10, 50]:  # out of bounds
+            line_num = html.FindLineNum(s, pos)
+            print(line_num)
+
+
 class TagLexerTest(unittest.TestCase):
 
     def testTagLexer(self):

soil/web.py

@@ -134,7 +134,7 @@ def _ParsePullTime(time_p_str):
 
 </tr>
 <tr class="spacer">
-  <td><td/>
+  <td></td>
 </tr>
 
 </table>
@@ -433,7 +433,7 @@ def ParseJobs(stdin):
 
 </tr>
 <tr class="spacer">
-  <td colspan=2><td/>
+  <td colspan=2></td>
 </tr>
 ''')
 

test/wild_report.py

@@ -333,7 +333,7 @@ def MakeHtmlGroup(title_str, body_str):
 {.end}
 
 {.if test top_level_links}
-<a href="version-info.txt">Date and OSH version<a>
+<a href="version-info.txt">Date and OSH version</a>
 {.end}
 
 <!-- page globals -->