Merge pull request #184 from elifesciences/develop

PR for version 0.76.0 release
elifesciences · Jan 23, 2025 · e6f890d · e6f890d
2 parents 5cbb0b6 + 0c1500a
commit e6f890d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/elifecleaner/__init__.py b/elifecleaner/__init__.py
@@ -1,7 +1,7 @@
 import logging
 
 
-__version__ = "0.75.0"
+__version__ = "0.76.0"
 
 
 LOGGER = logging.getLogger(__name__)

diff --git a/elifecleaner/equation.py b/elifecleaner/equation.py
@@ -29,10 +29,10 @@ def disp_formula_tag_index_groups(body_tag, identifier):
     "find p tags which have inline-graphic tags to convert to disp-formula"
     index_groups = []
     tag_id_index = 0
-    for tag_index, parent_tag in enumerate(body_tag.iterfind(".//p")):
+    for tag_index, parent_tag in enumerate(body_tag.iterfind("*")):
         # count the inline-graphic tags to get an id value
-        if parent_tag.findall("inline-graphic") or parent_tag.findall(
-            "disp-formula/graphic"
+        if parent_tag.findall("inline-graphic") or (
+            parent_tag.tag == "disp-formula" and parent_tag.findall("graphic")
         ):
             tag_id_index += 1
         if block.is_p_inline_graphic(
@@ -129,23 +129,19 @@ def inline_formula_tag_index_groups(body_tag, identifier):
     "find p tags which have inline-graphic tags to convert to inline-formula"
     index_groups = []
     tag_id_index = 0
-    for tag_index, parent_tag in enumerate(body_tag.iterfind(".//p")):
+    for tag_index, parent_tag in enumerate(body_tag.iterfind("*")):
         # count the inline-graphic tags to get an id value
-        if parent_tag.findall("inline-graphic") or parent_tag.findall(
-            "disp-formula/graphic"
+        if parent_tag.findall("inline-graphic") or (
+            parent_tag.tag == "disp-formula" and parent_tag.findall("graphic")
         ):
             tag_id_index += 1
 
-        if (
-            parent_tag.tag == "p"
-            and parent_tag.find("inline-graphic") is not None
-            and not (
-                block.is_p_inline_graphic(
-                    tag=parent_tag,
-                    sub_article_id=None,
-                    p_tag_index=None,
-                    identifier=identifier,
-                )
+        if parent_tag.find("inline-graphic") is not None and not (
+            block.is_p_inline_graphic(
+                tag=parent_tag,
+                sub_article_id=None,
+                p_tag_index=None,
+                identifier=identifier,
             )
         ):
             detail = {