From 4e89071b32b873823d338bd750d942c0115b025c Mon Sep 17 00:00:00 2001
From: Jaka Kranjc <smgl@lynxlynx.info>
Date: Wed, 15 May 2024 23:28:59 +0200
Subject: [PATCH] bmp improvements

---
 file_formats/ie_formats/bmp_v5.htm | 51 ++++++++++++++----------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/file_formats/ie_formats/bmp_v5.htm b/file_formats/ie_formats/bmp_v5.htm
index fd5dfa99..9a7cd9c5 100644
--- a/file_formats/ie_formats/bmp_v5.htm
+++ b/file_formats/ie_formats/bmp_v5.htm
@@ -8,8 +8,8 @@
     <br />
 
     <div class="fileHeader">General Description</div>
-    <a href="https://docs.microsoft.com/en-us/windows/desktop/api/wingdi/ns-wingdi-bitmapv5header">Microsoft format documentation</a><br />
-    The Enhanced editions support also version 5 of the BMP format. It is <a href="../bmp.htm">largely the same as version 1</a> used by the original games, but supports 32-bit colors (still 8 bits per channel, but adds one for alpha).<br />
+    <a href="https://docs.microsoft.com/en-us/windows/desktop/api/wingdi/ns-wingdi-bitmapv5header">Microsoft format documentation</a><br /><br />
+    The Enhanced editions support also version 5 of the BMP format. It is <a href="bmp.htm">largely the same as version 1</a> used by the original games, but supports 32-bit colors (still 8 bits per channel, but adds one for alpha).<br />
     <br />
     <hr />
     <br />
@@ -38,7 +38,7 @@
           <td>0x06</td>
           <td colspan="2">2 reserved words</td>
           <td>4 bytes</td>
-          <td>unused (=0)</td>
+          <td>Unused (=0)</td>
         </tr>
         <tr>
           <td>0x0a</td>
@@ -95,14 +95,13 @@
           <td>0x26</td>
           <td colspan="2">XpixelsPerM</td>
           <td>4 bytes</td>
-          <td>horizontal resolution:
-            Pixels/meter</td>
+          <td>Horizontal resolution: Pixels/meter</td>
         </tr>
         <tr>
           <td>0x2a</td>
           <td colspan="2">YpixelsPerM</td>
           <td>4 bytes</td>
-          <td>vertical resolution: Pixels/meter</td>
+          <td>Vertical resolution: Pixels/meter</td>
         </tr>
         <tr>
           <td>0x2e</td>
@@ -120,12 +119,10 @@
 
         <tr>
           <td>0x36</td>
-          <td colspan="3">Color masks</td>
-          <td></td>
-          <td></td>
+          <td colspan="4">Color masks</td>
         </tr>
         <tr>
-          <td rowspan="5">&nbsp;</td>
+          <td rowspan="4">&nbsp;</td>
           <td rowspan="4">&nbsp;</td>
           <td>Red mask</td>
           <td>4 bytes</td>
@@ -149,103 +146,103 @@
 
         <tr>
           <td>0x46</td>
-          <td>CSType</td>
+          <td colspan="2">CSType</td>
           <td>4 bytes</td>
           <td>Color space type</td>
         </tr>
         <tr>
           <td>0x4a</td>
-          <td>RedX</td>
+          <td colspan="2">RedX</td>
           <td>4 bytes</td>
           <td>X coordinate of red endpoin</td>
         </tr>
         <tr>
           <td>0x4e</td>
-          <td>RedY</td>
+          <td colspan="2">RedY</td>
           <td>4 bytes</td>
           <td>Y coordinate of red endpoin</td>
         </tr>
         <tr>
           <td>0x52</td>
-          <td>RedZ</td>
+          <td colspan="2">RedZ</td>
           <td>4 bytes</td>
           <td>Z coordinate of red endpoin</td>
         </tr>
         <tr>
           <td>0x56</td>
-          <td>GreenX</td>
+          <td colspan="2">GreenX</td>
           <td>4 bytes</td>
           <td>X coordinate of green endpoint</td>
         </tr>
         <tr>
           <td>0x5a</td>
-          <td>GreenY</td>
+          <td colspan="2">GreenY</td>
           <td>4 bytes</td>
           <td>Y coordinate of green endpoint</td>
         </tr>
         <tr>
           <td>0x5e</td>
-          <td>GreenZ</td>
+          <td colspan="2">GreenZ</td>
           <td>4 bytes</td>
           <td>Z coordinate of green endpoint</td>
         </tr>
         <tr>
           <td>0x62</td>
-          <td>BlueX</td>
+          <td colspan="2">BlueX</td>
           <td>4 bytes</td>
           <td>X coordinate of blue endpoint</td>
         </tr>
         <tr>
           <td>0x66</td>
-          <td>BlueY</td>
+          <td colspan="2">BlueY</td>
           <td>4 bytes</td>
           <td>Y coordinate of blue endpoint</td>
         </tr>
         <tr>
           <td>0x6a</td>
-          <td>BlueZ</td>
+          <td colspan="2">BlueZ</td>
           <td>4 bytes</td>
           <td>Z coordinate of blue endpoint</td>
         </tr>
         <tr>
           <td>0x6e</td>
-          <td>GammaRed</td>
+          <td colspan="2">GammaRed</td>
           <td>4 bytes</td>
           <td>Gamma red coordinate scale value</td>
         </tr>
         <tr>
           <td>0x72</td>
-          <td>GammaGreen</td>
+          <td colspan="2">GammaGreen</td>
           <td>4 bytes</td>
           <td>Gamma green coordinate scale value</td>
         </tr>
         <tr>
           <td>0x76</td>
-          <td>GammaBlue</td>
+          <td colspan="2">GammaBlue</td>
           <td>4 bytes</td>
           <td>Gamma blue coordinate scale value</td>
         </tr>
         <tr>
           <td>0x7a</td>
-          <td>Intent</td>
+          <td colspan="2">Intent</td>
           <td>4 bytes</td>
           <td>Rendering intent for bitmap</td>
         </tr>
         <tr>
           <td>0x7e</td>
-          <td>ProfileData</td>
+          <td colspan="2">ProfileData</td>
           <td>4 bytes</td>
           <td>Offset to profile data</td>
         </tr>
         <tr>
           <td>0x82</td>
-          <td>ProfileSize</td>
+          <td colspan="2">ProfileSize</td>
           <td>4 bytes</td>
           <td>Size of embedded profile data</td>
         </tr>
         <tr>
           <td>0x86</td>
-          <td>Reserved3</td>
+          <td colspan="2">Reserved3</td>
           <td>4 bytes</td>
           <td></td>
         </tr>