DDay : fire,attack,barrage table improvements

5 files changed, 40 insertions, 22 deletions

diff --git a/DDayAtOmahaBeach/DDayOmaha.lou b/DDayAtOmahaBeach/DDayOmaha.lou
index 1a14dbf..521d16e 100644
--- a/DDayAtOmahaBeach/DDayOmaha.lou
+++ b/DDayAtOmahaBeach/DDayOmaha.lou
@@ -383,7 +383,7 @@ y{foot+ysize+0.3c}
 @ListItem{In communication 352 @Sup th units (Grey{@Char slash}Brown) when @Defeated @I withdraw in @I {Division Reinforcement Box}.}
 #@ListItem{@Defeated 352 @Sup th units (Grey{@Char slash}Brown) if in communication @I withdraw in @I {Division Reinforcement Box}.}
 @EndList
-@PP
+#@PP
 #@I Attrition : you may remove a step from an attacking adjacent US unit and {rgb 1 0 0} @Colour Eliminate the German target. FIXME
 
 @End @SubSection
@@ -493,7 +493,7 @@ y{foot+ysize+0.3c}
 
 ################################################################################
 
-@Section @Title {Tables} @NewPage { no } @Begin
+@Section @Title {Tables} @NewPage { yes } @Begin
 @LLP
 @BeginSubSections
 @SubSection @Title {US Units} @Begin
@@ -522,12 +522,19 @@ y{foot+ysize+0.3c}
 @SubSection @Title {German Defense} @Begin
 @LLP
 @Include{ german_defense.lou }
-@LLP @LLP @LLP
+#@LLP @LLP @LLP
+@BulletList
+@ListItem{@B {Heavy infantry} may support an attacking infantry across a @PBlue bluff or @PBlue cliff hexside.}
+@EndList
+@LLP
 @End @SubSection
 @SubSection @Title {US attack} @Begin
 @LLP
 @Include{ us_attack.lou }
-@LLP @LLP #@LLP
+@BulletList
+@ListItem{@Defeated 352 @Sup th units (Grey{@Char slash}Brown) if in communication @I withdraw in @I {Division Reinforcement Box}.}
+@EndList
+@LLP
 @End @SubSection
 @SubSection @Title {US Weapons} @Begin
 @LLP
diff --git a/DDayAtOmahaBeach/german_fire.lou b/DDayAtOmahaBeach/german_fire.lou
index 6bc6874..db15b8f 100644
--- a/DDayAtOmahaBeach/german_fire.lou
+++ b/DDayAtOmahaBeach/german_fire.lou
@@ -6,14 +6,14 @@
 @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} }
+    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 matching symbol} }
 @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 | @Cell @B D }
+    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 | @StartHSpan @Cell @B B | @HSpan | @HSpan }
+    format { @Cell @B A | @StartHSpan @Cell @B B | @HSpan | @VSpan }
     A { @IncludeGraphic "imgs/sporadic.eps" + @PBlue Non-Armored + sym } B { @Disrupted }
 }
diff --git a/DDayAtOmahaBeach/rulesdoc b/DDayAtOmahaBeach/rulesdoc
index feb78d6..0f2133a 100644
--- a/DDayAtOmahaBeach/rulesdoc
+++ b/DDayAtOmahaBeach/rulesdoc
@@ -93,11 +93,11 @@
   # @PageOrientation	{ Portrait		} # Portrait, Landscape, etc.
   # @PageBackground	{  			} # background of each page
   @TopMargin		{ 2.0c	@OrIfPlain 6f	} # top margin of all pages
-  @FootMargin		{ 2.0c	@OrIfPlain 6f	} # bottom margin of all pages
-  @OddLeftMargin	{ 2.0c	@OrIfPlain 10s	} # left margin of odd pages
-  @OddRightMargin	{ 2.0c	@OrIfPlain 10s	} # right margin of odd pages
-  @EvenLeftMargin	{ 2.0c	@OrIfPlain 10s	} # left margin of even pages
-  @EvenRightMargin	{ 2.0c	@OrIfPlain 10s	} # right margin of even pages
+  @FootMargin		{ 1.0c	@OrIfPlain 6f	} # bottom margin of all pages
+  @OddLeftMargin	{ 1.7c	@OrIfPlain 10s	} # left margin of odd pages
+  @OddRightMargin	{ 1.5c	@OrIfPlain 10s	} # right margin of odd pages
+  @EvenLeftMargin	{ 1.7c	@OrIfPlain 10s	} # left margin of even pages
+  @EvenRightMargin	{ 1.5c	@OrIfPlain 10s	} # right margin of even pages
   # @OddLeftBodyMargin	{ 0c			} # extra margin for page body
   # @OddRightBodyMargin	{ 0c			} # extra margin for page body
   # @EvenLeftBodyMargin	{ 0c			} # extra margin for page body
diff --git a/DDayAtOmahaBeach/us_attack.lou b/DDayAtOmahaBeach/us_attack.lou
index 441587a..5e5943c 100644
--- a/DDayAtOmahaBeach/us_attack.lou
+++ b/DDayAtOmahaBeach/us_attack.lou
@@ -7,16 +7,23 @@
     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}
+@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}
 + @Depth} } D { clines @Break {@PGreen {US Disrupted}
 + @Purple @Colour Unreveal German} } E { @PGreen {US Disrupted} }
-@Rowc B { @Sym greater } C { + @Depth } D { @PGreen {US Disrupted} } E { @Sym emptyset }
+@Rowc
+    B { @Sym greater } C { + @Depth } D { @PGreen {US Disrupted} } E { @Sym emptyset }
 #@Rowc B { x2 } C { @Disrupted } D { @Disrupted } E { @Disrupted + @Purple @Colour attrition }
-@Rowc B { x2 } C { @Disrupted } D { @Disrupted } E { clines @Break {@Disrupted
+@Rowc
+    B { x2 } C { @Disrupted } D { @Disrupted } E { clines @Break {@Disrupted
 [@Step adj -> - @Depth]?} }
-@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 }
+@Rowb
+    ruleabovewidth { 1.5p }
+    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 | @StartVSpan @Cell @B C | @StartVSpan @Cell @B D | @Cell @B E }
     B { @Sym greater } C { @Defeated } D { clines @Break {@Purple @Colour Reveal @Depth
diff --git a/DDayAtOmahaBeach/us_barrage.lou b/DDayAtOmahaBeach/us_barrage.lou
index 984bef7..5901085 100644
--- a/DDayAtOmahaBeach/us_barrage.lou
+++ b/DDayAtOmahaBeach/us_barrage.lou
@@ -4,14 +4,18 @@
     indentvertical { ctr }
     aformat { @Cell @B A | @Cell width { 5c } @B B | @Cell width { 5c } @B C | @Cell width { 5c } @B D }
 {
-@Rowa
+@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+ }
-@Rowa
+@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 }
-@Rowa
+@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 } D { @Disrupted }
-@Rowa
+@Row
+    format { @Cell @B A | @Cell width { 5c } @B B | @VSpan | @Cell width { 5c } @B D }
     A { @B color + @B sym} B { @Disrupted } C { @Disrupted } D { @Disrupted - @Depth }
 #@Rowb A { @Sym emptyset } B {} C {} D {}
 }