DDay clean up tables

6 files changed, 40 insertions, 28 deletions

diff --git a/DDayAtOmahaBeach/german_fire.lou b/DDayAtOmahaBeach/german_fire.lou
index 842c41b..21eab8a 100644
--- a/DDayAtOmahaBeach/german_fire.lou
+++ b/DDayAtOmahaBeach/german_fire.lou
@@ -2,12 +2,18 @@
     rule { yes }
     indent { ctr }
     indentvertical { ctr }
-    apaint { lightgrey }
-    aformat { @Cell @B A | @Cell @B B | @Cell @B C }
-    bformat { @Cell @B A | @Cell @B B | @Cell @B C }
 {
-@Rowa A { } B { @B WN or @B {Revealed @LLP Reinforcement} } C { @B {Unrevealed @LLP Reinforcement} }
-@Rowb A { @IncludeGraphic "imgs/intense.eps"} B { @Step } C { @Step + @Disrupted }
-@Rowb A { @IncludeGraphic "imgs/steady.eps" + @PBlue Non-Armored + sym } B { @Step } C {  @Step + @Disrupted }
-@Rowb A { @IncludeGraphic "imgs/sporadic.eps" + @PBlue Non-Armored + sym } B { @Disrupted } C { @Disrupted }
+@Row
+    paint { lightgrey }
+    format { @Cell @B A | @Cell @B B | @Cell @B C | @Cell @B D }
+    A { } B { @B WN or @B {Revealed @LLP Reinforcement} } C { @B {Unrevealed @LLP Reinforcement} } D { Ambush @LLP 7p @Font @PBlue {1 unit of any type with sym} }
+@Row
+    format { @Cell @B A | @StartVSpan @Cell @B B | @StartVSpan @Cell @B C | @Cell @B D }
+    A { @IncludeGraphic "imgs/intense.eps"} B { @Step } C { @Step + @Disrupted } D { @Step }
+@Row
+    format { @Cell @B A | @VSpan | @VSpan | @StartVSpan @Cell @B D }
+    A { @IncludeGraphic "imgs/steady.eps" + @PBlue Non-Armored + sym } D { @Disrupted }
+@Row
+    format { @Cell @B A | @Cell @B B | @Cell @B C | @VSpan}
+    A { @IncludeGraphic "imgs/sporadic.eps" + @PBlue Non-Armored + sym } B { @Disrupted } C { @Disrupted }
 }
diff --git a/DDayAtOmahaBeach/us_amphibious.lou b/DDayAtOmahaBeach/us_amphibious.lou
index 4b3dc89..c2b6680 100644
--- a/DDayAtOmahaBeach/us_amphibious.lou
+++ b/DDayAtOmahaBeach/us_amphibious.lou
@@ -3,9 +3,9 @@
     apaint { lightgrey }
     indentvertical { ctr }
     aindent { ctr }
-    aformat { @Cell indent { left } @B A | @Cell @B B | @Cell @B C | @Cell @B D | @Cell @B E }
+    aformat { @Cell indent { left } @B A | @Cell width { 5c } @B B | @Cell width { 5c } @B C | @Cell width { 5c } @B D | @Cell width { 4c } @B E }
     bindent { ctr }
