improved SVG

Author: willmcgugan

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [12.4.4] - 2022-05-24
+
+### Changed
+
+- Added clipping per line to SVG output to avoid box characters overlapping
+- Optimized SVG output
+
 ## [12.4.3] - 2022-05-23
 
 ### Changed

pyproject.toml

@@ -2,7 +2,7 @@
 name = "rich"
 homepage = "https://github.com/willmcgugan/rich"
 documentation = "https://rich.readthedocs.io/en/latest/"
-version = "12.4.3"
+version = "12.4.4"
 description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal"
 authors = ["Will McGugan <[email protected]>"]
 license = "MIT"

rich/_export_format.py

@@ -61,6 +61,7 @@
     <clipPath id="{unique_id}-clip-terminal">
       <rect x="0" y="0" width="{terminal_width}" height="{terminal_height}" />
     </clipPath>
+    {lines}
     </defs>
 
     {chrome}

rich/console.py

@@ -2330,11 +2330,7 @@ def stringify(value: object) -> str:
             )
 
         with self._record_buffer_lock:
-            segments = list(
-                Segment.filter_control(
-                    Segment.simplify(self._record_buffer),
-                )
-            )
+            segments = list(Segment.filter_control(self._record_buffer))
             if clear:
                 self._record_buffer.clear()
 
@@ -2383,6 +2379,7 @@ def stringify(value: object) -> str:
                             y=y * line_height + 1.5,
                             width=char_width * text_length,
                             height=line_height + 0.25,
+                            shape_rendering="crispEdges",
                         )
                     )
 
@@ -2395,10 +2392,19 @@ def stringify(value: object) -> str:
                             x=x * char_width,
                             y=y * line_height + char_height,
                             textLength=char_width * len(text),
+                            clip_path=f"url(#{unique_id}-line-{y})",
                         )
                     )
                 x += cell_len(text)
 
+        line_offsets = [line_no * line_height + 1.5 for line_no in range(y)]
+        lines = "\n".join(
+            f"""<clipPath id="{unique_id}-line-{line_no}">
+    {make_tag("rect", x=0, y=offset, width=char_width * width, height=line_height + 0.25)}
+            </clipPath>"""
+            for line_no, offset in enumerate(line_offsets)
+        )
+
         styles = "\n".join(
             f".{unique_id}-r{rule_no} {{ {css} }}" for css, rule_no in classes.items()
         )
@@ -2443,8 +2449,8 @@ def stringify(value: object) -> str:
             char_width=char_width,
             char_height=char_height,
             line_height=line_height,
-            terminal_width=char_width * width,
-            terminal_height=(y + 1) * line_height,
+            terminal_width=char_width * width - 1,
+            terminal_height=(y + 1) * line_height - 1,
             width=terminal_width + margin_width,
             height=terminal_height + margin_height,
             terminal_x=margin_left + padding_left,
@@ -2453,6 +2459,7 @@ def stringify(value: object) -> str:
             chrome=chrome,
             backgrounds=backgrounds,
             matrix=matrix,
+            lines=lines,
         )
         return svg