cleaned up old CVS left overs

[xboard.git] / bitmaps / bitmaps.h

diff --git a/bitmaps/bitmaps.h b/bitmaps/bitmaps.h
index 507ffa5..73f215b 100644 (file)
--- a/bitmaps/bitmaps.h
+++ b/bitmaps/bitmaps.h
@@ -1,9 +1,10 @@
 /*\r
  * bitmaps.h - Include bitmap files for pieces and icons\r
- * $Id: bitmaps.h,v 2.1 2003/10/27 19:21:01 mann Exp $\r
  *\r
- * Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts.\r
- * Enhancements Copyright 1992-95 Free Software Foundation, Inc.\r
+ * Copyright 1991 by Digital Equipment Corporation, Maynard,\r
+ * Massachusetts.  Enhancements Copyright\r
+ * 1992-2001,2002,2003,2004,2005,2006,2007,2008,2009 Free Software\r
+ * Foundation, Inc.\r
  *\r
  * The following terms apply to Digital Equipment Corporation's copyright\r
  * interest in XBoard:\r
@@ -27,26 +28,25 @@
  * SOFTWARE.\r
  * ------------------------------------------------------------------------\r
  *\r
- * The following terms apply to the enhanced version of XBoard distributed\r
- * by the Free Software Foundation:\r
+ * The following terms apply to the enhanced version of XBoard\r
+ * distributed by the Free Software Foundation:\r
  * ------------------------------------------------------------------------\r
- * This program is free software; you can redistribute it and/or modify\r
+ *\r
+ * GNU XBoard is free software: you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation; either version 2 of the License, or\r
- * (at your option) any later version.\r
+ * the Free Software Foundation, either version 3 of the License, or (at\r
+ * your option) any later version.\r
  *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
+ * GNU XBoard is distributed in the hope that it will be useful, but\r
+ * WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\r
+ * General Public License for more details.\r
  *\r
  * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\r
- * ------------------------------------------------------------------------\r
+ * along with this program. If not, see http://www.gnu.org/licenses/.  *\r
  *\r
- * See the file ChangeLog for a revision history.\r
- */\r
+ *------------------------------------------------------------------------\r
+ ** See the file ChangeLog for a revision history.  */\r
 \r
 // [HGM] Note: the bitmaps for Shogi promoted pieces are #included, but not referred to in the list bitmapBits.\r
 //       The front-end would have to substitutes them for some listed pieces, in variant shogi.\r
@@ -152,8 +152,10 @@
 #include "m72s.bm"\r
 #include "o72s.bm"\r
 #include "h72s.bm"\r
-#include "dk72s.bm"\r
+#include "i72s.bm"\r
+#include "j72s.bm"\r
 #include "g72s.bm"\r
+#include "d72s.bm"\r
 #include "v72s.bm"\r
 #include "l72s.bm"\r
 #include "s72s.bm"\r
@@ -163,9 +165,6 @@
 #include "wl72s.bm"\r
 #include "wn72s.bm"\r
 #include "ws72s.bm"\r
-#include "as72s.bm"\r
-#include "cv72s.bm"\r
-#include "d72s.bm"\r
 \r
 #include "p72o.bm"\r
 #include "n72o.bm"\r
@@ -180,8 +179,10 @@
 #include "m72o.bm"\r
 #include "o72o.bm"\r
 #include "h72o.bm"\r
-#include "dk72o.bm"\r
+#include "i72o.bm"\r
+#include "j72o.bm"\r
 #include "g72o.bm"\r
+#include "d72o.bm"\r
 #include "v72o.bm"\r
 #include "l72o.bm"\r
 #include "s72o.bm"\r
@@ -191,9 +192,6 @@
 #include "wl72o.bm"\r
 #include "wn72o.bm"\r
 #include "ws72o.bm"\r
-#include "as72o.bm"\r
-#include "cv72o.bm"\r
-#include "d72o.bm"\r
 \r
 #include "p64s.bm"\r
 #include "n64s.bm"\r
