From 225660867a1ee4cba5155f328254a1f55a2f68cc Mon Sep 17 00:00:00 2001
From: silveroxides <ishimarukaito@gmail.com>
Date: Fri, 3 Jul 2026 14:57:01 +0200
Subject: [PATCH 1/2] Add alternative ways ('TE:' and 'EMB:') to load
 embeddings in prompt since using 'embedding:' is kind of lengthy and
 cumbersome to use

---
 comfy/sd1_clip.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/comfy/sd1_clip.py b/comfy/sd1_clip.py
index 897186bba..88aed9381 100644
--- a/comfy/sd1_clip.py
+++ b/comfy/sd1_clip.py
@@ -535,6 +535,7 @@ class SDTokenizer:
         self.embedding_directory = embedding_directory
         self.max_word_length = 8
         self.embedding_identifier = "embedding:"
+        self.embedding_identifiers = ["embedding:", "EMB:", "TE:"]
         self.embedding_size = embedding_size
         self.embedding_key = embedding_key
 
@@ -585,16 +586,24 @@ class SDTokenizer:
         tokens = []
         for weighted_segment, weight in parsed_weights:
             to_tokenize = unescape_important(weighted_segment)
-            split = re.split(' {0}|\n{0}'.format(self.embedding_identifier), to_tokenize)
+            pattern = r'(?<=\s)({})'.format('|'.join(map(re.escape, self.embedding_identifiers)))
+            split = re.split(pattern, to_tokenize)
             to_tokenize = [split[0]]
-            for i in range(1, len(split)):
-                to_tokenize.append("{}{}".format(self.embedding_identifier, split[i]))
+            for i in range(1, len(split), 2):
+                if i + 1 < len(split):
+                    to_tokenize.append("{}{}".format(split[i], split[i+1]))
 
             to_tokenize = [x for x in to_tokenize if x != ""]
             for word in to_tokenize:
                 # if we find an embedding, deal with the embedding
-                if word.startswith(self.embedding_identifier) and self.embedding_directory is not None:
-                    embedding_name = word[len(self.embedding_identifier):].strip('\n')
+                matched_id = None
+                for identifier in self.embedding_identifiers:
+                    if word.startswith(identifier):
+                        matched_id = identifier
+                        break
+
+                if matched_id is not None and self.embedding_directory is not None:
+                    embedding_name = word[len(matched_id):].strip('\n')
                     embed, leftover = self._try_get_embedding(embedding_name)
                     if embed is None:
                         logging.warning(f"warning, embedding:{embedding_name} does not exist, ignoring")

From 7d782329d3c7647bc643402c372c04f7902d1d14 Mon Sep 17 00:00:00 2001
From: silveroxides <ishimarukaito@gmail.com>
Date: Sat, 4 Jul 2026 01:24:46 +0200
Subject: [PATCH 2/2] Removed self.embedding_identifiers from
 SDTokenizer.__init__, leaving self.embedding_identifier as the singular
 source of truth. Added dynamic embedding_identifiers property.

---
 comfy/sd1_clip.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/comfy/sd1_clip.py b/comfy/sd1_clip.py
index 88aed9381..bb11ed425 100644
--- a/comfy/sd1_clip.py
+++ b/comfy/sd1_clip.py
@@ -535,12 +535,19 @@ class SDTokenizer:
         self.embedding_directory = embedding_directory
         self.max_word_length = 8
         self.embedding_identifier = "embedding:"
-        self.embedding_identifiers = ["embedding:", "EMB:", "TE:"]
         self.embedding_size = embedding_size
         self.embedding_key = embedding_key
 
         self.disable_weights = disable_weights
 
+    @property
+    def embedding_identifiers(self):
+        identifiers = [self.embedding_identifier]
+        for item in ["EMB:", "TE:"]:
+            if item not in identifiers:
+                identifiers.append(item)
+        return identifiers
+
     def _try_get_embedding(self, embedding_name:str):
         '''
         Takes a potential embedding name and tries to retrieve it.