rolfedh-doc-utils 0.1.27__tar.gz → 0.1.28__tar.gz

{rolfedh_doc_utils-0.1.27/rolfedh_doc_utils.egg-info → rolfedh_doc_utils-0.1.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rolfedh-doc-utils
-Version: 0.1.27
+Version: 0.1.28
 Summary: CLI tools for AsciiDoc documentation projects
 Author: Rolfe Dlugy-Hegwer
 License: MIT License

{rolfedh_doc_utils-0.1.27 → rolfedh_doc_utils-0.1.28}/callout_lib/converter_bullets.py

@@ -59,8 +59,8 @@ class BulletListConverter:
                     user_value = f'{user_value}>'
                 term = f'`{user_value}`'
             else:
-                # This is a code line - use it as-is in backticks
-                term = f'`{code_line}`'
+                # This is a code line - strip whitespace before wrapping in backticks
+                term = f'`{code_line.strip()}`'
 
             # Collect all explanations for this group
             all_explanation_lines = []

{rolfedh_doc_utils-0.1.27 → rolfedh_doc_utils-0.1.28}/callout_lib/converter_deflist.py

@@ -54,8 +54,8 @@ class DefListConverter:
                     user_value = f'{user_value}>'
                 term = f'`{user_value}`'
             else:
-                # This is a code line - use it as-is in backticks
-                term = f'`{code_line}`'
+                # This is a code line - strip whitespace before wrapping in backticks
+                term = f'`{code_line.strip()}`'
 
             # Add blank line before each term
             lines.append('')

{rolfedh_doc_utils-0.1.27 → rolfedh_doc_utils-0.1.28}/callout_lib/detector.py

@@ -45,6 +45,11 @@ class CalloutDetector:
     # Pattern for callout number in code block (can appear multiple times per line)
     CALLOUT_IN_CODE = re.compile(r'<(\d+)>')
 
+    # Pattern for callout with optional preceding comment syntax
+    # Matches common comment styles: //, #, --, ;, followed by optional whitespace and <number>
+    # The comment syntax must be preceded by whitespace to avoid matching code operators
+    CALLOUT_WITH_COMMENT = re.compile(r'\s*(?://|#|--|;)\s*<\d+>|\s*<\d+>')
+
     # Pattern for callout explanation line: <1> Explanation text
     CALLOUT_EXPLANATION = re.compile(r'^<(\d+)>\s+(.+)$')
 
@@ -130,8 +135,9 @@ class CalloutDetector:
             # Look for all callout numbers on this line
             callout_matches = list(self.CALLOUT_IN_CODE.finditer(line))
             if callout_matches:
-                # Remove all callouts from the line to get the actual code
-                line_without_callouts = self.CALLOUT_IN_CODE.sub('', line).strip()
+                # Remove callouts AND preceding comment syntax from the line
+                # Use CALLOUT_WITH_COMMENT to remove both comment syntax and callout
+                line_without_callouts = self.CALLOUT_WITH_COMMENT.sub('', line).rstrip()
 
                 # Find all angle-bracket enclosed values
                 user_values = self.USER_VALUE_PATTERN.findall(line_without_callouts)
@@ -216,11 +222,11 @@ class CalloutDetector:
 
             # Add value lines with context
             if value_lines:
-                # Format: "Refers to `value`. Description..."
+                # Format: "`value`:"
                 value_text = value_lines[0] if value_lines else ""
                 # If value is code-like (contains backticks or special chars), keep it formatted
                 if value_text:
-                    all_lines.append(f"Refers to {value_text}.")
+                    all_lines.append(f"{value_text}:")
 
                 # Add additional value lines if multi-line
                 for line in value_lines[1:]:
@@ -290,11 +296,14 @@ class CalloutDetector:
         return explanations, i - 1
 
     def remove_callouts_from_code(self, content: List[str]) -> List[str]:
-        """Remove callout numbers from code block content (handles multiple callouts per line)."""
+        """
+        Remove callout numbers and preceding comment syntax from code block content.
+        Handles multiple callouts per line and various comment styles (//,  #, --, ;).
+        """
         cleaned = []
         for line in content:
-            # Remove all callout numbers and trailing whitespace
-            cleaned.append(self.CALLOUT_IN_CODE.sub('', line).rstrip())
+            # Remove all callout numbers with their preceding comment syntax
+            cleaned.append(self.CALLOUT_WITH_COMMENT.sub('', line).rstrip())
         return cleaned
 
     def validate_callouts(self, callout_groups: List[CalloutGroup], explanations: Dict[int, Callout]) -> Tuple[bool, set, set]:

{rolfedh_doc_utils-0.1.27 → rolfedh_doc_utils-0.1.28}/callout_lib/table_parser.py

@@ -200,6 +200,17 @@ class TableParser:
                                 content=[part],
                                 conditionals=[]
                             ))
+
+                    # Multi-cell line completes a row - finalize it
+                    if current_row_cells:
+                        rows.append(TableRow(
+                            cells=current_row_cells.copy(),
+                            conditionals_before=conditionals_before_row.copy(),
+                            conditionals_after=conditionals_after_row.copy()
+                        ))
+                        current_row_cells = []
+                        conditionals_before_row = []
+                        conditionals_after_row = []
                 else:
                     # Single cell on this line
                     if cell_content:

{rolfedh_doc_utils-0.1.27 → rolfedh_doc_utils-0.1.28}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rolfedh-doc-utils"
-version = "0.1.27"
+version = "0.1.28"
 description = "CLI tools for AsciiDoc documentation projects"
 readme = "README.md"
 requires-python = ">=3.8"

{rolfedh_doc_utils-0.1.27 → rolfedh_doc_utils-0.1.28/rolfedh_doc_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rolfedh-doc-utils
-Version: 0.1.27
+Version: 0.1.28
 Summary: CLI tools for AsciiDoc documentation projects
 Author: Rolfe Dlugy-Hegwer
 License: MIT License