Preprocess: fix removal of See Also links

PeterFeicht · PeterFeicht · commit 084e449388f8 · 2018-10-07T19:16:19.000+02:00
This fixes removal of See Also links between the C and C++ parts of the
documentation.
diff --git a/commands/preprocess.py b/commands/preprocess.py
@@ -257,17 +257,17 @@ def remove_noprint(html):
 # remove see also links between C and C++ documentations
 def remove_see_also(html):
     for el in html.xpath('//tr[@class]'):
-        if not has_class(el, 't-dcl-list-item'):
+        if not has_class(el, 't-dcl-list-item', 't-dsc'):
             continue
 
         child_tds = el.xpath('.//td/div[@class]')
-        if not any(has_class(td, 't-dcl-list-see') for td in child_tds):
+        if not any(has_class(td, 't-dcl-list-see', 't-dsc-see') for td in child_tds):
             continue
 
         # remove preceding separator, if any
         prev = el.getprevious()
         if prev is not None:
-            child_tds = prev.xpath('.//td[@class')
+            child_tds = prev.xpath('.//td[@class]')
             if any(has_class(td, 't-dcl-list-sep') for td in child_tds):
                 prev.getparent().remove(prev)
 
@@ -280,19 +280,9 @@ def remove_see_also(html):
         next = el.getnext()
         if next is None:
             el.getparent().remove(el)
-            continue
-
-        if next.tag != 'table':
-            continue
-
-        if not has_class(next, 't-dcl-list-begin'):
-            continue
-
-        if len(next.xpath('.//tr')) > 0:
-            continue
-
-        el.getparent().remove(el)
-        next.getparent().remove(next)
+        elif next.tag == 'table' and has_class(next, 't-dcl-list-begin') and len(next.xpath('.//tr')) == 0:
+            el.getparent().remove(el)
+            next.getparent().remove(next)
 
 # remove Google Analytics scripts
 def remove_google_analytics(html):
diff --git a/tests/preprocess_data/fabs_seealso.html b/tests/preprocess_data/fabs_seealso.html
@@ -590,10 +590,6 @@ <h3><span class="editsection">[<a href="https://en.cppreference.com/mwiki/index.
 <td>   applies the function <span class="t-c"><span class="mw-geshi cpp source-cpp">std<span class="sy4">::</span><span class="me2">abs</span></span></span> to each element of valarray  <br> <span class="t-mark">(function template)</span> <span class="editsection noprint plainlinks" title="Edit this template"><a rel="nofollow" class="external text" href="https://en.cppreference.com/mwiki/index.php?title=Template:cpp/numeric/valarray/dsc_abs&amp;action=edit">[edit]</a></span>
 </td></tr>
 
-<tr class="t-dsc">
-<td colspan="2"> <div class="t-dsc-see"><span><a href="../../../c/numeric/math/fabs.html" title="c/numeric/math/fabs">C documentation</a></span> for <span class="t-dsc-see-tt"><span>fabs</span></span></div>
-</td></tr>
-
 </table>
 
 <!-- 
