EAA : normalize @Colour

1 files changed, 20 insertions, 20 deletions

diff --git a/EnemyActionArdennes/EAA-cards.lou b/EnemyActionArdennes/EAA-cards.lou
index 96ba6b2..9f4d184 100644
--- a/EnemyActionArdennes/EAA-cards.lou
+++ b/EnemyActionArdennes/EAA-cards.lou
@@ -49,40 +49,40 @@ def @CHeader
      @Rowa A {@HTags} B {@HTitle} C {@HVersion} D {@HTag}
    }
 }
-def @CTag left c right x { white @Colour @CurveBox margin {2p} paint {c} x }
+def @CTag left c right x { white @Color @CurveBox margin {2p} paint {c} x }
 # 65mm x 89mm
-def @HCard right x { 90d @Rotate black @Colour @CurveBox margin {.1c} 8.7c @Wide 6.3c @High black @Colour { x } }
-def @VCard right x { black @Colour @CurveBox margin {.1c} 6.3c @Wide 8.7c @High black @Colour { x } }
+def @HCard right x { 90d @Rotate black @Color @CurveBox margin {.1c} 8.7c @Wide 6.3c @High black @Color { x } }
+def @VCard right x { black @Color @CurveBox margin {.1c} 6.3c @Wide 8.7c @High black @Color { x } }
 
 def @Red  {rgb .8 .1 0}
 def @GCol {rgb .49 .48 .51}
 def @ACol {rgb .51 .56 .28}
 def @VCol {rgb .3 .07 .81}
 
-def @VS { @VCol @Colour @Box margin {1p} paint {@VCol} white @Color 2P }
-def @GS { @GCol @Colour @Box margin {1p} paint {@GCol} white @Color GS }
-def @AS { @ACol @Colour @Box margin {1p} paint {@ACol} white @Color AS }
-#def @Allied { @ACol @Colour @B Allied }
-#def @German { @GCol @Colour @B German }
-def @AlliedAS { 7p @Font @ACol @Colour @Box margin {.5p} paint {@ACol} white @Color Allied}
-def @AlliedGS { 7p @Font @GCol @Colour @Box margin {.5p} paint {@GCol} white @Color Allied}
-def @GermanGS { 7p @Font @GCol @Colour @Box margin {.5p} paint {@GCol} white @Color German}
+def @VS { @Box margin {1p} paint {@VCol} white @Color 2P }
+def @GS { @Box margin {1p} paint {@GCol} white @Color GS }
+def @AS { @Box margin {1p} paint {@ACol} white @Color AS }
+#def @Allied { @ACol @Color @B Allied }
+#def @German { @GCol @Color @B German }
+def @AlliedAS { 7p @Font @Box margin {.5p} paint {@ACol} white @Color Allied}
+def @AlliedGS { 7p @Font @Box margin {.5p} paint {@GCol} white @Color Allied}
+def @GermanGS { 7p @Font @Box margin {.5p} paint {@GCol} white @Color German}
 def @Allied { Allied }
 def @German { German }
-def @Day right x { white @Colour @Box margin {1p} paint {@Red} white @Colour x }
-def @DayOnly { @Red @Colour @CurveBox margin {1p} black @Colour day }
-def @A { white @Colour @Box margin {1p} paint {@ACol} A }
-def @G { white @Colour @Box margin {1p} paint {@GCol} G }
-#def @Atk { white @Colour @Box margin {1p} paint {rgb .75 .22 .17} A }
-#def @Def { white @Colour @Box margin {1p} paint {rgb .15 .68 .37} D }
-def @Atk { {rgb .82 .32 .1} @Colour @CurveBox margin {1p} black @Colour A }
-def @Def { {rgb .16 .65 .35} @Colour @CurveBox margin {1p} black @Colour D }
+def @Day right x { @Box margin {1p} paint {@Red} white @Color x }
+def @DayOnly { @Red @Color @CurveBox margin {1p} black @Color day }
+def @A { @Box margin {1p} paint {@ACol} white @Color A }
+def @G { @Box margin {1p} paint {@GCol} white @Color G }
+#def @Atk { white @Color @Box margin {1p} paint {rgb .75 .22 .17} A }
+#def @Def { white @Color @Box margin {1p} paint {rgb .15 .68 .37} D }
+def @Atk { {rgb .82 .32 .1} @Color @CurveBox margin {1p} black @Color A }
+def @Def { {rgb .16 .65 .35} @Color @CurveBox margin {1p} black @Color D }
 def @Bracked { @B{[}{unit}@B{]} }
 def @City { @I City{@Char slash}@I Town}
 def @Asc {@Ding a76 @Sym numbersign}
 def @Desc {@Ding a77 @Sym numbersign}
 
-#def @Line { /.3c |.35c {rgb .3 .7 .9} @Colour @OneRow { 0 0 moveto xsize 0 lineto 0.4 pt setlinewidth stroke } @Graphic }
+#def @Line { /.3c |.35c {rgb .3 .7 .9} @Color @OneRow { 0 0 moveto xsize 0 lineto 0.4 pt setlinewidth stroke } @Graphic }
 #def @LineA { /.3c @OneRow { 0 0 moveto xsize 0 lineto 1 pt setlinewidth stroke } @Graphic }
 
 def @Roadblocks { @VCard {