From 700e63a001cf419ef71f3ac78666e191764e8f74 Mon Sep 17 00:00:00 2001
From: Jennifer Taylor <dragonminded@dragonminded.com>
Date: Fri, 16 Apr 2021 21:28:53 +0000
Subject: [PATCH] Convert some more exceptions to warnings to allow attempts to
 render some BishiBashi content.

---
 bemani/format/afp/render.py | 8 +++++++-
 bemani/format/afp/swf.py    | 5 +----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/bemani/format/afp/render.py b/bemani/format/afp/render.py
index fc7dce2..c31cc59 100644
--- a/bemani/format/afp/render.py
+++ b/bemani/format/afp/render.py
@@ -1,7 +1,7 @@
 from typing import Any, Dict, List, Tuple, Optional
 from PIL import Image  # type: ignore
 
-from .swf import SWF, Frame, Tag, AP2ShapeTag, AP2DefineSpriteTag, AP2PlaceObjectTag, AP2RemoveObjectTag, AP2DoActionTag
+from .swf import SWF, Frame, Tag, AP2ShapeTag, AP2DefineSpriteTag, AP2PlaceObjectTag, AP2RemoveObjectTag, AP2DoActionTag, AP2DefineFontTag, AP2DefineEditTextTag
 from .types import Color, Matrix, Point
 from .geo import Shape
 from .util import VerboseOutput
@@ -157,6 +157,12 @@ class AFPRenderer(VerboseOutput):
         elif isinstance(tag, AP2DoActionTag):
             print("WARNING: Unhandled DO_ACTION tag!")
             return []
+        elif isinstance(tag, AP2DefineFontTag):
+            print("WARNING: Unhandled DEFINE_FONT tag!")
+            return []
+        elif isinstance(tag, AP2DefineEditTextTag):
+            print("WARNING: Unhandled DEFINE_EDIT_TEXT tag!")
+            return []
         else:
             raise Exception(f"Failed to process tag: {tag}")
 
diff --git a/bemani/format/afp/swf.py b/bemani/format/afp/swf.py
index b7322c8..f32ca0e 100644
--- a/bemani/format/afp/swf.py
+++ b/bemani/format/afp/swf.py
@@ -736,13 +736,10 @@ class SWF(TrackedCoverage, VerboseOutput):
             unk, font_id, fontname_offset, xml_prefix_offset, data_offset, data_count = struct.unpack("<HHHHHH", ap2data[dataoffset:(dataoffset + 12)])
             self.add_coverage(dataoffset, 12)
 
-            if unk != 0:
-                raise Exception(f"Unexpected value {unk} in Font tag!")
-
             fontname = self.__get_string(fontname_offset)
             xml_prefix = self.__get_string(xml_prefix_offset)
 
-            self.vprint(f"{prefix}    Tag ID: {font_id}, Font Name: {fontname}, XML Prefix: {xml_prefix}, Entries: {data_count}")
+            self.vprint(f"{prefix}    Tag ID: {font_id}, Unknown: {unk}, Font Name: {fontname}, XML Prefix: {xml_prefix}, Entries: {data_count}")
 
             heights: List[int] = []
             for i in range(data_count):