summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-08-12 16:33:14 -0300
committerGabriel Schneider <[email protected]>2026-08-12 20:22:18 -0300
commit9280c597b000eed661fd98793e182fdcb640f6cd (patch)
tree1b8e928c052c46ceb9a58c83256d5fb4e11e361a /test
parentbc89f57cb576e23a58572ec35f96db068367f1b4 (diff)
downloadpardes-9280c597b000eed661fd98793e182fdcb640f6cd.tar.gz
pardes-9280c597b000eed661fd98793e182fdcb640f6cd.zip
shaders: -Dprebuilt-shaders, so a gui build needs no Vulkan SDK
glslc is the one build input that wants a tool a stock machine does not have, and it is also the input that changes least often: eight GLSL files that have outlived several rewrites of everything around them. Asking every machine that wants to run the SDL shell for shaderc is the wrong trade. The SPIR-V is now COMMITTED, under shaders/prebuilt/, and -Dprebuilt-shaders embeds that copy instead of shelling out. The default stays the honest one -- compile the shaders that are actually in the tree -- because the flag trades a dependency for a freshness problem: with it on, the .glsl sources are not build inputs at all, so editing one changes nothing. `zig build shaders` is the other half, and it is deliberately independent of -Dplatform: it recompiles every shader and writes the result back into the tracked directory, so whoever changes a shader refreshes the cache on a machine that has the compiler and commits the diff. `jj diff shaders/prebuilt` after it is the freshness check -- empty means the cache was already current. The shader list is also spelled once now (gui_shaders): the eight embeds, the eight glslc runs and the refresh step all read it, so adding a shader is a name there plus the @embedFile in gui.zig, not three edits in two places. Verified: -Dplatform=gui -Dprebuilt-shaders builds with glslc absent from PATH, and image-harness passes on that binary -- real SDL GPU pipelines built from the committed SPIR-V, 512 source pixels read back. The default gui build still runs the eight glslc steps; tty runs none. The committed bytes are identical to a fresh glslc run, and `zig build shaders` is idempotent.
Diffstat (limited to 'test')
-rw-r--r--test/snapshots/builtins.golden16
-rw-r--r--test/snapshots/fsearch.golden35
-rw-r--r--test/snapshots/fsearch.snap26
-rw-r--r--test/snapshots/lookrange.golden49
-rw-r--r--test/snapshots/lookrange.snap10
-rw-r--r--test/snapshots/msg.golden17
-rw-r--r--test/snapshots/msg.snap14
-rw-r--r--test/snapshots/psearch.golden35
-rw-r--r--test/snapshots/psearch.snap15
-rw-r--r--test/snapshots/topbarexec.golden20
-rw-r--r--test/snapshots/windowops.golden40
11 files changed, 105 insertions, 172 deletions
diff --git a/test/snapshots/builtins.golden b/test/snapshots/builtins.golden
index 61d7bec1..113141d8 100644
--- a/test/snapshots/builtins.golden
+++ b/test/snapshots/builtins.golden
@@ -153,7 +153,6 @@
|
|
| /tmp/pardes-snap/builtins/cwd/+Help New Del
-| 31 SPC l s Symbols
| 32 SPC l w Lspwhy
| 33 SPC p ClipPaste
| 34 SPC s d Dump topbar
@@ -178,9 +177,10 @@
| 53 SPC y ClipYank
| 54 Look enter, right-click
| 55 Exec tab, middle-click
-| 56 Theme
-| 57 Shell
-| 58
+| 56 Msg
+| 57 Theme
+| 58 Shell
+| 59
== snap not-a-picker grid=120x60 cursor=7,58
|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
| /tmp/pardes-snap/builtins/cwd/notes.txt Save New Del
@@ -214,7 +214,6 @@
|
|
| /tmp/pardes-snap/builtins/cwd/+Help New Del
-| 31 SPC l s Symbols
| 32 SPC l w Lspwhy
| 33 SPC p ClipPaste
| 34 SPC s d Dump topbar
@@ -239,9 +238,10 @@
| 53 SPC y ClipYank
| 54 Look enter, right-click
| 55 Exec tab, middle-click
-| 56 Theme
-| 57 Shell
-| 58
+| 56 Msg
+| 57 Theme
+| 58 Shell
+| 59
== snap window-group grid=120x60 cursor=7,32
|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
| /tmp/pardes-snap/builtins/cwd/notes.txt Save New Del
diff --git a/test/snapshots/fsearch.golden b/test/snapshots/fsearch.golden
index bbe7df83..317e7b5e 100644
--- a/test/snapshots/fsearch.golden
+++ b/test/snapshots/fsearch.golden
@@ -60,7 +60,7 @@
|
|
| /MARK
-== snap results grid=180x30 cursor=7,2
+== snap results grid=180x30 cursor=10,3
|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
| /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del /tmp/pardes-snap/fsearch/cwd New Del /tmp/pardes-snap/fsearch/cwd New Del
| 1 l1 ls ls
@@ -91,38 +91,7 @@
| 1 g.txt:2:1-4 MARK a
| 2 g.txt:6:1-4 MARK b
| 3 g.txt:10:1-4 MARK c
-== snap first grid=180x30 cursor=10,3
-|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-| /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del /tmp/pardes-snap/fsearch/cwd New Del /tmp/pardes-snap/fsearch/cwd New Del
-| 1 l1 ls ls
-| 2 MARK a g.txt g.txt
-| 3 l3
-| 4 l4
-| 5 l5
-| 6 MARK b g.txt
-| 7 l7
-| 8 l8
-| 9 l9
-| 10 MARK c
-| 11 l11
-| 12 l12
-|
-|
-| /tmp/pardes-snap/fsearch/cwd New Del
-| ls
-| g.txt
-|
-|
-|
-|
-|
-|
-|
-| /tmp/pardes-snap/fsearch/cwd/+Search New Del
-| 1 g.txt:2:1-4 MARK a
-| 2 g.txt:6:1-4 MARK b
-| 3 g.txt:10:1-4 MARK c
-== style first
+== style results
|0: 0-56 #949494,#121212, 57-179 d,#121212,
|1: 0-1 #ffffff,#626262, 2-48 #949494,#121212, 49-59 d,#121212, 60-61 #ffffff,#262626, 62-99 #949494,#121212, 100-119 d,#121212, 120-121 #ffffff,#262626, 122-159 #949494,#121212, 160-179 d,#121212,
|2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-8 #bdbdbd,#080808, 9-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808,
diff --git a/test/snapshots/fsearch.snap b/test/snapshots/fsearch.snap
index b9b7ddf4..3752909b 100644
--- a/test/snapshots/fsearch.snap
+++ b/test/snapshots/fsearch.snap
@@ -1,11 +1,13 @@
# `/` file search: the pattern types into the tag (persistent, no popup);
# Enter searches the buffer in-core and writes `path:LINE:COL-ENDCOL text` into
# a +Search OUTPUT BUFFER (a file pane with no file behind it — no Save in its
-# tag); n/N SELECT the next/prev row there and open nothing, and Enter — the
-# look chord — is what scrolls the file pane to the hit AND SELECTS IT: the row
-# names the match's whole span, not just where it starts. Esc abandons the
-# input; a no-match search opens an EMPTY buffer (every search gets its own,
-# stacked under the pane) with nothing in it for n to stop on.
+# tag) — AND GOES TO THE FIRST HIT, which is the step `n` is and the look Enter
+# is, run for you in that buffer. From there n/N SELECT the next/prev row and
+# open nothing, and Enter — the look chord — is what scrolls the file pane to
+# the hit AND SELECTS IT: the row names the match's whole span, not just where
+# it starts. Esc abandons the input; a no-match search opens an EMPTY buffer
+# (every search gets its own, stacked under the pane) with nothing in it for n
+# to stop on, and goes nowhere.
file g.txt l1\nMARK a\nl3\nl4\nl5\nMARK b\nl7\nl8\nl9\nMARK c\nl11\nl12
start 30 180 -n 3
wait 8000 g.txt
@@ -33,15 +35,13 @@ snap typing
key enter
wait 10000 g.txt:2:1-4 MARK
stable 700 10000
+# ...and the submit already looked result 1: the file scrolled to line 2 and
+# the four cells the pattern matched there came up selected — the styles below
+# are what prove the second half of that. No `n` was pressed to get here.
snap results
-# n selects result 1 and Enter looks it: the file scrolls to line 2 and the
-# four cells the pattern matched there come up selected — the styles below are
-# what prove the second half of that
-key n
-key enter
-stable 700 15000
-snap first
-snapstyle first
+snapstyle results
+# n/N walk on from there, one row of the list per press, Enter looking what
+# the step selected
key n
key enter
stable 700 15000
diff --git a/test/snapshots/lookrange.golden b/test/snapshots/lookrange.golden
index d1fc0bea..8ed06206 100644
--- a/test/snapshots/lookrange.golden
+++ b/test/snapshots/lookrange.golden
@@ -277,38 +277,7 @@
|27: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
|28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
|29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
-== snap results grid=150x30 cursor=10,24
-|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-| /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del
-| 1 r.txt:3-5
-| 2 r.txt:7:4-9
-| 3 r.txt:3:2-5:3
-| 4 r.txt:8:6-99:9
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-| /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del
-| 2 bbbb
-| 3 cccc dccc
-| 4 dddd
-| 5 eeee
-| 6 ffff
-| 7 gg NEEDLE gg
-| 8 hhhh NEEDLE
-| 9 iiii
-|
-|
-| /tmp/pardes-snap/lookrange/cwd/+Search New Del
-| 1 r.txt:7:4-9 gg NEEDLE gg
-| 2 r.txt:8:6-11 hhhh NEEDLE
-== snap hit1 grid=150x30 cursor=15,22
+== snap hit1 grid=150x30 cursor=15,23
|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
| /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del
| 1 r.txt:3-5
@@ -326,6 +295,7 @@
|
|
| /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del
+| 1 aaaa
| 2 bbbb
| 3 cccc dccc
| 4 dddd
@@ -335,7 +305,6 @@
| 8 hhhh NEEDLE
| 9 iiii
|
-|
| /tmp/pardes-snap/lookrange/cwd/+Search New Del
| 1 r.txt:7:4-9 gg NEEDLE gg
| 2 r.txt:8:6-11 hhhh NEEDLE
@@ -357,15 +326,15 @@
|14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
|15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
|16: 0-1 #ffffff,#626262, 2-129 #949494,#121212, 130-149 d,#121212,
-|17: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
-|18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808,
-|19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
+|17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
+|18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
+|19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808,
|20: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
|21: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
-|22: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-9 #bdbdbd,#080808, 10-15 #080808,#80a0ff, 16-18 #bdbdbd,#080808, 19-149 d,#080808,
-|23: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-149 d,#080808,
-|24: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
-|25: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
+|22: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
+|23: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-9 #bdbdbd,#080808, 10-15 #080808,#80a0ff, 16-18 #bdbdbd,#080808, 19-149 d,#080808,
+|24: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-149 d,#080808,
+|25: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808,
|26: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808,
|27: 0-1 #ffffff,#262626, 2-129 #949494,#121212, 130-149 d,#121212,
|28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-30 #bdbdbd,#080808, 31-149 d,#080808,
diff --git a/test/snapshots/lookrange.snap b/test/snapshots/lookrange.snap
index 29f88d7f..b64607a1 100644
--- a/test/snapshots/lookrange.snap
+++ b/test/snapshots/lookrange.snap
@@ -48,19 +48,17 @@ stable 700 15000
snap stale
snapstyle stale
# --- and now the first consumer. The look above left r.txt focused, so `/`
-# arms on it: the rows it writes carry the match's span, so n selects a row
-# and the Enter after it goes to that hit with the word itself selected.
+# arms on it: the rows it writes carry the match's span, and the submit goes
+# straight to the first of them — with the word itself selected, which is the
+# whole reason the row spells a range and not a position.
key /
text NEEDLE
key enter
wait 10000 r.txt:7:4-9 gg NEEDLE
stable 700 15000
-snap results
-key n
-key enter
-stable 700 15000
snap hit1
snapstyle hit1
+# n selects the next row, and the Enter after it goes to that hit
key n
key enter
stable 700 15000
diff --git a/test/snapshots/msg.golden b/test/snapshots/msg.golden
index 77c2678b..ea8a8ee9 100644
--- a/test/snapshots/msg.golden
+++ b/test/snapshots/msg.golden
@@ -164,3 +164,20 @@
|
|
|
+== snap msgbuiltin grid=70x16 cursor=29,4
+|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
+| /tmp/pardes-snap/msg/cwd/a.txt Save New Del
+| 1 AGAIN
+| 2
+| 3 Msg hand-written report
+|
+|
+|
+|
+|
+|
+|
+|
+|
+|
+| hand-written report
diff --git a/test/snapshots/msg.snap b/test/snapshots/msg.snap
index 640e9a0c..d1371dab 100644
--- a/test/snapshots/msg.snap
+++ b/test/snapshots/msg.snap
@@ -75,3 +75,17 @@ key esc
settle 100
stable 700 15000
snap esc
+# Every other writer of this row is something going WRONG, which is a poor way
+# to look at a row: `Msg <text>` is the word that writes it on purpose. An
+# ordinary builtin, so it runs the ordinary way — write it in the buffer,
+# select the line, execute it — and what lands is the text, verbatim, with the
+# same stamped-looking left edge as the reports above. (The clock belongs to
+# the SHELL, which is why this one has none: the core has no clock.)
+key o
+text Msg hand-written report
+key esc
+settle 100
+key x
+key tab
+stable 700 15000
+snap msgbuiltin
diff --git a/test/snapshots/psearch.golden b/test/snapshots/psearch.golden
index a3305345..ad8f134b 100644
--- a/test/snapshots/psearch.golden
+++ b/test/snapshots/psearch.golden
@@ -60,7 +60,7 @@
|
|
| /MARK
-== snap results grid=140x30 cursor=4,8
+== snap results grid=140x30 cursor=7,3
|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
| /tmp/pardes-snap/psearch/cwd New Del
| printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n'
@@ -91,38 +91,7 @@
| 1 @p0:2:3-6 x MARK a
| 2 @p0:4:3-6 x MARK b
| 3 @p0:6:3-6 x MARK c
-== snap first grid=140x30 cursor=7,3
-|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-| /tmp/pardes-snap/psearch/cwd New Del
-| printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n'
-| x MARK a
-| zz
-| x MARK b
-| zz
-| x MARK c
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-|
-| /tmp/pardes-snap/psearch/cwd/+Search New Del
-| 1 @p0:2:3-6 x MARK a
-| 2 @p0:4:3-6 x MARK b
-| 3 @p0:6:3-6 x MARK c
-== style first
+== style results
|0: 0-56 #949494,#121212, 57-139 d,#121212,
|1: 0-1 #ffffff,#626262, 2-119 #949494,#121212, 120-139 d,#121212,
|2: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808,
diff --git a/test/snapshots/psearch.snap b/test/snapshots/psearch.snap
index 1b9eac61..beceb806 100644
--- a/test/snapshots/psearch.snap
+++ b/test/snapshots/psearch.snap
@@ -31,19 +31,16 @@ stable 400 5000
text MARK
stable 400 5000
snap typing
-# Enter opens the results buffer: three @p0:LINE:COL rows, focus stays here
+# Enter opens the results buffer — three @p0:LINE:COL rows — and goes to the
+# first of them: the terminal's cursor lands on that scrollback line, on the
+# matched SPAN (cols 3..6, past the leading "x ") — not the start of the line,
+# and selected rather than merely parked on. No `n` was pressed to get here.
key enter
wait 10000 @p0:2:3
stable 700 15000
snap results
-# n selects result 1 and Enter looks it: the terminal's cursor lands on that
-# scrollback line, on the matched SPAN (cols 3..6, past the leading "x ") —
-# not the start of the line, and selected rather than merely parked on
-key n
-key enter
-stable 700 15000
-snap first
-snapstyle first
+snapstyle results
+# n walks on to the next row, Enter looks it
key n
key enter
stable 700 15000
diff --git a/test/snapshots/topbarexec.golden b/test/snapshots/topbarexec.golden
index bed96fbd..8d15d6c4 100644
--- a/test/snapshots/topbarexec.golden
+++ b/test/snapshots/topbarexec.golden
@@ -21,16 +21,16 @@
|
== snap noarg-runs grid=90x20 cursor=14,3
|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-| /tmp/pardes-snap/topbarexec/cwd New Del /tmp/pardes-s╭────────────────────────────╮
-| ls ls │pardes resizes=1 │
-| zmarkfile.txt zmarkfile.txt│terms 3 cols 2 │
-| │active #0 43x9 │
-| │scroll 0/9 │
-| │pinch 1.0000 │
-| │tscroll 0.0000 │
-| ╰────────────────────────────╯
-|
-|
+| /tmp/pardes-snap/topbarexec/cwd New Del /tmp/╭────────────────────────────────────╮
+| ls ls │pardes resizes=1 │
+| zmarkfile.txt zmark│theme helix │
+| │font default │
+| │terms 3 cols 2 │
+| │active #0 43x9 │
+| │scroll 0/9 │
+| │pinch 1.0000 │
+| │tscroll 0.0000 │
+| ╰────────────────────────────────────╯
| /tmp/pardes-snap/topbarexec/cwd New Del
| ls
| zmarkfile.txt
diff --git a/test/snapshots/windowops.golden b/test/snapshots/windowops.golden
index 4101fa86..2ec3e46f 100644
--- a/test/snapshots/windowops.golden
+++ b/test/snapshots/windowops.golden
@@ -279,16 +279,16 @@
|
== snap debug-on grid=100x30 cursor=44,4
|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill
-| /tmp/pardes-snap/windowops/cwd New Del /tmp/pardes-snap/windowops/c╭────────────────────────────╮
-| ls ls │pardes resizes=1 │
-| w.txt w.txt │terms 4 cols 2 │
-| │active #2 58x28 │
-| │scroll 0/28 │
-| │pinch 1.0000 │
-| │tscroll 0.0000 │
-| ╰────────────────────────────╯
-|
-|
+| /tmp/pardes-snap/windowops/cwd New Del /tmp/pardes-snap/win╭────────────────────────────────────╮
+| ls ls │pardes resizes=1 │
+| w.txt w.txt │theme helix │
+| │font default │
+| │terms 4 cols 2 │
+| │active #2 58x28 │
+| │scroll 0/28 │
+| │pinch 1.0000 │
+| │tscroll 0.0000 │
+| ╰────────────────────────────────────╯
|
| /tmp/pardes-snap/windowops/cwd New Del
| ls
@@ -310,16 +310,16 @@
|
== style debug-on
|0: 0-56 #949494,#121212, 57-99 d,#121212,
-|1: 0-1 #ffffff,#262626, 2-39 #949494,#121212, 40-41 #ffffff,#626262, 42-69 #949494,#121212, 70-99 d,d,
-|2: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-69 #bdbdbd,#080808, 70-70 d,d, 71-87 #949494,d, 88-98 d,#121212, 99-99 d,d,
-|3: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-69 #bdbdbd,#080808, 70-70 d,d, 71-85 #949494,d, 86-98 d,#121212, 99-99 d,d,
-|4: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-69 #bdbdbd,#080808, 70-70 d,d, 71-86 #949494,d, 87-98 d,#121212, 99-99 d,d,
-|5: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-69 #bdbdbd,#080808, 70-70 d,d, 71-81 #949494,d, 82-98 d,#121212, 99-99 d,d,
-|6: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-69 #bdbdbd,#080808, 70-70 d,d, 71-83 #949494,d, 84-98 d,#121212, 99-99 d,d,
-|7: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-69 #bdbdbd,#080808, 70-70 d,d, 71-85 #949494,d, 86-98 d,#121212, 99-99 d,d,
-|8: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-69 #bdbdbd,#080808, 70-99 d,d,
-|9: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-99 #bdbdbd,#080808,
-|10: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-99 #bdbdbd,#080808,
+|1: 0-1 #ffffff,#262626, 2-39 #949494,#121212, 40-41 #ffffff,#626262, 42-61 #949494,#121212, 62-99 d,d,
+|2: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-61 #bdbdbd,#080808, 62-62 d,d, 63-79 #949494,d, 80-98 d,#121212, 99-99 d,d,
+|3: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-61 #bdbdbd,#080808, 62-62 d,d, 63-74 #949494,d, 75-98 d,#121212, 99-99 d,d,
+|4: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-61 #bdbdbd,#080808, 62-62 d,d, 63-76 #949494,d, 77-98 d,#121212, 99-99 d,d,
+|5: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-61 #bdbdbd,#080808, 62-62 d,d, 63-77 #949494,d, 78-98 d,#121212, 99-99 d,d,
+|6: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-61 #bdbdbd,#080808, 62-62 d,d, 63-78 #949494,d, 79-98 d,#121212, 99-99 d,d,
+|7: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-61 #bdbdbd,#080808, 62-62 d,d, 63-73 #949494,d, 74-98 d,#121212, 99-99 d,d,
+|8: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-61 #bdbdbd,#080808, 62-62 d,d, 63-75 #949494,d, 76-98 d,#121212, 99-99 d,d,
+|9: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-61 #bdbdbd,#080808, 62-62 d,d, 63-77 #949494,d, 78-98 d,#121212, 99-99 d,d,
+|10: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-61 #bdbdbd,#080808, 62-99 d,d,
|11: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-99 #bdbdbd,#080808,
|12: 0-1 #ffffff,#262626, 2-39 #949494,#121212, 40-40 d,#444444, 41-41 d,#080808, 42-99 #bdbdbd,#080808,
|13: 0-0 d,#444444, 1-1 d,#080808, 2-39 #bdbdbd,#080808, 40-40 d,#444444, 41-41 d,#080808, 42-99 #bdbdbd,#080808,