DDay clean up tables

1 files changed, 13 insertions, 7 deletions

diff --git a/DDayAtOmahaBeach/us_barrage.lou b/DDayAtOmahaBeach/us_barrage.lou
index d790020..6649daf 100644
--- a/DDayAtOmahaBeach/us_barrage.lou
+++ b/DDayAtOmahaBeach/us_barrage.lou
@@ -2,13 +2,19 @@
     rule { yes }
     indent { ctr }
     indentvertical { ctr }
-    apaint { lightgrey }
-    aformat { @Cell @B A | @Cell @B B | @Cell @B C | @Cell @B D }
-    bformat { @Cell @B A | @Cell @B B | @Cell @B C | @Cell @B D }
 {
-@Rowa A { } B { 1-2 } C { 3-5 } D { 6+ }
+@Row
+    paint { lightgrey }
+    format { @Cell @B A | @Cell width { 5c } @B B | @Cell width { 5c } @B C | @Cell width { 5c } @B D }
+    A { } B { 1-2 } C { 3-5 } D { 6+ }
+@Row
+    format { @Cell @B A | @Cell width { 5c } @B B | @Cell width { 5c } @B C | @StartVSpan @Cell width { 5c } @B D }
+    A { @B sym } B { @Sym emptyset } C { @Disruptedif @I {if no Depth} } D { @Disrupted }
+@Row
+    format { @Cell @B A | @Cell width { 5c } @B B | @StartVSpan @Cell width { 5c } @B C | @VSpan }
+    A { @B color } B { @Disruptedif @I {if no Depth} } C { @Disrupted }
+@Row
+    format { @Cell @B A | @Cell width { 5c } @B B | @VSpan | @Cell width { 5c } @B D }
+    A { @B color + @B sym} B { @Disrupted } D { @Disrupted - @Depth }
 #@Rowb A { @Sym emptyset } B {} C {} D {}
-@Rowb A { @B color + @B sym} B { @Disrupted } C { @Disrupted} D { @Disrupted - @Depth }
-@Rowb A { @B color } B { @Disruptedif @I {if no Depth} } C { @Disrupted } D { @Disrupted }
-@Rowb A { @B sym } B { @Sym emptyset } C { @Disruptedif @I {if no Depth} } D { @Disrupted }
 }