rxiv-maker 1.18.1__py3-none-any.whl → 1.18.2__py3-none-any.whl

rxiv_maker/__version__.py

@@ -1,3 +1,3 @@
 """Version information."""
 
-__version__ = "1.18.1"
+__version__ = "1.18.2"

rxiv_maker/converters/table_processor.py

@@ -139,9 +139,9 @@ def convert_tables_to_latex(
                     result_lines.pop()  # Remove caption line
 
             # Check for new format table caption after the table
-            new_format_caption, table_id, rotation_angle = _parse_table_caption(lines, i)
-            if new_format_caption:
-                i += 2  # Skip blank line and caption line
+            new_format_caption, table_id, rotation_angle, lines_to_skip = _parse_table_caption(lines, i)
+            if new_format_caption and lines_to_skip:
+                i += lines_to_skip  # Skip blank lines, comments, and caption line
 
             # Generate LaTeX table with the processed caption
             latex_table = generate_latex_table(
@@ -844,39 +844,68 @@ def _is_table_row(line: str) -> bool:
     return "|" in line and line.startswith("|") and line.endswith("|")
 
 
-def _parse_table_caption(lines: list[str], i: int) -> tuple[str | None, str | None, int | None]:
-    """Parse table caption in new format after table."""
+def _parse_table_caption(lines: list[str], i: int) -> tuple[str | None, str | None, int | None, int | None]:
+    """Parse table caption in new format after table.
+
+    Returns:
+        tuple of (caption, table_id, rotation_angle, lines_to_skip)
+        lines_to_skip indicates how many lines after position i should be skipped
+    """
     new_format_caption = None
     table_id = None
     rotation_angle = None
+    lines_to_skip = None
 
-    if (
-        i < len(lines)
-        and lines[i].strip() == ""
-        and i + 1 < len(lines)
-        and re.match(r"^\{#[a-zA-Z0-9_:-]+.*\}\s*\*\*.*\*\*", lines[i + 1].strip())
-    ):
-        # Found new format caption, parse it
-        caption_line = lines[i + 1].strip()
-
-        # Parse caption with optional attributes like rotate=90
-        caption_match = re.match(r"^\{#([a-zA-Z0-9_:-]+)([^}]*)\}\s*(.+)$", caption_line)
-        if caption_match:
-            table_id = caption_match.group(1)
-            attributes_str = caption_match.group(2).strip()
-            caption_text = caption_match.group(3)
-
-            # Extract rotation attribute if present
-            if attributes_str:
-                rotation_match = re.search(r"rotate=(\d+)", attributes_str)
-                if rotation_match:
-                    rotation_angle = int(rotation_match.group(1))
-
-            # Process caption text to handle markdown formatting
-            new_format_caption = re.sub(r"\*\*([^*]+)\*\*", r"\\textbf{\1}", caption_text)
-            new_format_caption = re.sub(r"\*([^*]+)\*", r"\\textit{\1}", new_format_caption)
-
-    return new_format_caption, table_id, rotation_angle
+    # Look ahead for caption, skipping blank lines and HTML comments
+    # Search up to 5 lines ahead to be flexible
+    search_limit = min(i + 5, len(lines))
+
+    for offset in range(search_limit - i):
+        check_line = lines[i + offset].strip()
+
+        # Skip blank lines and HTML comments
+        if check_line == "" or (check_line.startswith("<!--") and check_line.endswith("-->")):
+            continue
+
+        # Check if this is a new-format caption
+        if re.match(r"^\{#[a-zA-Z0-9_:-]+.*\}\s*\*\*.*\*\*", check_line):
+            caption_line = check_line
+
+            # Parse caption with optional attributes like rotate=90
+            caption_match = re.match(r"^\{#([a-zA-Z0-9_:-]+)([^}]*)\}\s*(.+)$", caption_line)
+            if caption_match:
+                table_id = caption_match.group(1)
+                attributes_str = caption_match.group(2).strip()
+                caption_text = caption_match.group(3)
+
+                # Extract rotation attribute if present
+                if attributes_str:
+                    rotation_match = re.search(r"rotate=(\d+)", attributes_str)
+                    if rotation_match:
+                        rotation_angle = int(rotation_match.group(1))
+
+                # Process caption text to handle markdown formatting
+                new_format_caption = re.sub(r"\*\*([^*]+)\*\*", r"\\textbf{\1}", caption_text)
+                new_format_caption = re.sub(r"\*([^*]+)\*", r"\\textit{\1}", new_format_caption)
+
+                # Convert cross-references (figures, tables, equations) in caption
+                from .figure_processor import (
+                    convert_equation_references_to_latex,
+                    convert_figure_references_to_latex,
+                )
+
+                new_format_caption = convert_figure_references_to_latex(new_format_caption)
+                new_format_caption = convert_table_references_to_latex(new_format_caption)
+                new_format_caption = convert_equation_references_to_latex(new_format_caption)
+
+                # Return how many lines to skip (all lines from i to caption, inclusive)
+                lines_to_skip = offset + 1
+                break
+        else:
+            # Found a non-blank, non-comment, non-caption line - stop searching
+            break
+
+    return new_format_caption, table_id, rotation_angle, lines_to_skip
 
 
 def _split_table_row_respecting_backticks(row: str) -> list[str]:

{rxiv_maker-1.18.1.dist-info → rxiv_maker-1.18.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rxiv-maker
-Version: 1.18.1
+Version: 1.18.2
 Summary: Write scientific preprints in Markdown. Generate publication-ready PDFs efficiently.
 Project-URL: Homepage, https://github.com/HenriquesLab/rxiv-maker
 Project-URL: Documentation, https://github.com/HenriquesLab/rxiv-maker#readme

{rxiv_maker-1.18.1.dist-info → rxiv_maker-1.18.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 rxiv_maker/__init__.py,sha256=p04JYC5ZhP6dLXkoWVlKNyiRvsDE1a4C88f9q4xO3tA,3268
-rxiv_maker/__version__.py,sha256=tA_6cw-lsQhGEoyqC2fCF8har4ZiuDZgXQZ_VsshRFM,51
+rxiv_maker/__version__.py,sha256=r1DNB3JWDHXSSJtFwhx61DHqp-syX6loJLs-YmN6FEQ,51
 rxiv_maker/rxiv_maker_cli.py,sha256=9Lu_mhFPXwx5jzAR6StCNxwCm_fkmP5qiOYdNuh_AwI,120
 rxiv_maker/validate.py,sha256=AIzgP59KbCQJqC9WIGfUdVv0xI6ud9g1fFznQkaGz5Q,9373
 rxiv_maker/cli/__init__.py,sha256=Jw0DTFUSofN-02xpVrt1UUzRcgH5NNd-GPNidhmNwpU,77
@@ -55,7 +55,7 @@ rxiv_maker/converters/md2tex.py,sha256=eO0gMjINrFmefJZARCEQO0ACmLgVE5mAccR_Fqz8z
 rxiv_maker/converters/python_executor.py,sha256=YMJO7A-re8EOCQjy-PKryFFBoxddK3g9R1VuaH2MfYY,37369
 rxiv_maker/converters/section_processor.py,sha256=7znzb_FYH2sCYH336l5J1ZdRaQv-ycdCN79RpI3Tc-w,5706
 rxiv_maker/converters/supplementary_note_processor.py,sha256=8wzQw2kN0Afg0iB7hPFdeWiDlDsFhhTkcRTvwCXIvjc,6689
-rxiv_maker/converters/table_processor.py,sha256=chicOshkX20NleRTgdOkx8cuwCBITcrsFXHOByUKXAU,38431
+rxiv_maker/converters/table_processor.py,sha256=0sCtDVlQwLcAC8_dJMijgVb7DCmtannCyDgWNJ35-KE,39869
 rxiv_maker/converters/text_formatters.py,sha256=pa2kVAqyPkGh5LViL5Iqqjjqw1ixB0GKBZJloaVBVi0,42816
 rxiv_maker/converters/types.py,sha256=mTLXVTBGfEi2dp_U2maSE7kZQFz_lfmLDQjlMAeU9lE,885
 rxiv_maker/converters/url_processor.py,sha256=xoZrgz7kgRtMzSay_14ZpYEwK9uXj3YloQW9K-G8LAc,6586
@@ -194,8 +194,8 @@ rxiv_maker/validators/doi/metadata_comparator.py,sha256=euqHhKP5sHQAdZbdoAahUn6Y
 rxiv_maker/tex/template.tex,sha256=_tPtxrurn3sKTt9Kfa44lPdPyT44vHbDUOGqldU9r2s,1378
 rxiv_maker/tex/style/rxiv_maker_style.bst,sha256=jbVqrJgAm6F88cow5vtZuPBwwmlcYykclTm8RvZIo6Y,24281
 rxiv_maker/tex/style/rxiv_maker_style.cls,sha256=6VDmZE0uvYWog6rcYi2K_NIM9-Pgjx9AFdRg_sTheK0,24374
-rxiv_maker-1.18.1.dist-info/METADATA,sha256=tPF_g3YUTC7xDc73LIT__1Y8E3vGxY7m5gqssm-P7j0,18222
-rxiv_maker-1.18.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-rxiv_maker-1.18.1.dist-info/entry_points.txt,sha256=ghCN0hI9A1GlG7QY5F6E-xYPflA8CyS4B6bTQ1YLop0,97
-rxiv_maker-1.18.1.dist-info/licenses/LICENSE,sha256=GSZFoPIhWDNJEtSHTQ5dnELN38zFwRiQO2antBezGQk,1093
-rxiv_maker-1.18.1.dist-info/RECORD,,
+rxiv_maker-1.18.2.dist-info/METADATA,sha256=OqROaCqeuMSX45OfafGdLjR5Q_Y-XxaC__NboFz_z54,18222
+rxiv_maker-1.18.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+rxiv_maker-1.18.2.dist-info/entry_points.txt,sha256=ghCN0hI9A1GlG7QY5F6E-xYPflA8CyS4B6bTQ1YLop0,97
+rxiv_maker-1.18.2.dist-info/licenses/LICENSE,sha256=GSZFoPIhWDNJEtSHTQ5dnELN38zFwRiQO2antBezGQk,1093
+rxiv_maker-1.18.2.dist-info/RECORD,,