Merge pull request #10273 from AUTOMATIC1111/roboto-without-a-dep

Vendor Roboto font

4 files changed, 15 insertions, 16 deletions

diff --git a/modules/Roboto-Regular.ttf b/modules/Roboto-Regular.ttf
new file mode 100644
index 00000000..500b1045
--- /dev/null
+++ b/modules/Roboto-Regular.ttf
diff --git a/modules/images.py b/modules/images.py
index c4e98c75..3b8b62d9 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -13,17 +13,24 @@ import numpy as np
 import piexif

 import piexif.helper

 from PIL import Image, ImageFont, ImageDraw, PngImagePlugin

-from fonts.ttf import Roboto

 import string

 import json

 import hashlib

 

 from modules import sd_samplers, shared, script_callbacks, errors

+from modules.paths_internal import roboto_ttf_file

 from modules.shared import opts

 

 LANCZOS = (Image.Resampling.LANCZOS if hasattr(Image, 'Resampling') else Image.LANCZOS)

 

 

+def get_font(fontsize: int):

+    try:

+        return ImageFont.truetype(opts.font or roboto_ttf_file, fontsize)

+    except Exception:

+        return ImageFont.truetype(roboto_ttf_file, fontsize)

+

+

 def image_grid(imgs, batch_size=1, rows=None):

     if rows is None:

         if opts.n_rows > 0:

@@ -142,12 +149,6 @@ def draw_grid_annotations(im, width, height, hor_texts, ver_texts, margin=0):
                 lines.append(word)

         return lines

 

-    def get_font(fontsize):

-        try:

-            return ImageFont.truetype(opts.font or Roboto, fontsize)

-        except Exception:

-            return ImageFont.truetype(Roboto, fontsize)

-

     def draw_texts(drawing, draw_x, draw_y, lines, initial_fnt, initial_fontsize):

         for line in lines:

             fnt = initial_fnt

diff --git a/modules/paths_internal.py b/modules/paths_internal.py
index 6765bafe..a23f6d70 100644
--- a/modules/paths_internal.py
+++ b/modules/paths_internal.py
@@ -3,7 +3,8 @@
 import argparse

 import os

 

-script_path = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))

+modules_path = os.path.dirname(os.path.realpath(__file__))

+script_path = os.path.dirname(modules_path)

 

 sd_configs_path = os.path.join(script_path, "configs")

 sd_default_config = os.path.join(sd_configs_path, "v1-inference.yaml")

@@ -12,7 +13,7 @@ default_sd_model_file = sd_model_file
 

 # Parse the --data-dir flag first so we can use it as a base for our other argument default values

 parser_pre = argparse.ArgumentParser(add_help=False)

-parser_pre.add_argument("--data-dir", type=str, default=os.path.dirname(os.path.dirname(os.path.realpath(__file__))), help="base path where all user data is stored",)

+parser_pre.add_argument("--data-dir", type=str, default=os.path.dirname(modules_path), help="base path where all user data is stored", )

 cmd_opts_pre = parser_pre.parse_known_args()[0]

 

 data_path = cmd_opts_pre.data_dir

@@ -21,3 +22,5 @@ models_path = os.path.join(data_path, "models")
 extensions_dir = os.path.join(data_path, "extensions")

 extensions_builtin_dir = os.path.join(script_path, "extensions-builtin")

 config_states_dir = os.path.join(script_path, "config_states")

+

+roboto_ttf_file = os.path.join(modules_path, 'Roboto-Regular.ttf')

diff --git a/modules/textual_inversion/image_embedding.py b/modules/textual_inversion/image_embedding.py
index d85a4888..5858a55f 100644
--- a/modules/textual_inversion/image_embedding.py
+++ b/modules/textual_inversion/image_embedding.py
@@ -3,9 +3,7 @@ import json
 import numpy as np

 import zlib

 from PIL import Image, ImageDraw, ImageFont

-from fonts.ttf import Roboto

 import torch

-from modules.shared import opts

 

 

 class EmbeddingEncoder(json.JSONEncoder):

@@ -136,11 +134,8 @@ def caption_image_overlay(srcimage, title, footerLeft, footerMid, footerRight, t
     image = srcimage.copy()

     fontsize = 32

     if textfont is None:

-        try:

-            textfont = ImageFont.truetype(opts.font or Roboto, fontsize)

-            textfont = opts.font or Roboto

-        except Exception:

-            textfont = Roboto

+        from modules.images import get_font

+        textfont = get_font(fontsize)

 

     factor = 1.5

     gradient = Image.new('RGBA', (1, image.size[1]), color=(0, 0, 0, 0))