Import re, load_font, and get_w in render.py; update imports in gui

Author: seiya-git

pspdocmaker/render.py

@@ -2,9 +2,13 @@
 from functools import lru_cache
 from typing import List, Tuple, Optional, Iterable
 from pathlib import Path
+import re
 
 from PIL import Image, ImageDraw, ImageFont, ImageOps
 
+from .font_resolver import load_font
+from .utils import get_w
+
 @dataclass
 class RenderSettings:
     page_w: int = 480

pspdocmaker_gui.py

@@ -32,7 +32,7 @@
 # User Modules
 # ---------------------------
 
-from pspdocmaker.font_resolver import FontResolver, load_font
+from pspdocmaker.font_resolver import FontResolver
 from pspdocmaker.psp_docdat import POPS_VER_KEY, extract_pngs_from_dat, pack_pngs_to_dat, iter_png_blobs_from_dat
 
 from pspdocmaker.render import (
@@ -43,7 +43,7 @@
 
 from pspdocmaker.utils import (
     clamp, rgb_to_hex, hex_to_rgb, wx_col_to_hex, detect_text_encoding,
-    ensure_dir, list_image_files, list_text_files, is_dat_file, get_w,
+    ensure_dir, list_image_files, list_text_files, is_dat_file,
     width_cache,
 )