@@ -202,7 +200,7 @@
 #include "q64s.bm"\r
 #include "a64s.bm"\r
 #include "c64s.bm"\r
-#include "cv64s.bm"\r
+#include "d64s.bm"\r
 #include "l64s.bm"\r
 #include "k64s.bm"\r
 \r
@@ -213,7 +211,7 @@
 #include "q64o.bm"\r
 #include "a64o.bm"\r
 #include "c64o.bm"\r
-#include "cv64o.bm"\r
+#include "d64o.bm"\r
 #include "l64o.bm"\r
 #include "k64o.bm"\r
 \r
@@ -224,7 +222,7 @@
 #include "q58s.bm"\r
 #include "a58s.bm"\r
 #include "c58s.bm"\r
-#include "cv58s.bm"\r
+#include "d58s.bm"\r
 #include "l58s.bm"\r
 #include "k58s.bm"\r
 \r
@@ -235,7 +233,7 @@
 #include "q58o.bm"\r
 #include "a58o.bm"\r
 #include "c58o.bm"\r
-#include "cv58o.bm"\r
+#include "d58o.bm"\r
 #include "l58o.bm"\r
 #include "k58o.bm"\r
 \r
@@ -246,7 +244,7 @@
 #include "q54s.bm"\r
 #include "a54s.bm"\r
 #include "c54s.bm"\r
-#include "cv54s.bm"\r
+#include "d54s.bm"\r
 #include "l54s.bm"\r
 #include "k54s.bm"\r
 \r
@@ -257,7 +255,7 @@
 #include "q54o.bm"\r
 #include "a54o.bm"\r
 #include "c54o.bm"\r
-#include "cv54o.bm"\r
+#include "d54o.bm"\r
 #include "l54o.bm"\r
 #include "k54o.bm"\r
 \r
@@ -274,8 +272,10 @@
 #include "m49s.bm"\r
 #include "o49s.bm"\r
 #include "h49s.bm"\r
-#include "dk49s.bm"\r
+#include "i49s.bm"\r
+#include "j49s.bm"\r
 #include "g49s.bm"\r
+#include "d49s.bm"\r
 #include "v49s.bm"\r
 #include "l49s.bm"\r
 #include "s49s.bm"\r
@@ -285,9 +285,6 @@
 #include "wl49s.bm"\r
 #include "wn49s.bm"\r
 #include "ws49s.bm"\r
-#include "as49s.bm"\r
-#include "cv49s.bm"\r
-#include "d49s.bm"\r
 \r
 #include "p49o.bm"\r
 #include "n49o.bm"\r
@@ -302,8 +299,10 @@
 #include "m49o.bm"\r
 #include "o49o.bm"\r
 #include "h49o.bm"\r
-#include "dk49o.bm"\r
+#include "i49o.bm"\r
+#include "j49o.bm"\r
 #include "g49o.bm"\r
+#include "d49o.bm"\r
 #include "v49o.bm"\r
 #include "l49o.bm"\r
 #include "s49o.bm"\r
@@ -313,9 +312,6 @@
 #include "wl49o.bm"\r
 #include "wn49o.bm"\r
 #include "ws49o.bm"\r
-#include "as49o.bm"\r
-#include "cv49o.bm"\r
-#include "d49o.bm"\r
 \r
 #include "p45s.bm"\r
 #include "n45s.bm"\r
@@ -324,7 +320,7 @@
 #include "q45s.bm"\r
 #include "a45s.bm"\r
 #include "c45s.bm"\r
-#include "cv45s.bm"\r
+#include "d45s.bm"\r
 #include "l45s.bm"\r
 #include "k45s.bm"\r
 \r
@@ -335,7 +331,7 @@
 #include "q45o.bm"\r
 #include "a45o.bm"\r
 #include "c45o.bm"\r
-#include "cv45o.bm"\r
+#include "d45o.bm"\r
 #include "l45o.bm"\r
 #include "k45o.bm"\r
 \r
@@ -346,7 +342,7 @@
 #include "q40s.bm"\r
 #include "a40s.bm"\r
 #include "c40s.bm"\r
