Revert rasterized rendering of vertical half-lines

Author: ku1ik

lib/asciinema_web/controllers/recording_svg.ex

@@ -69,7 +69,7 @@ defmodule AsciinemaWeb.RecordingSVG do
   end
 
   # Bump when SVG rendering output can change without recording data changes.
-  @svg_renderer_salt 3
+  @svg_renderer_salt 4
 
   def svg_cache_key(asciicast) do
     key =
@@ -311,12 +311,9 @@ defmodule AsciinemaWeb.RecordingSVG do
   defp mosaic_block?(char) do
     cp = codepoint(char)
 
-    # block elements || box drawing vertical lines || black square || sextants
+    # block elements || heavy box drawing verticals || black square || sextants
     (cp >= 0x2580 and cp <= 0x259F) ||
-      cp == 0x2502 ||
       cp == 0x2503 ||
-      cp == 0x2575 ||
-      cp == 0x2577 ||
       cp == 0x2579 ||
       cp == 0x257B ||
       cp == 0x25A0 ||

native/svg_raster/src/lib.rs

@@ -159,18 +159,9 @@ fn draw_mosaic_block(
     let half_y = CELL_Y_RES / 2;
 
     match cp {
-        // box drawings light vertical (https://symbl.cc/en/2502/)
-        0x2502 => fill_cell_rect(pixels, img_w, origin, (4, 0, 5, CELL_Y_RES), color),
-
         // box drawings heavy vertical (https://symbl.cc/en/2503/)
         0x2503 => fill_cell_rect(pixels, img_w, origin, (3, 0, 5, CELL_Y_RES), color),
 
-        // box drawings light up (https://symbl.cc/en/2575/)
-        0x2575 => fill_cell_rect(pixels, img_w, origin, (4, 0, 5, half_y), color),
-
-        // box drawings light down (https://symbl.cc/en/2577/)
-        0x2577 => fill_cell_rect(pixels, img_w, origin, (4, half_y, 5, CELL_Y_RES), color),
-
         // box drawings heavy up (https://symbl.cc/en/2579/)
         0x2579 => fill_cell_rect(pixels, img_w, origin, (3, 0, 5, half_y), color),
 

test/asciinema/svg_raster_test.exs

@@ -24,45 +24,39 @@ defmodule Asciinema.SvgRasterTest do
     assert rgb_at(decoded, 8, 12) == {4, 5, 6}
   end
 
-  test "renders representative glyphs grouped by rasterized groups" do
+  test "renders representative glyphs supported by rasterized groups" do
     fg = {240, 16, 32}
     bg = {1, 2, 3}
 
-    # 0: █, 1: │, 2: ┃, 3: ╵, 4: ╷, 5: ╹, 6: ╻, 7: ■, 8: 🬀
+    # 0: █, 1: ┃, 2: ╹, 3: ╻, 4: ■, 5: 🬀
     mosaic_blocks = [
       {0, 0, 0x2588, fg},
-      {0, 1, 0x2502, fg},
-      {0, 2, 0x2503, fg},
-      {0, 3, 0x2575, fg},
-      {0, 4, 0x2577, fg},
-      {0, 5, 0x2579, fg},
-      {0, 6, 0x257B, fg},
-      {0, 7, 0x25A0, fg},
-      {0, 8, 0x1FB00, fg}
+      {0, 1, 0x2503, fg},
+      {0, 2, 0x2579, fg},
+      {0, 3, 0x257B, fg},
+      {0, 4, 0x25A0, fg},
+      {0, 5, 0x1FB00, fg}
     ]
 
-    png = SvgRaster.render_png(9, 1, bg, [], mosaic_blocks)
+    png = SvgRaster.render_png(6, 1, bg, [], mosaic_blocks)
     decoded = decode_png(png)
 
     # block elements
     assert cell_contains_color?(decoded, 0, 0, fg)
 
-    # box verticals
+    # heavy box verticals
     assert cell_contains_color?(decoded, 1, 0, fg)
     assert cell_contains_color?(decoded, 2, 0, fg)
     assert cell_contains_color?(decoded, 3, 0, fg)
-    assert cell_contains_color?(decoded, 4, 0, fg)
-    assert cell_contains_color?(decoded, 5, 0, fg)
-    assert cell_contains_color?(decoded, 6, 0, fg)
 
     # black square
-    assert cell_contains_color?(decoded, 7, 0, fg)
+    assert cell_contains_color?(decoded, 4, 0, fg)
 
     # sextants
-    assert cell_contains_color?(decoded, 8, 0, fg)
+    assert cell_contains_color?(decoded, 5, 0, fg)
   end
 
-  test "renders box drawing vertical lines with light/heavy widths" do
+  test "renders heavy box drawing vertical lines on raster layer" do
     png =
       SvgRaster.render_png(
         2,
@@ -74,17 +68,13 @@ defmodule Asciinema.SvgRasterTest do
 
     decoded = decode_png(png)
 
-    # light line: x + 4, width 1
-    assert rgb_at(decoded, 4, 12) == {240, 16, 32}
-    assert rgb_at(decoded, 3, 12) == {1, 2, 3}
-
     # heavy line: x + 3, width 2
     assert rgb_at(decoded, 11, 12) == {240, 16, 32}
     assert rgb_at(decoded, 12, 12) == {240, 16, 32}
     assert rgb_at(decoded, 10, 12) == {1, 2, 3}
   end
 
-  test "renders box drawing vertical half-lines with direction and light/heavy widths" do
+  test "renders heavy box drawing vertical half-lines on raster layer" do
     png =
       SvgRaster.render_png(
         4,
@@ -101,16 +91,6 @@ defmodule Asciinema.SvgRasterTest do
 
     decoded = decode_png(png)
 
-    # light up (top half only)
-    assert rgb_at(decoded, 4, 5) == {240, 16, 32}
-    assert rgb_at(decoded, 4, 18) == {1, 2, 3}
-    assert rgb_at(decoded, 3, 5) == {1, 2, 3}
-
-    # light down (bottom half only)
-    assert rgb_at(decoded, 12, 5) == {1, 2, 3}
-    assert rgb_at(decoded, 12, 18) == {240, 16, 32}
-    assert rgb_at(decoded, 11, 18) == {1, 2, 3}
-
     # heavy up (top half only)
     assert rgb_at(decoded, 19, 5) == {240, 16, 32}
     assert rgb_at(decoded, 20, 5) == {240, 16, 32}

test/asciinema_web/controllers/recording_svg_test.exs

@@ -66,7 +66,7 @@ defmodule AsciinemaWeb.RecordingSvgTest do
       assert rgb_at(png, 23, 23) == {17, 34, 51}
     end
 
-    test "routes representative rasterized glyph groups to embedded PNG layer" do
+    test "routes only supported rasterized glyph groups to embedded PNG layer" do
       fg = {255, 85, 0}
       sextant_ul = <<0x1FB00::utf8>>
       line = "█│┃╵╷╹╻■" <> sextant_ul
@@ -85,17 +85,17 @@ defmodule AsciinemaWeb.RecordingSvgTest do
       refute svg =~ "█"
       assert cell_contains_color?(png, 0, 0, fg)
 
-      # box verticals
-      refute svg =~ "│"
+      # light verticals stay in text, heavy ones are rasterized
+      assert svg =~ "│"
       refute svg =~ "┃"
-      refute svg =~ "╵"
-      refute svg =~ "╷"
+      assert svg =~ "╵"
+      assert svg =~ "╷"
       refute svg =~ "╹"
       refute svg =~ "╻"
-      assert cell_contains_color?(png, 1, 0, fg)
+      refute cell_contains_color?(png, 1, 0, fg)
       assert cell_contains_color?(png, 2, 0, fg)
-      assert cell_contains_color?(png, 3, 0, fg)
-      assert cell_contains_color?(png, 4, 0, fg)
+      refute cell_contains_color?(png, 3, 0, fg)
+      refute cell_contains_color?(png, 4, 0, fg)
       assert cell_contains_color?(png, 5, 0, fg)
       assert cell_contains_color?(png, 6, 0, fg)
 
@@ -142,7 +142,7 @@ defmodule AsciinemaWeb.RecordingSvgTest do
       assert rgb_at(png, 8, 12) == {51, 102, 204}
     end
 
-    test "renders box drawing vertical lines in mosaic layer and excludes them from text layer" do
+    test "renders heavy box drawing vertical lines in mosaic layer" do
       asciicast =
         build(:asciicast,
           term_cols: 2,
@@ -153,13 +153,13 @@ defmodule AsciinemaWeb.RecordingSvgTest do
       svg = render_full(asciicast)
       png = decode_embedded_png(svg)
 
-      refute svg =~ "│"
+      assert svg =~ "│"
       refute svg =~ "┃"
-      assert cell_contains_color?(png, 0, 0, {255, 85, 0})
+      refute cell_contains_color?(png, 0, 0, {255, 85, 0})
       assert cell_contains_color?(png, 1, 0, {255, 85, 0})
     end
 
-    test "renders box drawing vertical half-lines in mosaic layer and excludes them from text layer" do
+    test "renders heavy box drawing vertical half-lines in mosaic layer" do
       half_lines = <<0x2575::utf8, 0x2577::utf8, 0x2579::utf8, 0x257B::utf8>>
 
       asciicast =
@@ -172,12 +172,12 @@ defmodule AsciinemaWeb.RecordingSvgTest do
       svg = render_full(asciicast)
       png = decode_embedded_png(svg)
 
-      refute svg =~ <<0x2575::utf8>>
-      refute svg =~ <<0x2577::utf8>>
+      assert svg =~ <<0x2575::utf8>>
+      assert svg =~ <<0x2577::utf8>>
       refute svg =~ <<0x2579::utf8>>
       refute svg =~ <<0x257B::utf8>>
-      assert cell_contains_color?(png, 0, 0, {255, 85, 0})
-      assert cell_contains_color?(png, 1, 0, {255, 85, 0})
+      refute cell_contains_color?(png, 0, 0, {255, 85, 0})
+      refute cell_contains_color?(png, 1, 0, {255, 85, 0})
       assert cell_contains_color?(png, 2, 0, {255, 85, 0})
       assert cell_contains_color?(png, 3, 0, {255, 85, 0})
     end