From 82f383d6c445490f849e1cf9d309154eab60df7a Mon Sep 17 00:00:00 2001
From: Taka <taka@vm-linux-dev>
Date: Tue, 4 May 2021 08:30:02 +1000
Subject: [PATCH] Added some missing entries to the Chapter H placeholder zip.

---
 .../tools/make_chapter_h_placeholders.py      |  4 +--
 .../tests/fixtures/chapter-h-placeholders.txt | 33 +++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/vasl_templates/tools/make_chapter_h_placeholders.py b/vasl_templates/tools/make_chapter_h_placeholders.py
index 294d29f..b08d2b7 100755
--- a/vasl_templates/tools/make_chapter_h_placeholders.py
+++ b/vasl_templates/tools/make_chapter_h_placeholders.py
@@ -270,8 +270,8 @@ REDIRECTED_MA_NOTE_REGEX = re.compile(
 
 def _extract_note_number( val ):
     """Extract a vehicle/ordnance's note number."""
-    mo = re.search( r"^\d+", val )
-    return int( mo.group() )
+    mo = re.search( r"^\d+(\.\d)?", val )
+    return mo.group()
 
 def _extract_ma_note_ids( val ):
     """Extract a vehicle/ordnance's multi-applicable note ID's."""
diff --git a/vasl_templates/tools/tests/fixtures/chapter-h-placeholders.txt b/vasl_templates/tools/tests/fixtures/chapter-h-placeholders.txt
index 9f87877..d6a3a82 100644
--- a/vasl_templates/tools/tests/fixtures/chapter-h-placeholders.txt
+++ b/vasl_templates/tools/tests/fixtures/chapter-h-placeholders.txt
@@ -115,9 +115,11 @@ american/vehicles/45.png
 american/vehicles/46.png
 american/vehicles/47.png
 american/vehicles/48.png
+american/vehicles/49.1.png
 american/vehicles/49.png
 american/vehicles/5.png
 american/vehicles/50.png
+american/vehicles/51.1.png
 american/vehicles/51.png
 american/vehicles/52.png
 american/vehicles/53.png
@@ -752,6 +754,7 @@ german/vehicles/33.png
 german/vehicles/34.png
 german/vehicles/35.png
 german/vehicles/36.png
+german/vehicles/37.1.png
 german/vehicles/37.png
 german/vehicles/38.png
 german/vehicles/39.png
@@ -760,7 +763,9 @@ german/vehicles/40.png
 german/vehicles/41.png
 german/vehicles/42.png
 german/vehicles/43.png
+german/vehicles/44.1.png
 german/vehicles/44.png
+german/vehicles/45.1.png
 german/vehicles/45.png
 german/vehicles/46.png
 german/vehicles/47.png
@@ -784,7 +789,10 @@ german/vehicles/62.png
 german/vehicles/63.png
 german/vehicles/64.png
 german/vehicles/65.png
+german/vehicles/66.1.png
 german/vehicles/66.png
+german/vehicles/67.1.png
+german/vehicles/67.2.png
 german/vehicles/67.png
 german/vehicles/68.png
 german/vehicles/69.png
@@ -802,14 +810,19 @@ german/vehicles/79.png
 german/vehicles/8.png
 german/vehicles/80.png
 german/vehicles/81.png
+german/vehicles/82.1.png
 german/vehicles/82.png
 german/vehicles/83.png
 german/vehicles/84.png
 german/vehicles/85.png
 german/vehicles/86.png
 german/vehicles/87.png
+german/vehicles/88.1.png
 german/vehicles/88.png
 german/vehicles/89.png
+german/vehicles/9.1.png
+german/vehicles/9.2.png
+german/vehicles/9.3.png
 german/vehicles/9.png
 german/vehicles/90.png
 german/vehicles/91.png
@@ -1304,6 +1317,7 @@ romanian/vehicles/3.png
 romanian/vehicles/4.png
 romanian/vehicles/5.png
 romanian/vehicles/6.png
+russian/ordnance/1.1.png
 russian/ordnance/1.png
 russian/ordnance/10.png
 russian/ordnance/11.png
@@ -1319,6 +1333,7 @@ russian/ordnance/2.png
 russian/ordnance/20.png
 russian/ordnance/21.png
 russian/ordnance/22.png
+russian/ordnance/23.1.png
 russian/ordnance/23.png
 russian/ordnance/24.png
 russian/ordnance/25.png
@@ -1337,9 +1352,12 @@ russian/ordnance/adf-pif/2.png
 russian/ordnance/adf-pif/3.png
 russian/ordnance/adf-pif/a.html
 russian/ordnance/adf-pif/b.html
+russian/vehicles/1.1.png
 russian/vehicles/1.png
 russian/vehicles/10.png
+russian/vehicles/11.1.png
 russian/vehicles/11.png
+russian/vehicles/12.1.png
 russian/vehicles/12.png
 russian/vehicles/13.png
 russian/vehicles/14.png
@@ -1350,6 +1368,8 @@ russian/vehicles/18.png
 russian/vehicles/19.png
 russian/vehicles/2.png
 russian/vehicles/20.png
+russian/vehicles/21.1.png
+russian/vehicles/21.2.png
 russian/vehicles/21.png
 russian/vehicles/22.png
 russian/vehicles/23.png
@@ -1375,12 +1395,25 @@ russian/vehicles/40.png
 russian/vehicles/41.png
 russian/vehicles/42.png
 russian/vehicles/43.png
+russian/vehicles/44.1.png
+russian/vehicles/44.2.png
 russian/vehicles/44.png
 russian/vehicles/45.png
+russian/vehicles/46.1.png
+russian/vehicles/46.2.png
+russian/vehicles/46.3.png
 russian/vehicles/46.png
+russian/vehicles/47.1.png
+russian/vehicles/47.2.png
+russian/vehicles/47.3.png
 russian/vehicles/47.png
 russian/vehicles/5.png
+russian/vehicles/6.1.png
+russian/vehicles/6.2.png
+russian/vehicles/6.3.png
+russian/vehicles/6.4.png
 russian/vehicles/6.png
+russian/vehicles/7.1.png
 russian/vehicles/7.png
 russian/vehicles/8.png
 russian/vehicles/9.png