-#include "cv40s.bm"\r
+#include "d40s.bm"\r
 #include "l40s.bm"\r
 #include "k40s.bm"\r
 \r
@@ -357,7 +353,7 @@
 #include "q40o.bm"\r
 #include "a40o.bm"\r
 #include "c40o.bm"\r
-#include "cv40o.bm"\r
+#include "d40o.bm"\r
 #include "l40o.bm"\r
 #include "k40o.bm"\r
 \r
@@ -368,7 +364,7 @@
 #include "q37s.bm"\r
 #include "a37s.bm"\r
 #include "c37s.bm"\r
-#include "cv37s.bm"\r
+#include "d37s.bm"\r
 #include "l37s.bm"\r
 #include "k37s.bm"\r
 \r
@@ -379,7 +375,7 @@
 #include "q37o.bm"\r
 #include "a37o.bm"\r
 #include "c37o.bm"\r
-#include "cv37o.bm"\r
+#include "d37o.bm"\r
 #include "l37o.bm"\r
 #include "k37o.bm"\r
 \r
@@ -396,12 +392,12 @@
 #include "m33s.bm"\r
 #include "o33s.bm"\r
 #include "h33s.bm"\r
-#include "dk33s.bm"\r
+#include "i33s.bm"\r
+#include "j33s.bm"\r
 #include "g33s.bm"\r
-#include "cv33s.bm"\r
+#include "d33s.bm"\r
 #include "l33s.bm"\r
 #include "k33s.bm"\r
-#include "as33s.bm"\r
 \r
 #include "p33o.bm"\r
 #include "n33o.bm"\r
@@ -416,12 +412,12 @@
 #include "m33o.bm"\r
 #include "o33o.bm"\r
 #include "h33o.bm"\r
-#include "dk33o.bm"\r
+#include "i33o.bm"\r
+#include "j33o.bm"\r
 #include "g33o.bm"\r
-#include "cv33o.bm"\r
+#include "d33o.bm"\r
 #include "l33o.bm"\r
 #include "k33o.bm"\r
-#include "as33o.bm"\r
 \r
 #include "p29s.bm"\r
 #include "n29s.bm"\r
