From 02282ab57afd3c2034092bc195fbdba3b9f6dbd0 Mon Sep 17 00:00:00 2001
From: MoonRide303 <moonride303@gmail.com>
Date: Fri, 20 Oct 2023 15:50:42 +0200
Subject: [PATCH] Corrected handling dash in wildcard names, more wildcards
 (extended-color)

---
 fooocus_version.py           |   2 +-
 modules/sdxl_styles.py       |   2 +-
 update_log.md                |  16 ++++
 wildcards/extended-color.txt | 147 +++++++++++++++++++++++++++++++++++
 4 files changed, 165 insertions(+), 2 deletions(-)
 create mode 100644 wildcards/extended-color.txt

diff --git a/fooocus_version.py b/fooocus_version.py
index 654fc85..62ce91c 100644
--- a/fooocus_version.py
+++ b/fooocus_version.py
@@ -1 +1 @@
-version = '2.1.717'
+version = '2.1.718'
diff --git a/modules/sdxl_styles.py b/modules/sdxl_styles.py
index 6216833..87af512 100644
--- a/modules/sdxl_styles.py
+++ b/modules/sdxl_styles.py
@@ -100,7 +100,7 @@ def apply_style(style, positive):
 
 def apply_wildcards(wildcard_text, rng, directory=wildcards_path):
     for _ in range(wildcards_max_bfs_depth):
-        placeholders = re.findall(r'__(\w+)__', wildcard_text)
+        placeholders = re.findall(r'__([\w-]+)__', wildcard_text)
         if len(placeholders) == 0:
             return wildcard_text
 
diff --git a/update_log.md b/update_log.md
index f9b8aff..e67d38e 100644
--- a/update_log.md
+++ b/update_log.md
@@ -1,3 +1,19 @@
+# 2.1.718
+
+* Corrected handling dash in wildcard names, more wildcards (extended-color).
+
+# 2.1.717
+
+* Corrected displaying multi-line prompts in Private Log.
+
+# 2.1.716
+
+* Added support for nested wildcards, more wildcards (flower, color_flower).
+
+# 2.1.714
+
+* Fixed resolution problems.
+
 # 2.1.712
 
 * Cleaned up Private Log (most users won't need information about raw prompts).
diff --git a/wildcards/extended-color.txt b/wildcards/extended-color.txt
new file mode 100644
index 0000000..04cf7af
--- /dev/null
+++ b/wildcards/extended-color.txt
@@ -0,0 +1,147 @@
+aliceblue
+antiquewhite
+aqua
+aquamarine
+azure
+beige
+bisque
+black
+blanchedalmond
+blue
+blueviolet
+brown
+burlywood
+cadetblue
+chartreuse
+chocolate
+coral
+cornflowerblue
+cornsilk
+crimson
+cyan
+darkblue
+darkcyan
+darkgoldenrod
+darkgray
+darkgreen
+darkgrey
+darkkhaki
+darkmagenta
+darkolivegreen
+darkorange
+darkorchid
+darkred
+darksalmon
+darkseagreen
+darkslateblue
+darkslategray
+darkslategrey
+darkturquoise
+darkviolet
+deeppink
+deepskyblue
+dimgray
+dimgrey
+dodgerblue
+firebrick
+floralwhite
+forestgreen
+fuchsia
+gainsboro
+ghostwhite
+gold
+goldenrod
+gray
+green
+greenyellow
+grey
+honeydew
+hotpink
+indianred
+indigo
+ivory
+khaki
+lavender
+lavenderblush
+lawngreen
+lemonchiffon
+lightblue
+lightcoral
+lightcyan
+lightgoldenrodyellow
+lightgray
+lightgreen
+lightgrey
+lightpink
+lightsalmon
+lightseagreen
+lightskyblue
+lightslategray
+lightslategrey
+lightsteelblue
+lightyellow
+lime
+limegreen
+linen
+magenta
+maroon
+mediumaquamarine
+mediumblue
+mediumorchid
+mediumpurple
+mediumseagreen
+mediumslateblue
+mediumspringgreen
+mediumturquoise
+mediumvioletred
+midnightblue
+mintcream
+mistyrose
+moccasin
+navajowhite
+navy
+oldlace
+olive
+olivedrab
+orange
+orangered
+orchid
+palegoldenrod
+palegreen
+paleturquoise
+palevioletred
+papayawhip
+peachpuff
+peru
+pink
+plum
+powderblue
+purple
+red
+rosybrown
+royalblue
+saddlebrown
+salmon
+sandybrown
+seagreen
+seashell
+sienna
+silver
+skyblue
+slateblue
+slategray
+slategrey
+snow
+springgreen
+steelblue
+tan
+teal
+thistle
+tomato
+turquoise
+violet
+wheat
+white
+whitesmoke
+yellow
+yellowgreen