Merge "fix: ensure no blanks are entered between name parts and hyphens"

[gigi.git] / src / club / wpia / gigi / output / NameInput.java

diff --git a/src/club/wpia/gigi/output/NameInput.java b/src/club/wpia/gigi/output/NameInput.java
index d9116b12bfe6eec47d44571bcdf2cfd8fa077c65..272c06e4249a344a8ee63df3485b8ac9ba62a57c 100644 (file)
--- a/src/club/wpia/gigi/output/NameInput.java
+++ b/src/club/wpia/gigi/output/NameInput.java
@@ -106,6 +106,9 @@ public class NameInput implements Outputable {
         if (toSplit == null || toSplit.trim().isEmpty()) {
             return new String[0];
         }
+        toSplit = toSplit.replaceAll("(?>[\\p{Z}\\s]*)([\u002d\u058a\u05be\u1806\u2010\u2011\u2012\u2013\u2014\u2015\u2e3a\u2e3b\ufe58\ufe63\uff0d])(?>[\\p{Z}\\s]*)", "-");
+        toSplit = toSplit.replaceAll("(?>[\\p{Z}\\s]+)", " ").trim();
+
         return toSplit.split(" ");
     }