Update app.py

app.py

@@ -285,14 +285,22 @@ def _compile_shape_aliases_from_file():
         return []
     compiled = []
     for item in s.get("shape_aliases", []):
-        shape = (item.get("shape") or "").strip()
-        name  = (item.get("name")  or "").strip()
-        if not shape or not name:
+        raw  = (item.get("shape") or "").strip()
+        name = (item.get("name")  or "").strip()
+        if not raw or not name:
             continue
-        pat = rf"\b{re.escape(shape)}(?:-?shaped)?\b"
+        # allow comma or pipe separated synonyms in one cell
+        tokens = [t.strip() for t in re.split(r"[|,]", raw) if t.strip()]
+        if not tokens:
+            continue
+        # de-dup and prefer longer phrases first (prevents "diamond" eating "diamond emblem")
+        tokens = sorted(set(tokens), key=lambda t: -len(t))
+        # word boundaries at ends; allow optional "-shaped" suffix
+        pat = r"\b(?:" + "|".join(re.escape(t) for t in tokens) + r")(?:-?shaped)?\b"
         compiled.append((re.compile(pat, flags=re.I), name))
     return compiled
 
+
 _SHAPE_ALIASES = _compile_shape_aliases_from_file()
 def _refresh_shape_aliases_cache():
     global _SHAPE_ALIASES
@@ -621,7 +629,11 @@ with gr.Blocks(css=BASE_CSS, title="ForgeCaptions") as demo:
         gr.Markdown(
             "### 🔷 Shape Aliases\n"
             "Replace literal **shape tokens** in captions with a preferred **name**.\n\n"
-            "**How to use:** left column = shape token (e.g., `diamond`), right column = replacement name (e.g., `starkey-emblem`)."
+            "**How to use:**\n"
+            "- Left column = a single token **or** comma/pipe-separated synonyms, e.g. `penis, cock | phallic`\n"
+            "- Right column = replacement name, e.g. `family-emblem`\n\n"
+            "Matches are case-insensitive, use whole words, and also catch `*-shaped` (e.g., `diamond-shaped`).\n"
+            "Multi-word phrases are supported."
         )
         init_rows, init_enabled = get_shape_alias_rows_ui_defaults()
         enable_aliases = gr.Checkbox(label="Enable shape alias replacements", value=init_enabled)