From 818b714252faa2451040551c972dade865221f6c Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Tue, 22 Feb 2022 14:38:44 +0100
Subject: [PATCH] Fix wrong default font string for annotation tools

---
 part/data/tools.xml        | 4 ++--
 part/pageviewannotator.cpp | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/part/data/tools.xml b/part/data/tools.xml
index 0b9df17a8..4d1ae1bf0 100644
--- a/part/data/tools.xml
+++ b/part/data/tools.xml
@@ -81,13 +81,13 @@ Annotation
     <tool id="5" type="typewriter">
         <engine type="PickPoint" block="true">
             <annotation type="Typewriter" color="#00ffffff" textColor="#000000" width="0"
-                        font="Noto Sans\\,10\\,-1\\,5\\,50\\,0\\,0\\,0\\,0\\,0\\,Regular"/>
+                        font="Noto Sans,10,-1,5,50,0,0,0,0,0,Regular"/>
         </engine>
     </tool>
     <tool id="6" type="note-inline">
         <engine type="PickPoint" color="#ffff00" hoverIcon="tool-note-inline" block="true">
             <annotation type="FreeText" color="#ffffff00"
-                        font="Noto Sans\\,10\\,-1\\,5\\,50\\,0\\,0\\,0\\,0\\,0\\,Regular"/>
+                        font="Noto Sans,10,-1,5,50,0,0,0,0,0,Regular"/>
         </engine>
     </tool>
     <tool id="7" type="note-linked">
diff --git a/part/pageviewannotator.cpp b/part/pageviewannotator.cpp
index 34a403688..e0f67e45d 100644
--- a/part/pageviewannotator.cpp
+++ b/part/pageviewannotator.cpp
@@ -156,7 +156,12 @@ public:
         // set font
         if (m_annotElement.hasAttribute(QStringLiteral("font"))) {
             QFont f;
-            f.fromString(m_annotElement.attribute(QStringLiteral("font")));
+            // Workaround broken old code that saved fonts incorrectly with extra backslashes
+            QString fontString = m_annotElement.attribute(QStringLiteral("font"));
+            if (fontString.count(QStringLiteral("\\\\,")) > 9) {
+                fontString.replace(QStringLiteral("\\\\,"), QStringLiteral(","));
+            }
+            f.fromString(fontString);
             ta->setTextFont(f);
         }
         // set font color