DDay : tables clean up, rules and layout improvements

10 files changed, 170 insertions, 283 deletions

diff --git a/DDayAtOmahaBeach/DDayOmaha.lou b/DDayAtOmahaBeach/DDayOmaha.lou
index 261194f..89a3028 100644
--- a/DDayAtOmahaBeach/DDayOmaha.lou
+++ b/DDayAtOmahaBeach/DDayOmaha.lou
@@ -265,7 +265,7 @@ y{foot+ysize+.8c}
 @Section @Title {US Actions} @NewPage { no } @Begin
 @BulletList
 @ListItem{Each unit can conduct at most @B 1 action per turn.}
-@ListItem{You may conduct @B 2 actions per @B Sector with units or stacks of units. @Ext : 3 turn 17-32.}
+@ListItem{You may conduct @B 2 actions per @B Sector with units or stacks of units. @Ext : @B 3 actions turn 17-32.}
 @ListItem{And conduct @B free actions with :
     @BulletList
     @ListItem{@I ranger infantry units.}
@@ -471,50 +471,42 @@ only if not in the field of fire of an @I occupied or in communication German po
 @Section @Title {Tables} @NewPage { yes } @Begin
 @LLP
 @BeginSubSections
-@SubSection @Title {US amphibious} @Begin
+@SubSection @Title {US Units} @Begin
+@LLP
+@Include{ us_units.lou }
+@End @SubSection
+@SubSection @Title {US amphibious} @NewPage { yes } @Begin
 @LLP
 @Include{ us_amphibious.lou }
-@LLP @LLP
+@LLP @LLP @LLP
 @End @SubSection
 @SubSection @Title {German Fire} @Begin
 @LLP
 @Include{ german_fire.lou }
-@LLP @LLP
+@LLP @LLP @LLP
 @End @SubSection
 @SubSection @Title {US move} @Begin
 @LLP
 @Include{ us_move.lou }
-@LLP @LLP
 @End @SubSection
 @SubSection @Title {US attack} @NewPage { yes } @Begin
 @LLP
 @Include{ us_attack.lou }
-@LLP @LLP
+@LLP @LLP @LLP
 @End @SubSection
 @SubSection @Title {German Defense} @Begin
 @LLP
 @Include{ german_defense.lou }
-@LLP @LLP
+@LLP @LLP @LLP
 @End @SubSection
 @SubSection @Title {US barrage} @Begin
 @LLP
 @Include{ us_barrage.lou }
-@LLP @LLP
+@LLP @LLP @LLP
 @End @SubSection
 @SubSection @Title {US Weapons} @Begin
 @LLP
 @Include{ us_weapons.lou}
-@LLP @LLP
-@End @SubSection
-@SubSection @Title {German Actions} @NewPage { yes } @Begin
-@LLP
-@Include{ german_actions.lou}
-@LLP @LLP
-@End @SubSection
-@SubSection @Title {US Units} @NewPage { yes } @Begin
-@LLP
-@Include{ us_units.lou }
-@LLP @LLP
 @End @SubSection
 @EndSubSections
 @End @Section
diff --git a/DDayAtOmahaBeach/DDayOmaha.lou.ld b/DDayAtOmahaBeach/DDayOmaha.lou.ld
index 33348d5..9ddc952 100644
--- a/DDayAtOmahaBeach/DDayOmaha.lou.ld
+++ b/DDayAtOmahaBeach/DDayOmaha.lou.ld
@@ -5548,7 +5548,7 @@
 }
 {@SubSection
   \a{"10.538.DDayOmaha.lou.6"}
-  \b{US amphibious}
+  \b{US Units}
 { ??? }}}
 
 {@@E {
@@ -5558,7 +5558,7 @@
 }
 {@SubSection
   \a{"10.538.DDayOmaha.lou.6"}
-  \b{US amphibious}
+  \b{US Units}
 { @LInput }} } }
 }
 {@@V @LargeScaleStructure
@@ -5590,7 +5590,7 @@
  }
 {@@E {
 { @@A { @@E {
-@@D "74052 5554"
+@@D "74047 5554"
 }
 {?? @@V @Do ??} } }
 }
@@ -5601,7 +5601,7 @@
   \b{@@V @ShortNum}}}
 
 {@@E {
-@@D "74052 5554"
+@@D "74047 5554"
 }
 {@TitleMarker
   \a{"10.538.DDayOmaha.lou.6"}
@@ -5619,17 +5619,42 @@
 }
 {@SubSection
   \a{"10.538.DDayOmaha.lou.7"}
-  \b{German Fire}
+  \b{US amphibious}
+  \f{yes}
 { ??? }}}
 
 {@@E {
+{ @@A { @@E {
+@@D "21 2"
+}
+{@@V @SimplePageList
+  \a{1}
+  \b{Simple}
+  \d{Portrait}
+7} } }
+}
+{@PageMarker
+  \a{"4.1276.DDayOmaha.lou.7"}
+  \c{7}
+  \b{Arabic @@V @Num 7}
+  \d{"Odd"}}}
+
+{@@E {
+@@D "21 2"
+}
+{@@V @FootNoteCounterMarker
+  \a{"9.1565.DDayOmaha.lou.7"}
+  \b{0}}}
+
+{@@E {
 { @@B { { @@A { @@E {
 { @@A { @@E {
 @@D "73846 5539"
 }
 {@SubSection
   \a{"10.538.DDayOmaha.lou.7"}
-  \b{German Fire}
+  \b{US amphibious}
+  \f{yes}
 { @LInput }} } }
 }
 {@@V @LargeScaleStructure
@@ -5656,12 +5681,12 @@
   intables{No}
   infloaters{No}
   inrunners{No}
-  newpage{No}
+  newpage{yes}
 @@V @Body} } }
  }
 {@@E {
 { @@A { @@E {
-@@D "75130 5625"
+@@D "75413 5649"
 }
 {?? @@V @Do ??} } }
 }
@@ -5672,7 +5697,7 @@
   \b{@@V @ShortNum}}}
 
 {@@E {
-@@D "75130 5625"
+@@D "75413 5649"
 }
 {@TitleMarker
   \a{"10.538.DDayOmaha.lou.7"}
@@ -5690,7 +5715,7 @@
 }
 {@SubSection
   \a{"10.538.DDayOmaha.lou.8"}
-  \b{US move}
+  \b{German Fire}
 { ??? }}}
 
 {@@E {
@@ -5700,7 +5725,7 @@
 }
 {@SubSection
   \a{"10.538.DDayOmaha.lou.8"}
-  \b{US move}
+  \b{German Fire}
 { @LInput }} } }
 }
 {@@V @LargeScaleStructure
@@ -5732,7 +5757,7 @@
  }
 {@@E {
 { @@A { @@E {
-@@D "76202 5696"
+@@D "76502 5721"
 }
 {?? @@V @Do ??} } }
 }
@@ -5743,7 +5768,7 @@
   \b{@@V @ShortNum}}}
 
 {@@E {
-@@D "76202 5696"
+@@D "76502 5721"
 }
 {@TitleMarker
   \a{"10.538.DDayOmaha.lou.8"}
@@ -5761,42 +5786,17 @@
 }
 {@SubSection
   \a{"10.538.DDayOmaha.lou.9"}
-  \b{US attack}
-  \f{yes}
+  \b{US move}
 { ??? }}}
 
 {@@E {
-{ @@A { @@E {
-@@D "21 2"
-}
-{@@V @SimplePageList
-  \a{1}
-  \b{Simple}
-  \d{Portrait}
-7} } }
-}
-{@PageMarker
-  \a{"4.1276.DDayOmaha.lou.7"}
-  \c{7}
-  \b{Arabic @@V @Num 7}
-  \d{"Odd"}}}
-
-{@@E {
-@@D "21 2"
-}
-{@@V @FootNoteCounterMarker
-  \a{"9.1565.DDayOmaha.lou.7"}
-  \b{0}}}
-
-{@@E {
 { @@B { { @@A { @@E {
 { @@A { @@E {
 @@D "73846 5539"
 }
 {@SubSection
   \a{"10.538.DDayOmaha.lou.9"}
-  \b{US attack}
-  \f{yes}
+  \b{US move}
 { @LInput }} } }
 }
 {@@V @LargeScaleStructure
@@ -5823,12 +5823,12 @@
   intables{No}
   infloaters{No}
   inrunners{No}
-  newpage{yes}
+  newpage{No}
 @@V @Body} } }
  }
 {@@E {
 { @@A { @@E {
-@@D "77563 5791"
+@@D "77574 5792"
 }
 {?? @@V @Do ??} } }
 }
@@ -5839,7 +5839,7 @@
   \b{@@V @ShortNum}}}
 
 {@@E {
-@@D "77563 5791"
+@@D "77574 5792"
 }
 {@TitleMarker
   \a{"10.538.DDayOmaha.lou.9"}
@@ -5857,17 +5857,41 @@
 }
 {@SubSection
   \a{"10.538.DDayOmaha.lou.10"}
-  \b{German Defense}
+  \b{US attack}
+  \f{yes}
 { ??? }}}
 
 {@@E {
+{ @@A { @@E {
+@@D "75124 5626"
+}
+{@@V @SimpleEvenPageList
+  \a{1}
+  \b{Simple}
+8} } }
+}
+{@PageMarker
+  \a{"4.1276.DDayOmaha.lou.8"}
+  \c{8}
+  \b{Arabic @@V @Num 8}
+  \d{"Even"}}}
+
+{@@E {
+@@D "21 2"
+}
+{@@V @FootNoteCounterMarker
+  \a{"9.1565.DDayOmaha.lou.8"}
+  \b{0}}}
+
+{@@E {
 { @@B { { @@A { @@E {
 { @@A { @@E {
 @@D "73846 5539"
 }
 {@SubSection
   \a{"10.538.DDayOmaha.lou.10"}
-  \b{German Defense}
+  \b{US attack}
+  \f{yes}
 { @LInput }} } }
 }
 {@@V @LargeScaleStructure
@@ -5894,12 +5918,12 @@
   intables{No}
   infloaters{No}
   inrunners{No}
-  newpage{No}
+  newpage{yes}
 @@V @Body} } }
  }
 {@@E {
 { @@A { @@E {
-@@D "78653 5863"
+@@D "78933 5886"
 }
 {?? @@V @Do ??} } }
 }
@@ -5910,7 +5934,7 @@
   \b{@@V @ShortNum}}}
 
 {@@E {
-@@D "78653 5863"
+@@D "78933 5886"
 }
 {@TitleMarker
   \a{"10.538.DDayOmaha.lou.10"}
@@ -5928,7 +5952,7 @@
 }
 {@SubSection
   \a{"10.538.DDayOmaha.lou.11"}
-  \b{US barrage}
+  \b{German Defense}
 { ??? }}}
 
 {@@E {
@@ -5938,7 +5962,7 @@
 }
 {@SubSection
   \a{"10.538.DDayOmaha.lou.11"}
-  \b{US barrage}
+  \b{German Defense}
 { @LInput }} } }
 }
 {@@V @LargeScaleStructure
@@ -5970,7 +5994,7 @@
  }
 {@@E {
 { @@A { @@E {
-@@D "79737 5934"
+@@D "80027 5958"
 }
 {?? @@V @Do ??} } }
 }
@@ -5981,7 +6005,7 @@
   \b{@@V @ShortNum}}}
 
 {@@E {
-@@D "79737 5934"
+@@D "80027 5958"
 }
 {@TitleMarker
   \a{"10.538.DDayOmaha.lou.11"}
@@ -5999,7 +6023,7 @@
 }
 {@SubSection
   \a{"10.538.DDayOmaha.lou.12"}
-  \b{US Weapons}
+  \b{US barrage}
 { ??? }}}
 
 {@@E {
@@ -6009,7 +6033,7 @@
 }
 {@SubSection
   \a{"10.538.DDayOmaha.lou.12"}
-  \b{US Weapons}
+  \b{US barrage}
 { @LInput }} } }
 }
 {@@V @LargeScaleStructure
@@ -6041,7 +6065,7 @@
  }
 {@@E {
 { @@A { @@E {
-@@D "80817 6005"
+@@D "81111 6029"
 }
 {?? @@V @Do ??} } }
 }
@@ -6052,7 +6076,7 @@
   \b{@@V @ShortNum}}}
 
 {@@E {
-@@D "80817 6005"
+@@D "81111 6029"
 }
 {@TitleMarker
   \a{"10.538.DDayOmaha.lou.12"}
@@ -6070,41 +6094,17 @@
 }
 {@SubSection
   \a{"10.538.DDayOmaha.lou.13"}
-  \b{German Actions}
-  \f{yes}
+  \b{US Weapons}
 { ??? }}}
 
 {@@E {
-{ @@A { @@E {
-@@D "77274 5768"
-}
-{@@V @SimpleEvenPageList
-  \a{1}
-  \b{Simple}
-8} } }
-}
-{@PageMarker
-  \a{"4.1276.DDayOmaha.lou.8"}
-  \c{8}
-  \b{Arabic @@V @Num 8}
-  \d{"Even"}}}
-
-{@@E {
-@@D "21 2"
-}
-{@@V @FootNoteCounterMarker
-  \a{"9.1565.DDayOmaha.lou.8"}
-  \b{0}}}
-
-{@@E {
 { @@B { { @@A { @@E {
 { @@A { @@E {
 @@D "73846 5539"
 }
 {@SubSection
   \a{"10.538.DDayOmaha.lou.13"}
-  \b{German Actions}
-  \f{yes}
+  \b{US Weapons}
 { @LInput }} } }
 }
 {@@V @LargeScaleStructure
@@ -6131,12 +6131,12 @@
   intables{No}
   infloaters{No}
   inrunners{No}
-  newpage{yes}
+  newpage{No}
 @@V @Body} } }
  }
 {@@E {
 { @@A { @@E {
-@@D "82188 6099"
+@@D "82191 6100"
 }
 {?? @@V @Do ??} } }
 }
@@ -6147,109 +6147,13 @@
   \b{@@V @ShortNum}}}
 
 {@@E {
-@@D "82188 6099"
+@@D "82191 6100"
 }
 {@TitleMarker
   \a{"10.538.DDayOmaha.lou.13"}
   \b{@@V title}}}
 
 {@@E {
-@@D "2340 176"
-}
-{@@V @SubSectionList
-  \a{"10.196.DDayOmaha.lou.14"}
-9}}
-
-{@@E {
-@@D "73846 5539"
-}
-{@SubSection
-  \a{"10.538.DDayOmaha.lou.14"}
-  \b{US Units}
-  \f{yes}
-{ ??? }}}
-
-{@@E {
-{ @@A { @@E {
-@@D "21 2"
-}
-{@@V @SimplePageList
-  \a{1}
-  \b{Simple}
-  \d{Portrait}
-9} } }
-}
-{@PageMarker
-  \a{"4.1276.DDayOmaha.lou.9"}
-  \c{9}
-  \b{Arabic @@V @Num 9}
-  \d{"Odd"}}}
-
-{@@E {
-@@D "21 2"
-}
-{@@V @FootNoteCounterMarker
-  \a{"9.1565.DDayOmaha.lou.9"}
-  \b{0}}}
-
-{@@E {
-{ @@B { { @@A { @@E {
-{ @@A { @@E {
-@@D "73846 5539"
-}
-{@SubSection
-  \a{"10.538.DDayOmaha.lou.14"}
-  \b{US Units}
-  \f{yes}
-{ @LInput }} } }
-}
-{@@V @LargeScaleStructure
-  \a{"10.538.DDayOmaha.lou.14"}
-  \b{Minor}
-  \c{}
-  \d{@@V @Title}
-  \e{dft}
-  \g{Bold}
-  \h{@@V @SubSectionHeadingBreak}
-  \i{@Num @@V @SubSectionHeadingFormat @Body}
-  \k{Yes}
-  \l{@@V @SubSectionContentsIndent}
-  \n{Arabic}
-  \o{{@@V @SubSectionList&&preceding} @Tagged @@V @Tag}
-  \p{{@@V @SubSectionList&&{@@V @Tag}} @Open {num}}
-  \q{dft}
-  \r{@@V @SectionShortNum}
-  \t{}
-  \u{}
-  \x{No}
-  \y{No}
-  \z{No}
-  intables{No}
-  infloaters{No}
-  inrunners{No}
-  newpage{yes}
-@@V @Body} } }
- }
-{@@E {
-{ @@A { @@E {
-@@D "83572 6195"
-}
-{?? @@V @Do ??} } }
-}
-{@@V y}} }
-}
-{@NumberMarker
-  \a{"10.538.DDayOmaha.lou.14"}
-  \b{@@V @ShortNum}}}
-
-{@@E {
-@@D "83572 6195"
-}
-{@TitleMarker
-  \a{"10.538.DDayOmaha.lou.14"}
-  \b{@@V title}}}
-
-{@@E {
 { @@B { { @@A { @@E {
 @@D "72218 5430"
 }
@@ -6257,7 +6161,7 @@
  }
 {@@E {
 { @@A { @@E {
-@@D "84480 6252"
+@@D "83090 6156"
 }
 {?? @@V @Do ??} } }
 }
diff --git a/DDayAtOmahaBeach/DDayOmaha.pdf b/DDayAtOmahaBeach/DDayOmaha.pdf
index f52b178..e1223c2 100644
--- a/DDayAtOmahaBeach/DDayOmaha.pdf
+++ b/DDayAtOmahaBeach/DDayOmaha.pdf
diff --git a/DDayAtOmahaBeach/german_defense.lou b/DDayAtOmahaBeach/german_defense.lou
index f416444..7f939c9 100644
--- a/DDayAtOmahaBeach/german_defense.lou
+++ b/DDayAtOmahaBeach/german_defense.lou
@@ -8,7 +8,7 @@
     cformat { @Cell @B A | @StartHSpan @Cell @B B | @HSpan }
 {
 @Rowa A { Terrain } B { Unit Strength } C { Depth Strength }
+@Rowb A { Anti-Tank Ditch @Char slash Wall, Orchard, Woods, Shingle} B { @PRed x2 } C { @POrange x1 }
 @Rowb A { Bocage, Buildings, Slope } B { @PRed x2 } C { @PRed x2 }
-@Rowb A { Orchard, Woods, Shingle, Anti-Tank Ditch @Char slash Wall } B { @PRed x2 } C { @POrange x1 }
 @Rowc A { Bluff, Scaleable Cliff, Sheer Cliff } B { Attack prohibited }
 }
diff --git a/DDayAtOmahaBeach/german_fire.lou b/DDayAtOmahaBeach/german_fire.lou
index 21eab8a..6bc6874 100644
--- a/DDayAtOmahaBeach/german_fire.lou
+++ b/DDayAtOmahaBeach/german_fire.lou
@@ -11,9 +11,9 @@
     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 }
+    format { @Cell @B A | @VSpan | @VSpan | @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 }
+    format { @Cell @B A | @StartHSpan @Cell @B B | @HSpan | @HSpan }
+    A { @IncludeGraphic "imgs/sporadic.eps" + @PBlue Non-Armored + sym } B { @Disrupted }
 }
diff --git a/DDayAtOmahaBeach/lout.li b/DDayAtOmahaBeach/lout.li
index f372148..88bbf78 100644
--- a/DDayAtOmahaBeach/lout.li
+++ b/DDayAtOmahaBeach/lout.li
@@ -38,28 +38,26 @@
 15&10.508.DDayOmaha.lou.8	0	00754	52894	4024	DDayOmaha.lou
 15&10.508.DDayOmaha.lou.9	0	00797	71898	5406	DDayOmaha.lou
 15&10.538.DDayOmaha.lou.1	0	00443	40063	3026	DDayOmaha.lou
-15&10.538.DDayOmaha.lou.10	0	00830	77267	5768	DDayOmaha.lou
-15&10.538.DDayOmaha.lou.11	0	00836	77267	5768	DDayOmaha.lou
-15&10.538.DDayOmaha.lou.12	0	00842	77267	5768	DDayOmaha.lou
-15&10.538.DDayOmaha.lou.13	0	00850	81896	6077	DDayOmaha.lou
-15&10.538.DDayOmaha.lou.14	0	00858	83276	6172	DDayOmaha.lou
+15&10.538.DDayOmaha.lou.10	0	00832	78641	5864	DDayOmaha.lou
+15&10.538.DDayOmaha.lou.11	0	00838	78641	5864	DDayOmaha.lou
+15&10.538.DDayOmaha.lou.12	0	00844	78641	5864	DDayOmaha.lou
+15&10.538.DDayOmaha.lou.13	0	00850	78641	5864	DDayOmaha.lou
 15&10.538.DDayOmaha.lou.2	0	00517	40063	3026	DDayOmaha.lou
 15&10.538.DDayOmaha.lou.3	0	00617	52894	4024	DDayOmaha.lou
 15&10.538.DDayOmaha.lou.4	0	00651	52894	4024	DDayOmaha.lou
 15&10.538.DDayOmaha.lou.5	0	00677	52894	4024	DDayOmaha.lou
 15&10.538.DDayOmaha.lou.6	0	00804	71898	5406	DDayOmaha.lou
-15&10.538.DDayOmaha.lou.7	0	00810	71898	5406	DDayOmaha.lou
-15&10.538.DDayOmaha.lou.8	0	00816	71898	5406	DDayOmaha.lou
-15&10.538.DDayOmaha.lou.9	0	00824	77267	5768	DDayOmaha.lou
+15&10.538.DDayOmaha.lou.7	0	00812	75117	5626	DDayOmaha.lou
+15&10.538.DDayOmaha.lou.8	0	00818	75117	5626	DDayOmaha.lou
+15&10.538.DDayOmaha.lou.9	0	00824	75117	5626	DDayOmaha.lou
 15&4.1276.DDayOmaha.lou.1	0	00015	1873	137	DDayOmaha.lou
 15&4.1276.DDayOmaha.lou.2	0	00166	15592	1176	DDayOmaha.lou
 15&4.1276.DDayOmaha.lou.3	0	00285	25174	1917	DDayOmaha.lou
 15&4.1276.DDayOmaha.lou.4	0	00441	40063	3026	DDayOmaha.lou
 15&4.1276.DDayOmaha.lou.5	0	00613	52894	4024	DDayOmaha.lou
 15&4.1276.DDayOmaha.lou.6	0	00794	71898	5406	DDayOmaha.lou
-15&4.1276.DDayOmaha.lou.7	0	00822	77267	5768	DDayOmaha.lou
-15&4.1276.DDayOmaha.lou.8	0	00848	81896	6077	DDayOmaha.lou
-15&4.1276.DDayOmaha.lou.9	0	00856	83276	6172	DDayOmaha.lou
+15&4.1276.DDayOmaha.lou.7	0	00810	75117	5626	DDayOmaha.lou
+15&4.1276.DDayOmaha.lou.8	0	00830	78641	5864	DDayOmaha.lou
 15&4.1794.DDayOmaha.lou.1	0	00037	1873	137	DDayOmaha.lou
 15&4.1794.DDayOmaha.lou.10	0	00065	1873	137	DDayOmaha.lou
 15&4.1794.DDayOmaha.lou.100	0	00481	40063	3026	DDayOmaha.lou
@@ -226,17 +224,16 @@
 15&4.1794.DDayOmaha.lou.97	0	00470	40063	3026	DDayOmaha.lou
 15&4.1794.DDayOmaha.lou.98	0	00474	40063	3026	DDayOmaha.lou
 15&4.1794.DDayOmaha.lou.99	0	00486	40063	3026	DDayOmaha.lou
-15&last.page	0	00865	83276	6172	DDayOmaha.lou
+15&last.page	0	00857	78641	5864	DDayOmaha.lou
 16&9.1565.DDayOmaha.lou.1	0	00016	2175	163	DDayOmaha.lou
 16&9.1565.DDayOmaha.lou.2	0	00167	15777	1191	DDayOmaha.lou
 16&9.1565.DDayOmaha.lou.3	0	00286	25365	1933	DDayOmaha.lou
 16&9.1565.DDayOmaha.lou.4	0	00442	40250	3041	DDayOmaha.lou
 16&9.1565.DDayOmaha.lou.5	0	00614	53085	4040	DDayOmaha.lou
 16&9.1565.DDayOmaha.lou.6	0	00795	72085	5421	DDayOmaha.lou
-16&9.1565.DDayOmaha.lou.7	0	00823	77458	5784	DDayOmaha.lou
-16&9.1565.DDayOmaha.lou.8	0	00849	82083	6092	DDayOmaha.lou
-16&9.1565.DDayOmaha.lou.9	0	00857	83467	6188	DDayOmaha.lou
-17&9.966.DDayOmaha.lou.1	0	00864	84930	6281	DDayOmaha.lou
+16&9.1565.DDayOmaha.lou.7	0	00811	75308	5642	DDayOmaha.lou
+16&9.1565.DDayOmaha.lou.8	0	00831	78828	5879	DDayOmaha.lou
+17&9.966.DDayOmaha.lou.1	0	00856	83540	6185	DDayOmaha.lou
 17&9.966.DDayOmaha.lou.10	0	00287	25455	1940	DDayOmaha.lou
 17&9.966.DDayOmaha.lou.11	0	00349	30737	2340	DDayOmaha.lou
 17&9.966.DDayOmaha.lou.12	0	00352	31317	2379	DDayOmaha.lou
@@ -249,8 +246,8 @@
 17&9.966.DDayOmaha.lou.19	0	00791	71325	5367	DDayOmaha.lou
 17&9.966.DDayOmaha.lou.2	0	00017	2265	170	DDayOmaha.lou
 17&9.966.DDayOmaha.lou.20	0	00796	72175	5428	DDayOmaha.lou
-17&9.966.DDayOmaha.lou.21	0	00862	84465	6252	DDayOmaha.lou
-17&9.966.DDayOmaha.lou.3	0	00863	84859	6275	DDayOmaha.lou
+17&9.966.DDayOmaha.lou.21	0	00854	83075	6156	DDayOmaha.lou
+17&9.966.DDayOmaha.lou.3	0	00855	83469	6179	DDayOmaha.lou
 17&9.966.DDayOmaha.lou.4	0	00020	2674	203	DDayOmaha.lou
 17&9.966.DDayOmaha.lou.5	0	00082	7968	610	DDayOmaha.lou
 17&9.966.DDayOmaha.lou.6	0	00085	8597	649	DDayOmaha.lou
@@ -295,19 +292,18 @@
 20&10.508.DDayOmaha.lou.8	0	00756	68598	5152	DDayOmaha.lou
 20&10.508.DDayOmaha.lou.9	0	00799	73207	5489	DDayOmaha.lou
 20&10.538.DDayOmaha.lou.1	0	00445	40340	3048	DDayOmaha.lou
-20&10.538.DDayOmaha.lou.10	0	00832	78638	5863	DDayOmaha.lou
-20&10.538.DDayOmaha.lou.11	0	00838	79722	5934	DDayOmaha.lou
-20&10.538.DDayOmaha.lou.12	0	00844	80802	6005	DDayOmaha.lou
-20&10.538.DDayOmaha.lou.13	0	00852	82173	6099	DDayOmaha.lou
-20&10.538.DDayOmaha.lou.14	0	00860	83557	6195	DDayOmaha.lou
+20&10.538.DDayOmaha.lou.10	0	00834	78918	5886	DDayOmaha.lou
+20&10.538.DDayOmaha.lou.11	0	00840	80012	5958	DDayOmaha.lou
+20&10.538.DDayOmaha.lou.12	0	00846	81096	6029	DDayOmaha.lou
+20&10.538.DDayOmaha.lou.13	0	00852	82176	6100	DDayOmaha.lou
 20&10.538.DDayOmaha.lou.2	0	00519	45953	3484	DDayOmaha.lou
 20&10.538.DDayOmaha.lou.3	0	00619	53368	4063	DDayOmaha.lou
 20&10.538.DDayOmaha.lou.4	0	00653	56419	4290	DDayOmaha.lou
 20&10.538.DDayOmaha.lou.5	0	00679	58973	4475	DDayOmaha.lou
-20&10.538.DDayOmaha.lou.6	0	00806	74037	5554	DDayOmaha.lou
-20&10.538.DDayOmaha.lou.7	0	00812	75115	5625	DDayOmaha.lou
-20&10.538.DDayOmaha.lou.8	0	00818	76187	5696	DDayOmaha.lou
-20&10.538.DDayOmaha.lou.9	0	00826	77548	5791	DDayOmaha.lou
+20&10.538.DDayOmaha.lou.6	0	00806	74032	5554	DDayOmaha.lou
+20&10.538.DDayOmaha.lou.7	0	00814	75398	5649	DDayOmaha.lou
+20&10.538.DDayOmaha.lou.8	0	00820	76487	5721	DDayOmaha.lou
+20&10.538.DDayOmaha.lou.9	0	00826	77559	5792	DDayOmaha.lou
 20&4.1246.DDayOmaha.lou.10	0	00041	5398	398	DDayOmaha.lou
 20&4.1246.DDayOmaha.lou.100	0	00240	21974	1666	DDayOmaha.lou
 20&4.1246.DDayOmaha.lou.102	0	00244	22268	1690	DDayOmaha.lou
@@ -650,19 +646,18 @@
 21&10.508.DDayOmaha.lou.8	0	00757	68777	5167	DDayOmaha.lou
 21&10.508.DDayOmaha.lou.9	0	00800	73386	5504	DDayOmaha.lou
 21&10.538.DDayOmaha.lou.1	0	00446	41153	3098	DDayOmaha.lou
-21&10.538.DDayOmaha.lou.10	0	00833	79450	5912	DDayOmaha.lou
-21&10.538.DDayOmaha.lou.11	0	00839	80530	5983	DDayOmaha.lou
-21&10.538.DDayOmaha.lou.12	0	00845	81610	6054	DDayOmaha.lou
-21&10.538.DDayOmaha.lou.13	0	00853	82996	6149	DDayOmaha.lou
-21&10.538.DDayOmaha.lou.14	0	00861	84374	6245	DDayOmaha.lou
+21&10.538.DDayOmaha.lou.10	0	00835	79736	5936	DDayOmaha.lou
+21&10.538.DDayOmaha.lou.11	0	00841	80824	6007	DDayOmaha.lou
+21&10.538.DDayOmaha.lou.12	0	00847	81904	6078	DDayOmaha.lou
+21&10.538.DDayOmaha.lou.13	0	00853	82984	6149	DDayOmaha.lou
 21&10.538.DDayOmaha.lou.2	0	00520	46766	3534	DDayOmaha.lou
 21&10.538.DDayOmaha.lou.3	0	00620	54187	4113	DDayOmaha.lou
 21&10.538.DDayOmaha.lou.4	0	00654	57239	4339	DDayOmaha.lou
 21&10.538.DDayOmaha.lou.5	0	00680	59794	4524	DDayOmaha.lou
-21&10.538.DDayOmaha.lou.6	0	00807	74845	5603	DDayOmaha.lou
-21&10.538.DDayOmaha.lou.7	0	00813	75921	5674	DDayOmaha.lou
-21&10.538.DDayOmaha.lou.8	0	00819	76989	5745	DDayOmaha.lou
-21&10.538.DDayOmaha.lou.9	0	00827	78363	5841	DDayOmaha.lou
+21&10.538.DDayOmaha.lou.6	0	00807	74835	5603	DDayOmaha.lou
+21&10.538.DDayOmaha.lou.7	0	00815	76217	5699	DDayOmaha.lou
+21&10.538.DDayOmaha.lou.8	0	00821	77293	5770	DDayOmaha.lou
+21&10.538.DDayOmaha.lou.9	0	00827	78361	5841	DDayOmaha.lou
 22&4.1794.DDayOmaha.lou.1	0	00027	4551	327	DDayOmaha.lou
 22&4.1794.DDayOmaha.lou.10	0	00063	6915	523	DDayOmaha.lou
 22&4.1794.DDayOmaha.lou.100	0	00479	43596	3293	DDayOmaha.lou
@@ -830,47 +825,44 @@
 22&4.1794.DDayOmaha.lou.98	0	00472	43053	3249	DDayOmaha.lou
 22&4.1794.DDayOmaha.lou.99	0	00476	43302	3269	DDayOmaha.lou
 23&10.196.DDayOmaha.lou.1	0	00439	39877	3010	DDayOmaha.lou
-23&10.196.DDayOmaha.lou.10	0	00828	78453	5848	DDayOmaha.lou
-23&10.196.DDayOmaha.lou.11	0	00834	79541	5919	DDayOmaha.lou
-23&10.196.DDayOmaha.lou.12	0	00840	80621	5990	DDayOmaha.lou
-23&10.196.DDayOmaha.lou.13	0	00846	81701	6061	DDayOmaha.lou
-23&10.196.DDayOmaha.lou.14	0	00854	83087	6156	DDayOmaha.lou
+23&10.196.DDayOmaha.lou.10	0	00828	78451	5848	DDayOmaha.lou
+23&10.196.DDayOmaha.lou.11	0	00836	79827	5943	DDayOmaha.lou
+23&10.196.DDayOmaha.lou.12	0	00842	80915	6014	DDayOmaha.lou
+23&10.196.DDayOmaha.lou.13	0	00848	81995	6085	DDayOmaha.lou
 23&10.196.DDayOmaha.lou.2	0	00515	45766	3468	DDayOmaha.lou
 23&10.196.DDayOmaha.lou.3	0	00615	53175	4047	DDayOmaha.lou
 23&10.196.DDayOmaha.lou.4	0	00649	56225	4275	DDayOmaha.lou
 23&10.196.DDayOmaha.lou.5	0	00675	58778	4460	DDayOmaha.lou
 23&10.196.DDayOmaha.lou.6	0	00802	73758	5532	DDayOmaha.lou
-23&10.196.DDayOmaha.lou.7	0	00808	74935	5610	DDayOmaha.lou
-23&10.196.DDayOmaha.lou.8	0	00814	76011	5681	DDayOmaha.lou
-23&10.196.DDayOmaha.lou.9	0	00820	77079	5752	DDayOmaha.lou
+23&10.196.DDayOmaha.lou.7	0	00808	74925	5610	DDayOmaha.lou
+23&10.196.DDayOmaha.lou.8	0	00816	76307	5706	DDayOmaha.lou
+23&10.196.DDayOmaha.lou.9	0	00822	77383	5777	DDayOmaha.lou
 23&10.538.DDayOmaha.lou.1	0	00444	39877	3010	DDayOmaha.lou
-23&10.538.DDayOmaha.lou.10	0	00831	78453	5848	DDayOmaha.lou
-23&10.538.DDayOmaha.lou.11	0	00837	79541	5919	DDayOmaha.lou
-23&10.538.DDayOmaha.lou.12	0	00843	80621	5990	DDayOmaha.lou
-23&10.538.DDayOmaha.lou.13	0	00851	81701	6061	DDayOmaha.lou
-23&10.538.DDayOmaha.lou.14	0	00859	83087	6156	DDayOmaha.lou
+23&10.538.DDayOmaha.lou.10	0	00833	78451	5848	DDayOmaha.lou
+23&10.538.DDayOmaha.lou.11	0	00839	79827	5943	DDayOmaha.lou
+23&10.538.DDayOmaha.lou.12	0	00845	80915	6014	DDayOmaha.lou
+23&10.538.DDayOmaha.lou.13	0	00851	81995	6085	DDayOmaha.lou
 23&10.538.DDayOmaha.lou.2	0	00518	45766	3468	DDayOmaha.lou
 23&10.538.DDayOmaha.lou.3	0	00618	53175	4047	DDayOmaha.lou
 23&10.538.DDayOmaha.lou.4	0	00652	56225	4275	DDayOmaha.lou
 23&10.538.DDayOmaha.lou.5	0	00678	58778	4460	DDayOmaha.lou
 23&10.538.DDayOmaha.lou.6	0	00805	73758	5532	DDayOmaha.lou
-23&10.538.DDayOmaha.lou.7	0	00811	74935	5610	DDayOmaha.lou
-23&10.538.DDayOmaha.lou.8	0	00817	76011	5681	DDayOmaha.lou
-23&10.538.DDayOmaha.lou.9	0	00825	77079	5752	DDayOmaha.lou
+23&10.538.DDayOmaha.lou.7	0	00813	74925	5610	DDayOmaha.lou
+23&10.538.DDayOmaha.lou.8	0	00819	76307	5706	DDayOmaha.lou
+23&10.538.DDayOmaha.lou.9	0	00825	77383	5777	DDayOmaha.lou
 24&10.538.DDayOmaha.lou.1	0	00440	39958	3017	DDayOmaha.lou
-24&10.538.DDayOmaha.lou.10	0	00829	78535	5855	DDayOmaha.lou
-24&10.538.DDayOmaha.lou.11	0	00835	79623	5926	DDayOmaha.lou
-24&10.538.DDayOmaha.lou.12	0	00841	80703	5997	DDayOmaha.lou
-24&10.538.DDayOmaha.lou.13	0	00847	81783	6068	DDayOmaha.lou
-24&10.538.DDayOmaha.lou.14	0	00855	83169	6163	DDayOmaha.lou
+24&10.538.DDayOmaha.lou.10	0	00829	78533	5855	DDayOmaha.lou
+24&10.538.DDayOmaha.lou.11	0	00837	79909	5950	DDayOmaha.lou
+24&10.538.DDayOmaha.lou.12	0	00843	80997	6021	DDayOmaha.lou
+24&10.538.DDayOmaha.lou.13	0	00849	82077	6092	DDayOmaha.lou
 24&10.538.DDayOmaha.lou.2	0	00516	45847	3475	DDayOmaha.lou
 24&10.538.DDayOmaha.lou.3	0	00616	53256	4054	DDayOmaha.lou
 24&10.538.DDayOmaha.lou.4	0	00650	56306	4282	DDayOmaha.lou
 24&10.538.DDayOmaha.lou.5	0	00676	58859	4467	DDayOmaha.lou
 24&10.538.DDayOmaha.lou.6	0	00803	73839	5539	DDayOmaha.lou
-24&10.538.DDayOmaha.lou.7	0	00809	75016	5617	DDayOmaha.lou
-24&10.538.DDayOmaha.lou.8	0	00815	76092	5688	DDayOmaha.lou
-24&10.538.DDayOmaha.lou.9	0	00821	77160	5759	DDayOmaha.lou
+24&10.538.DDayOmaha.lou.7	0	00809	75006	5617	DDayOmaha.lou
+24&10.538.DDayOmaha.lou.8	0	00817	76388	5713	DDayOmaha.lou
+24&10.538.DDayOmaha.lou.9	0	00823	77464	5784	DDayOmaha.lou
 2&9.2933.DDayOmaha.lou.1	0	00002	224	17	DDayOmaha.lou
 3&9.2988.DDayOmaha.lou.1	0	00003	378	27	DDayOmaha.lou
 4&9.3043.DDayOmaha.lou.1	0	00004	522	37	DDayOmaha.lou
diff --git a/DDayAtOmahaBeach/us_barrage.lou b/DDayAtOmahaBeach/us_barrage.lou
index 6649daf..984bef7 100644
--- a/DDayAtOmahaBeach/us_barrage.lou
+++ b/DDayAtOmahaBeach/us_barrage.lou
@@ -2,19 +2,16 @@
     rule { yes }
     indent { ctr }
     indentvertical { ctr }
+    aformat { @Cell @B A | @Cell width { 5c } @B B | @Cell width { 5c } @B C | @Cell width { 5c } @B D }
 {
-@Row
+@Rowa
     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 }
+@Rowa
     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 }
+@Rowa
+    A { @B color } B { @Disruptedif @I {if no Depth} } C { @Disrupted } D { @Disrupted }
+@Rowa
+    A { @B color + @B sym} B { @Disrupted } C { @Disrupted } D { @Disrupted - @Depth }
 #@Rowb A { @Sym emptyset } B {} C {} D {}
 }
diff --git a/DDayAtOmahaBeach/us_move.lou b/DDayAtOmahaBeach/us_move.lou
index da39dfe..7bc4fd3 100644
--- a/DDayAtOmahaBeach/us_move.lou
+++ b/DDayAtOmahaBeach/us_move.lou
@@ -7,9 +7,10 @@
     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} }
-@Rowb A { Bluff } B { @Blue @Colour climb } C { @PGreen {no climb} } D { @POrange {unless via road}}
-@Rowb A { Scaleable Cliff } B { @Blue @Colour {climb cliff} } C { @PRed No } D { @PRed No }
+@Rowb A { Beach, Buildings, Draw @LLP High Ground, Pavillon } B { @Sym emptyset } C { @Sym emptyset } D { @Sym emptyset }
+@Rowb A { Bocage, Orchard, Woods @LLP Hedge, Seawall, Slope } B { @Sym emptyset } C { @Sym emptyset } D { @PGreen {only via roads} }
 @Rowb A { Mined Roads, Shingle @LLP Anti-Tank Ditch @Char slash Wall } B { @Sym emptyset } C { @Sym emptyset } D { @PRed No }
+@Rowb A { Bluff } B { @Blue @Colour climb } C { @Sym emptyset } D { @PGreen {only via roads}}
+@Rowb A { Scaleable Cliff } B { @Blue @Colour {climb cliff} } C { @PRed No } D { @PRed No }
 @Rowb A { Rough, Sheer Cliff } B { @PRed No } C { @PRed No } D { @PRed No }
 }
diff --git a/DDayAtOmahaBeach/us_units.lou b/DDayAtOmahaBeach/us_units.lou
index d6e2aed..bf7b3a5 100644
--- a/DDayAtOmahaBeach/us_units.lou
+++ b/DDayAtOmahaBeach/us_units.lou
@@ -8,7 +8,8 @@
 @Row
     indent { ctr }
     paint { lightgrey }
-    format { @StartVSpan @Cell @B A | @StartHSpan @Cell @B B | @HSpan | @StartHSpan @Cell @B C | @HSpan }
+    #format { @StartVSpan @Cell paint { rgb { .23 .47 .18 } @B A | @StartHSpan @Cell paint { rgb { .32 .47 .18 } } @B B | @HSpan | @StartHSpan @Cell paint { rgb { .13 .57 .25 } } @B C | @HSpan }
+    format { @StartVSpan @Cell @B A | @StartHSpan @Cell paint { rgb { .23 .47 .18 } } @B B | @HSpan | @StartHSpan @Cell paint { rgb { .28 .59 .23 } } @B C | @HSpan }
     A { Turn } B { East Sector } C { West Sector }
 @Row
     indent { ctr }
@@ -46,7 +47,7 @@
     B { 3 }
     C { G{@Sym slash}2{@Sym slash}16 @I - K{@Sym slash}3{@Sym slash}16 }
     D { 3 }
-    E { B{@Sym slash}1{@Sym slash}116 }
+    E { B{@Sym slash}1{@Sym slash}116 - H{@Sym slash}2{@Sym slash}116 }
 @Rowa
     paint { rgb { .95 .95 .95} }
     ruleabovewidth { 1p }
@@ -54,7 +55,7 @@
     B { 3 }
     C { H{@Sym slash}2{@Sym slash}16 @I - M{@Sym slash}3{@Sym slash}16 }
     D { 3 }
-    E { C{@Sym slash}1{@Sym slash}116 @I - D{@Sym slash}1{@Sym slash}116 @I - H{@Sym slash}2{@Sym slash}116
+    E { C{@Sym slash}1{@Sym slash}116 @I - D{@Sym slash}1{@Sym slash}116
     @LLP I{@Sym slash}3{@Sym slash}116 @I - K{@Sym slash}3{@Sym slash}116 @I - L{@Sym slash}3{@Sym slash}116
     }
 @Row
diff --git a/DDayAtOmahaBeach/us_weapons.lou b/DDayAtOmahaBeach/us_weapons.lou
index 350c51d..86b86c4 100644
--- a/DDayAtOmahaBeach/us_weapons.lou
+++ b/DDayAtOmahaBeach/us_weapons.lou
@@ -4,8 +4,8 @@
     indentvertical { ctr }
     apaint { lightgrey }
     aformat { @StartHSpan @Cell @B A | @HSpan | @Cell @B C  | @Cell @B D }
-    bformat { @Cell A | @Cell B | @Cell @B C | @StartVSpan @Cell D }
-    cformat { @Cell A | @Cell B | @Cell indent { left } @B C | @VSpan }
+    bformat { @Cell A | @Cell indent { left } B | @Cell @B C | @StartVSpan @Cell D }
+    cformat { @Cell A | @Cell indent { left } B | @Cell indent { left } @B C | @VSpan }
 {
 @Rowa A { Unit Type } C { Weapons } D { Definitions }
 @Rowb A { @IncludeGraphic "imgs/infantry.eps" @IncludeGraphic "imgs/ranger.eps" } B { Infantry } C { BG - BR - BZ - DE - MO - RD } D { lines @Break {