@@ -467,64 +463,64 @@
 \r
 typedef struct {\r
     int squareSize;\r
-    unsigned char *bits[2][(int)BlackPawn];\r
+    unsigned char *bits[2][(int)BlackPawn+4];\r
 } BuiltInBits;\r
 \r
 BuiltInBits builtInBits[] = {\\r
 { 129,\\r
-  { { p129s_bits, n129s_bits, b129s_bits, r129s_bits, q129s_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k129s_bits },\\r
-    { p129o_bits, n129o_bits, b129o_bits, r129o_bits, q129o_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k129o_bits } } },\\r
+  { { p129s_bits, n129s_bits, b129s_bits, r129s_bits, q129s_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k129s_bits, NULL, NULL, NULL, NULL },\\r
+    { p129o_bits, n129o_bits, b129o_bits, r129o_bits, q129o_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k129o_bits, NULL, NULL, NULL, NULL } } },\\r
 { 116,\\r
-  { { p116s_bits, n116s_bits, b116s_bits, r116s_bits, q116s_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k116s_bits },\\r
-    { p116o_bits, n116o_bits, b116o_bits, r116o_bits, q116o_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k116o_bits } } },\\r
+  { { p116s_bits, n116s_bits, b116s_bits, r116s_bits, q116s_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k116s_bits, NULL, NULL, NULL, NULL },\\r
+    { p116o_bits, n116o_bits, b116o_bits, r116o_bits, q116o_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k116o_bits, NULL, NULL, NULL, NULL } } },\\r
 { 108,\\r
-  { { p108s_bits, n108s_bits, b108s_bits, r108s_bits, q108s_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k108s_bits },\\r
-    { p108o_bits, n108o_bits, b108o_bits, r108o_bits, q108o_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k108o_bits } } },\\r
+  { { p108s_bits, n108s_bits, b108s_bits, r108s_bits, q108s_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k108s_bits, NULL, NULL, NULL, NULL },\\r
+    { p108o_bits, n108o_bits, b108o_bits, r108o_bits, q108o_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k108o_bits, NULL, NULL, NULL, NULL } } },\\r
 { 95,\\r
-  { { p95s_bits, n95s_bits, b95s_bits, r95s_bits, q95s_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k95s_bits },\\r
-    { p95o_bits, n95o_bits, b95o_bits, r95o_bits, q95o_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k95o_bits } } },\\r
+  { { p95s_bits, n95s_bits, b95s_bits, r95s_bits, q95s_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k95s_bits, NULL, NULL, NULL, NULL },\\r
+    { p95o_bits, n95o_bits, b95o_bits, r95o_bits, q95o_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k95o_bits, NULL, NULL, NULL, NULL } } },\\r
 { 87,\\r
-  { { p87s_bits, n87s_bits, b87s_bits, r87s_bits, q87s_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k87s_bits },\\r
-    { p87o_bits, n87o_bits, b87o_bits, r87o_bits, q87o_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k87o_bits } } },\\r
+  { { p87s_bits, n87s_bits, b87s_bits, r87s_bits, q87s_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k87s_bits, NULL, NULL, NULL, NULL },\\r
+    { p87o_bits, n87o_bits, b87o_bits, r87o_bits, q87o_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k87o_bits, NULL, NULL, NULL, NULL } } },\\r
 { 80,\\r
-  { { p80s_bits, n80s_bits, b80s_bits, r80s_bits, q80s_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k80s_bits },\\r
-    { p80o_bits, n80o_bits, b80o_bits, r80o_bits, q80o_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k80o_bits } } },\\r
+  { { p80s_bits, n80s_bits, b80s_bits, r80s_bits, q80s_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k80s_bits, NULL, NULL, NULL, NULL },\\r
+    { p80o_bits, n80o_bits, b80o_bits, r80o_bits, q80o_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k80o_bits }, NULL, NULL, NULL, NULL } },\\r
 { 72,\\r
-  { { p72s_bits, n72s_bits, b72s_bits, r72s_bits, q72s_bits, f72s_bits, e72s_bits, as72s_bits, c72s_bits, w72s_bits, m72s_bits, o72s_bits, h72s_bits, a72s_bits, dk72s_bits, g72s_bits, cv72s_bits, v72s_bits, l72s_bits, s72s_bits, u72s_bits, k72s_bits },\\r
-    { p72o_bits, n72o_bits, b72o_bits, r72o_bits, q72o_bits, f72o_bits, e72o_bits, as72o_bits, c72o_bits, w72o_bits, m72o_bits, o72o_bits, h72o_bits, a72o_bits, dk72o_bits, g72o_bits, cv72o_bits, v72o_bits, l72o_bits, s72o_bits, u72o_bits, k72o_bits } } },\\r
+  { { p72s_bits, n72s_bits, b72s_bits, r72s_bits, q72s_bits, f72s_bits, e72s_bits, a72s_bits, c72s_bits, w72s_bits, m72s_bits, o72s_bits, h72s_bits, i72s_bits, j72s_bits, g72s_bits, d72s_bits, v72s_bits, l72s_bits, s72s_bits, u72s_bits, k72s_bits, wp_72s_bits, wn_72s_bits, ws_72s_bits, wl_72s_bits },\\r
+    { p72o_bits, n72o_bits, b72o_bits, r72o_bits, q72o_bits, f72o_bits, e72o_bits, a72o_bits, c72o_bits, w72o_bits, m72o_bits, o72o_bits, h72o_bits, i72o_bits, j72o_bits, g72o_bits, d72o_bits, v72o_bits, l72o_bits, s72o_bits, u72o_bits, k72o_bits, wp_72o_bits, wn_72o_bits, ws_72o_bits, wl_72o_bits } } },\\r
 { 64,\\r
-  { { p64s_bits, n64s_bits, b64s_bits, r64s_bits, q64s_bits, l64s_bits, l64s_bits, a64s_bits, c64s_bits, l64s_bits, l64s_bits, l64s_bits, l64s_bits, l64s_bits, l64s_bits, l64s_bits, cv64s_bits, l64s_bits, l64s_bits, l64s_bits, l64s_bits, k64s_bits },\\r
-    { p64o_bits, n64o_bits, b64o_bits, r64o_bits, q64o_bits, l64o_bits, l64o_bits, a64o_bits, c64o_bits, l64o_bits, l64o_bits, l64o_bits, l64o_bits, l64o_bits, l64o_bits, l64o_bits, cv64o_bits, l64o_bits, l64o_bits, l64o_bits, l64o_bits, k64o_bits } } },\\r
+  { { p64s_bits, n64s_bits, b64s_bits, r64s_bits, q64s_bits, l64s_bits, l64s_bits, a64s_bits, c64s_bits, l64s_bits, l64s_bits, l64s_bits, l64s_bits, l64s_bits, l64s_bits, l64s_bits, d64s_bits, l64s_bits, l64s_bits, l64s_bits, l64s_bits, k64s_bits, l64s_bits, l64s_bits, l64s_bits, l64s_bits },\\r
+    { p64o_bits, n64o_bits, b64o_bits, r64o_bits, q64o_bits, l64o_bits, l64o_bits, a64o_bits, c64o_bits, l64o_bits, l64o_bits, l64o_bits, l64o_bits, l64o_bits, l64o_bits, l64o_bits, d64o_bits, l64o_bits, l64o_bits, l64o_bits, l64o_bits, k64o_bits, l64o_bits, l64o_bits, l64o_bits, l64o_bits } } },\\r
 { 58,\\r
-  { { p58s_bits, n58s_bits, b58s_bits, r58s_bits, q58s_bits, l58s_bits, l58s_bits, a58s_bits, c58s_bits, l58s_bits, l58s_bits, l58s_bits, l58s_bits, l58s_bits, l58s_bits, l58s_bits, cv58s_bits, l58s_bits, l58s_bits, l58s_bits, l58s_bits, k58s_bits },\\r
-    { p58o_bits, n58o_bits, b58o_bits, r58o_bits, q58o_bits, l58o_bits, l58o_bits, a58o_bits, c58o_bits, l58o_bits, l58o_bits, l58o_bits, l58o_bits, l58o_bits, l58o_bits, l58o_bits, cv58o_bits, l58o_bits, l58o_bits, l58o_bits, l58o_bits, k58o_bits } } },\\r
+  { { p58s_bits, n58s_bits, b58s_bits, r58s_bits, q58s_bits, l58s_bits, l58s_bits, a58s_bits, c58s_bits, l58s_bits, l58s_bits, l58s_bits, l58s_bits, l58s_bits, l58s_bits, l58s_bits, d58s_bits, l58s_bits, l58s_bits, l58s_bits, l58s_bits, k58s_bits, l58s_bits, l58s_bits, l58s_bits, l58s_bits },\\r
+    { p58o_bits, n58o_bits, b58o_bits, r58o_bits, q58o_bits, l58o_bits, l58o_bits, a58o_bits, c58o_bits, l58o_bits, l58o_bits, l58o_bits, l58o_bits, l58o_bits, l58o_bits, l58o_bits, d58o_bits, l58o_bits, l58o_bits, l58o_bits, l58o_bits, k58o_bits, l58o_bits, l58o_bits, l58o_bits, l58o_bits } } },\\r
 { 54,\\r
-  { { p54s_bits, n54s_bits, b54s_bits, r54s_bits, q54s_bits, l54s_bits, l54s_bits, a54s_bits, c54s_bits, l54s_bits, l54s_bits, l54s_bits, l54s_bits, l54s_bits, l54s_bits, l54s_bits, cv54s_bits, l54s_bits, l54s_bits, l54s_bits, l54s_bits, k54s_bits },\\r
-    { p54o_bits, n54o_bits, b54o_bits, r54o_bits, q54o_bits, l54o_bits, l54o_bits, a54o_bits, c54o_bits, l54o_bits, l54o_bits, l54o_bits, l54o_bits, l54o_bits, l54o_bits, l54o_bits, cv54o_bits, l54o_bits, l54o_bits, l54o_bits, l54o_bits, k54o_bits } } },\\r
+  { { p54s_bits, n54s_bits, b54s_bits, r54s_bits, q54s_bits, l54s_bits, l54s_bits, a54s_bits, c54s_bits, l54s_bits, l54s_bits, l54s_bits, l54s_bits, l54s_bits, l54s_bits, l54s_bits, d54s_bits, l54s_bits, l54s_bits, l54s_bits, l54s_bits, k54s_bits, l54s_bits, l54s_bits, l54s_bits, l54s_bits },\\r
+    { p54o_bits, n54o_bits, b54o_bits, r54o_bits, q54o_bits, l54o_bits, l54o_bits, a54o_bits, c54o_bits, l54o_bits, l54o_bits, l54o_bits, l54o_bits, l54o_bits, l54o_bits, l54o_bits, d54o_bits, l54o_bits, l54o_bits, l54o_bits, l54o_bits, k54o_bits, l54o_bits, l54o_bits, l54o_bits, l54o_bits } } },\\r
 { 49,\\r
-  { { p49s_bits, n49s_bits, b49s_bits, r49s_bits, q49s_bits, f49s_bits, e49s_bits, as49s_bits, c49s_bits, w49s_bits, m49s_bits, o49s_bits, h49s_bits, a49s_bits, dk49s_bits, g49s_bits, cv49s_bits, v49s_bits, l49s_bits, s49s_bits, u49s_bits, k49s_bits },\\r
-    { p49o_bits, n49o_bits, b49o_bits, r49o_bits, q49o_bits, f49o_bits, e49o_bits, as49o_bits, c49o_bits, w49o_bits, m49o_bits, o49o_bits, h49o_bits, a49s_bits, dk49o_bits, g49o_bits, cv49o_bits, v49o_bits, l49o_bits, s49o_bits, u49o_bits, k49o_bits } } },\\r
+  { { p49s_bits, n49s_bits, b49s_bits, r49s_bits, q49s_bits, f49s_bits, e49s_bits, a49s_bits, c49s_bits, w49s_bits, m49s_bits, o49s_bits, h49s_bits, i49s_bits, j49s_bits, g49s_bits, d49s_bits, v49s_bits, l49s_bits, s49s_bits, u49s_bits, k49s_bits, wp49s_bits, wn49s_bits, ws49s_bits, wl49s_bits },\\r
+    { p49o_bits, n49o_bits, b49o_bits, r49o_bits, q49o_bits, f49o_bits, e49o_bits, a49o_bits, c49o_bits, w49o_bits, m49o_bits, o49o_bits, h49o_bits, i49s_bits, j49o_bits, g49o_bits, d49o_bits, v49o_bits, l49o_bits, s49o_bits, u49o_bits, k49o_bits, wp49o_bits, wn49o_bits, ws49o_bits, wl49o_bits } } },\\r
 { 45,\\r
-  { { p45s_bits, n45s_bits, b45s_bits, r45s_bits, q45s_bits, l45s_bits, l45s_bits, a45s_bits, c45s_bits, l45s_bits, l45s_bits, l45s_bits, l45s_bits, l45s_bits, l45s_bits, l45s_bits, cv45s_bits, l45s_bits, l45s_bits, l45s_bits, l45s_bits, k45s_bits },\\r
-    { p45o_bits, n45o_bits, b45o_bits, r45o_bits, q45o_bits, l45o_bits, l45o_bits, a45o_bits, c45o_bits, l45o_bits, l45o_bits, l45o_bits, l45o_bits, l45o_bits, l45o_bits, l45o_bits, cv45o_bits, l45o_bits, l45o_bits, l45o_bits, l45o_bits, k45o_bits } } },\\r
+  { { p45s_bits, n45s_bits, b45s_bits, r45s_bits, q45s_bits, l45s_bits, l45s_bits, a45s_bits, c45s_bits, l45s_bits, l45s_bits, l45s_bits, l45s_bits, l45s_bits, l45s_bits, l45s_bits, d45s_bits, l45s_bits, l45s_bits, l45s_bits, l45s_bits, k45s_bits, l45s_bits, l45s_bits, l45s_bits, l45s_bits },\\r
+    { p45o_bits, n45o_bits, b45o_bits, r45o_bits, q45o_bits, l45o_bits, l45o_bits, a45o_bits, c45o_bits, l45o_bits, l45o_bits, l45o_bits, l45o_bits, l45o_bits, l45o_bits, l45o_bits, d45o_bits, l45o_bits, l45o_bits, l45o_bits, l45o_bits, k45o_bits, l45o_bits, l45o_bits, l45o_bits, l45o_bits } } },\\r
 { 40,\\r
-  { { p40s_bits, n40s_bits, b40s_bits, r40s_bits, q40s_bits, l40s_bits, l40s_bits, a40s_bits, c40s_bits, l40s_bits, l40s_bits, l40s_bits, l40s_bits, l40s_bits, l40s_bits, l40s_bits, cv40s_bits, l40s_bits, l40s_bits, l40s_bits, l40s_bits, k40s_bits },\\r
-    { p40o_bits, n40o_bits, b40o_bits, r40o_bits, q40o_bits, l40o_bits, l40o_bits, a40o_bits, c40o_bits, l40o_bits, l40o_bits, l40o_bits, l40o_bits, l40o_bits, l40o_bits, l40o_bits, cv40o_bits, l40o_bits, l40o_bits, l40o_bits, l40o_bits, k40o_bits } } },\\r
+  { { p40s_bits, n40s_bits, b40s_bits, r40s_bits, q40s_bits, l40s_bits, l40s_bits, a40s_bits, c40s_bits, l40s_bits, l40s_bits, l40s_bits, l40s_bits, l40s_bits, l40s_bits, l40s_bits, d40s_bits, l40s_bits, l40s_bits, l40s_bits, l40s_bits, k40s_bits, l40s_bits, l40s_bits, l40s_bits, l40s_bits },\\r
+    { p40o_bits, n40o_bits, b40o_bits, r40o_bits, q40o_bits, l40o_bits, l40o_bits, a40o_bits, c40o_bits, l40o_bits, l40o_bits, l40o_bits, l40o_bits, l40o_bits, l40o_bits, l40o_bits, d40o_bits, l40o_bits, l40o_bits, l40o_bits, l40o_bits, k40o_bits, l40o_bits, l40o_bits, l40o_bits, l40o_bits } } },\\r
 { 37,\\r
-  { { p37s_bits, n37s_bits, b37s_bits, r37s_bits, q37s_bits, l37s_bits, l37s_bits, a37s_bits, c37s_bits, l37s_bits, l37s_bits, l37s_bits, l37s_bits, l37s_bits, l37s_bits, l37s_bits, cv37s_bits, l37s_bits, l37s_bits, l37s_bits, l37s_bits, k37s_bits },\\r
-    { p37o_bits, n37o_bits, b37o_bits, r37o_bits, q37o_bits, l37o_bits, l37o_bits, a37o_bits, c37o_bits, l37o_bits, l37o_bits, l37o_bits, l37o_bits, l37o_bits, l37o_bits, l37o_bits, cv37o_bits, l37o_bits, l37o_bits, l37o_bits, l37o_bits, k37o_bits } } },\\r
+  { { p37s_bits, n37s_bits, b37s_bits, r37s_bits, q37s_bits, l37s_bits, l37s_bits, a37s_bits, c37s_bits, l37s_bits, l37s_bits, l37s_bits, l37s_bits, l37s_bits, l37s_bits, l37s_bits, d37s_bits, l37s_bits, l37s_bits, l37s_bits, l37s_bits, k37s_bits, l37s_bits, l37s_bits, l37s_bits, l37s_bits },\\r
+    { p37o_bits, n37o_bits, b37o_bits, r37o_bits, q37o_bits, l37o_bits, l37o_bits, a37o_bits, c37o_bits, l37o_bits, l37o_bits, l37o_bits, l37o_bits, l37o_bits, l37o_bits, l37o_bits, d37o_bits, l37o_bits, l37o_bits, l37o_bits, l37o_bits, k37o_bits, l37o_bits, l37o_bits, l37o_bits, l37o_bits } } },\\r
 { 33,\\r
-  { { p33s_bits, n33s_bits, b33s_bits, r33s_bits, q33s_bits, f33s_bits, e33s_bits, as33s_bits, c33s_bits, w33s_bits, m33s_bits, o33s_bits, h33s_bits, a33s_bits, dk33s_bits, g33s_bits, cv33s_bits, l33s_bits, cv33s_bits, l33s_bits, l33s_bits, k33s_bits },\\r
-    { p33o_bits, n33o_bits, b33o_bits, r33o_bits, q33o_bits, f33o_bits, e33o_bits, as33o_bits, c33o_bits, w33o_bits, m33o_bits, o33o_bits, h33o_bits, a33o_bits, dk33o_bits, g33o_bits, cv33o_bits, l33o_bits, cv33o_bits, l33o_bits, l33o_bits, k33o_bits } } },\\r
+  { { p33s_bits, n33s_bits, b33s_bits, r33s_bits, q33s_bits, f33s_bits, e33s_bits, a33s_bits, c33s_bits, w33s_bits, m33s_bits, o33s_bits, h33s_bits, a33s_bits, j33s_bits, g33s_bits, d33s_bits, l33s_bits, d33s_bits, l33s_bits, l33s_bits, k33s_bits, l33s_bits, l33s_bits, l33s_bits, l33s_bits },\\r
+    { p33o_bits, n33o_bits, b33o_bits, r33o_bits, q33o_bits, f33o_bits, e33o_bits, a33o_bits, c33o_bits, w33o_bits, m33o_bits, o33o_bits, h33o_bits, a33o_bits, j33o_bits, g33o_bits, d33o_bits, l33o_bits, d33o_bits, l33o_bits, l33o_bits, k33o_bits, l33o_bits, l33o_bits, l33o_bits, l33o_bits } } },\\r
 { 29,\\r
-  { { p29s_bits, n29s_bits, b29s_bits, r29s_bits, q29s_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k29s_bits },\\r
-    { p29o_bits, n29o_bits, b29o_bits, r29o_bits, q29o_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k29o_bits } } },\\r
+  { { p29s_bits, n29s_bits, b29s_bits, r29s_bits, q29s_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k29s_bits, NULL, NULL, NULL, NULL },\\r
+    { p29o_bits, n29o_bits, b29o_bits, r29o_bits, q29o_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k29o_bits, NULL, NULL, NULL, NULL } } },\\r
 { 25,\\r
-  { { p25s_bits, n25s_bits, b25s_bits, r25s_bits, q25s_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k25s_bits },\\r
-    { p25o_bits, n25o_bits, b25o_bits, r25o_bits, q25o_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k25o_bits } } },\\r
+  { { p25s_bits, n25s_bits, b25s_bits, r25s_bits, q25s_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k25s_bits, NULL, NULL, NULL, NULL },\\r
+    { p25o_bits, n25o_bits, b25o_bits, r25o_bits, q25o_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k25o_bits, NULL, NULL, NULL, NULL } } },\\r
 { 21,\\r
-  { { p21s_bits, n21s_bits, b21s_bits, r21s_bits, q21s_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k21s_bits },\\r
-    { p21o_bits, n21o_bits, b21o_bits, r21o_bits, q21o_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k21o_bits } } },\\r
+  { { p21s_bits, n21s_bits, b21s_bits, r21s_bits, q21s_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k21s_bits, NULL, NULL, NULL, NULL },\\r
+    { p21o_bits, n21o_bits, b21o_bits, r21o_bits, q21o_bits, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, k21o_bits, NULL, NULL, NULL, NULL } } },\\r
 { 0,\\r
   { { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL },\\r
     { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL } } }\\r