-    bformat { @Cell indent { right } @B A | @Cell @B B | @Cell @B C | @Cell @B D | @Cell @B E }
+    bformat { @Cell indent { right } @B A | @Cell width { 5c } @B B | @Cell width { 5c } @B C | @Cell width { 5c } @B D | @Cell width { 5c } @B E }
 {
 @Rowa A { Turn 1 } B { A } C { B } D { C } E { D }
 #@Rowb A { Tank }
diff --git a/DDayAtOmahaBeach/us_attack.lou b/DDayAtOmahaBeach/us_attack.lou
index f994a47..b9030ce 100644
--- a/DDayAtOmahaBeach/us_attack.lou
+++ b/DDayAtOmahaBeach/us_attack.lou
@@ -3,9 +3,9 @@
     indent { ctr }
     indentvertical { ctr }
     apaint { lightgrey }
-    aformat { @Cell @B A | @Cell @B B | @Cell @B C | @Cell @B D | @Cell @B E }
-    bformat { @StartVSpan @Cell @B A | @Cell @B B | @Cell @B C | @Cell @B D | @Cell @B E }
-    cformat { @VSpan | @Cell @B B | @Cell @B C | @Cell @B D | @Cell @B E }
+    aformat { @Cell @B A | @Cell @B B | @Cell width { 4c } @B C | @Cell width { 4c } @B D | @Cell @B E }
+    bformat { @StartVSpan @Cell @B A | @Cell @B B | @Cell width { 4c } @B C | @Cell width { 4c } @B D | @Cell @B E }
+    cformat { @VSpan | @Cell @B B | @Cell width { 4c } @B C | @Cell width { 4c } @B D | @Cell @B E }
 {
 @Rowa A { Weapons } B { Delta } C { Alone } D { +Hidden Depth } E { + Revealed Depth }
 @Rowb A { @StartVSpan NO } B { @Sym lessequal } C { clines @Break {@PGreen {US Disrupted}
@@ -18,12 +18,12 @@
 @Rowb A { @StartVSpan YES } B { @Sym less } C { + @Depth } D { @PGreen {US Disrupted} } E { @Sym emptyset }
 @Rowc B { @Sym equal } C { @Disrupted } D { @Sym emptyset } E { @Disrupted }
 @Row
-    format { @VSpan | @Cell @B B | @Cell @B C | @StartVSpan @Cell @B D | @Cell @B E }
+    format { @VSpan | @Cell @B B | @StartVSpan @Cell @B C | @StartVSpan @Cell @B D | @Cell @B E }
     B { @Sym greater } C { @Defeated } D { clines @Break {@Purple @Colour Reveal @Depth
 + resolve again} } E { @Disrupted - @Depth }
 @Row
-    format { @VSpan | @Cell @B B | @Cell @B C | @VSpan | @Cell @B E }
-    B { x2 } C { @Defeated } E { clines @Break {@Disrupted - @Depth
+    format { @VSpan | @Cell @B B | @VSpan | @VSpan | @Cell @B E }
+    B { x2 } E { clines @Break {@Disrupted - @Depth
 turn 16+ : @Defeated - @Depth
 } }
 }
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 }
 }
diff --git a/DDayAtOmahaBeach/us_move.lou b/DDayAtOmahaBeach/us_move.lou
index 0a2a742..da39dfe 100644
--- a/DDayAtOmahaBeach/us_move.lou
+++ b/DDayAtOmahaBeach/us_move.lou
@@ -3,8 +3,8 @@
     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 }
+    aformat { @Cell @B A | @Cell width { 4c } @B B | @Cell width { 4c } @B C | @Cell width { 4c } @B D }
+    bformat { @Cell @B A | @Cell width { 4c } @B B | @Cell width { 4c } @B C | @Cell width { 4c } @B D }
 {
 @Rowa A { } B { Infantry } C { Leaders } D { Others }
 @Rowb A { Bocage, Orchard, Woods @LLP Hedge, Seawall, Slope } B { @Sym emptyset } C { @Sym emptyset } D { @POrange {unless via road} }
diff --git a/DDayAtOmahaBeach/us_units.lou b/DDayAtOmahaBeach/us_units.lou
index 63a9e1e..d6e2aed 100644
--- a/DDayAtOmahaBeach/us_units.lou
+++ b/DDayAtOmahaBeach/us_units.lou
@@ -139,14 +139,14 @@
     @LLP E{@Sym slash}2{@Sym slash}115 @I - F{@Sym slash}2{@Sym slash}115 @I - G{@Sym slash}2{@Sym slash}115 @I - H{@Sym slash}2{@Sym slash}115
     }
 @Row
-    paint { rgb { .95 .95 .95} }
+    paint { @Lightgrey }
     ruleabovewidth { 1p }
     format { @StartVSpan @Cell @B A | @StartVSpan @Cell @I B | @StartVSpan @Cell @B C | @Cell @I D | @Cell @B E }
     A { 19 }
     C {@Sym emptyset }
     E { 115{@Sym slash}HQ }
 @Row
-    paint { rgb { .95 .95 .95} }
+    paint { @Lightgrey }
     format { @VSpan | @VSpan | @VSpan | @Cell @I D | @Cell @B E }
     D { 3 }
     E { I{@Sym slash}3{@Sym slash}115 @I - K{@Sym slash}3{@Sym slash}115 @I - L{@Sym slash}3{@Sym slash}115 @I - M{@Sym slash}3{@Sym slash}115 }
@@ -157,14 +157,14 @@
     C { A{@Sym slash}1{@Sym slash}18 @I - B{@Sym slash}1{@Sym slash}18 @I - C{@Sym slash}1{@Sym slash}18 @I - D{@Sym slash}1{@Sym slash}18 }
     E { AT{@Sym slash}115 }
 @Row
-    paint { rgb { .95 .95 .95} }
+    paint { @Lightgrey }
     ruleabovewidth { 1p }
     format { @StartVSpan @Cell @B A | @Cell @I B | @Cell @B C | @StartVSpan @Cell @I D | @StartVSpan @Cell @B E }
     A { 22 }
     C { 18{@Sym slash}HQ }
     E { @Sym emptyset }
 @Row
-    paint { rgb { .95 .95 .95} }
+    paint { @Lightgrey }
     format { @VSpan | @Cell @I B | @Cell @B C | @VSpan | @VSpan }
     B { 3 }
     C { I{@Sym slash}3{@Sym slash}18 @I - K{@Sym slash}3{@Sym slash}18 @I - L{@Sym slash}3{@Sym slash}18 @I - M{@Sym slash}3{@Sym slash}18 }