From 048e5faa1ff6c44be7d85ad57bbd5b807c9de1e4 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Sat, 16 Apr 2022 16:44:39 +0200
Subject: [PATCH] Also simplify item labels, due to XML limitations

---
 novelwriter/core/item.py          | 4 ++--
 tests/test_core/test_core_item.py | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/novelwriter/core/item.py b/novelwriter/core/item.py
index d56d60f2..2672a196 100644
--- a/novelwriter/core/item.py
+++ b/novelwriter/core/item.py
@@ -29,7 +29,7 @@ from lxml import etree
 
 from novelwriter.enum import nwItemType, nwItemClass, nwItemLayout
 from novelwriter.common import (
-    checkInt, isHandle, isItemClass, isItemLayout, isItemType
+    checkInt, isHandle, isItemClass, isItemLayout, isItemType, simplified
 )
 from novelwriter.constants import nwLabels, nwLists, trConst
 
@@ -305,7 +305,7 @@ class NWItem():
         """Set the item name.
         """
         if isinstance(theName, str):
-            self._name = theName.strip()
+            self._name = simplified(theName)
         else:
             self._name = ""
         return
diff --git a/tests/test_core/test_core_item.py b/tests/test_core/test_core_item.py
index eb1425b3..3adda4de 100644
--- a/tests/test_core/test_core_item.py
+++ b/tests/test_core/test_core_item.py
@@ -44,6 +44,8 @@ def testCoreItem_Setters(mockGUI, constData):
     assert theItem.itemName == "A Name"
     theItem.setName("\t A Name   ")
     assert theItem.itemName == "A Name"
+    theItem.setName("\t A\t\u2009\u202f\u2002\u2003\u2028\u2029Name   ")
+    assert theItem.itemName == "A Name"
     theItem.setName(123)
     assert theItem.itemName == ""