Safely display event titles in the XML using CDATA

mendhak · mendhak · commit c840df11f3cc · 2022-09-26T20:52:52.000+01:00
diff --git a/screen-template.2.svg b/screen-template.2.svg
@@ -10,35 +10,35 @@
   <text id="text501" x="25" y="430" font-size="22px" style="font-family:'Nimbus Sans L'">WEATHER_DESC_2</text>
   <text id="calendarentry1" x="290" y="-3" font-size="29px" style="font-family:'Nimbus Sans L'">
     <tspan x="290" dy="25" style="" id="tspan193">CAL_DATETIME_1</tspan>
-    <tspan style="" x="290" dy="25" id="tspan195">CAL_DESC_1</tspan>
+    <tspan style="" x="290" dy="25" id="tspan195"><![CDATA[CAL_DESC_1]]></tspan>
   </text>
   <text id="calendarentry2" x="290" y="61" font-size="29px" style="font-family:'Nimbus Sans L'">
     <tspan x="290" dy="25" style="" id="tspan198">CAL_DATETIME_2</tspan>
-    <tspan style="" x="290" dy="25" id="tspan200">CAL_DESC_2</tspan>
+    <tspan style="" x="290" dy="25" id="tspan200"><![CDATA[CAL_DESC_2]]></tspan>
   </text>
   <text id="calendarentry3" x="290" y="123" font-size="29px" style="font-family:'Nimbus Sans L'">
     <tspan x="290" dy="25" style="" id="tspan203">CAL_DATETIME_3</tspan>
-    <tspan style="" x="290" dy="25" id="tspan205">CAL_DESC_3</tspan>
+    <tspan style="" x="290" dy="25" id="tspan205"><![CDATA[CAL_DESC_3]]></tspan>
   </text>
   <text id="calendarentry4" x="290" y="183" font-size="29px" style="font-family:'Nimbus Sans L'">
     <tspan x="290" dy="25" id="tspan208" style="">CAL_DATETIME_4</tspan>
-    <tspan style="" x="290" dy="25" id="tspan210">CAL_DESC_4</tspan>
+    <tspan style="" x="290" dy="25" id="tspan210"><![CDATA[CAL_DESC_4]]></tspan>
   </text>
   <text id="calendarentry5" x="290" y="241" font-size="29px" style="font-family:'Nimbus Sans L'">
     <tspan x="290" dy="25" id="tspan213" style="">CAL_DATETIME_5</tspan>
-    <tspan style="" x="290" dy="25" id="tspan215">CAL_DESC_5</tspan>
+    <tspan style="" x="290" dy="25" id="tspan215"><![CDATA[CAL_DESC_5]]></tspan>
   </text>
   <text id="calendarentry6" x="290" y="298" font-size="29px" style="font-family:'Nimbus Sans L'">
     <tspan x="290" dy="25" id="tspan218" style="">CAL_DATETIME_6</tspan>
-    <tspan style="" x="290" dy="25" id="tspan220">CAL_DESC_6</tspan>
+    <tspan style="" x="290" dy="25" id="tspan220"><![CDATA[CAL_DESC_6]]></tspan>
   </text>
   <text id="calendarentry7" x="290" y="356" font-size="29px" style="font-family:'Nimbus Sans L'">
     <tspan x="290" dy="25" id="tspan305" style="">CAL_DATETIME_7</tspan>
-    <tspan style="" x="290" dy="25" id="tspan307">CAL_DESC_7</tspan>
+    <tspan style="" x="290" dy="25" id="tspan307"><![CDATA[CAL_DESC_7]]></tspan>
   </text>
   <text id="calendarentry8" x="290" y="416" font-size="29px" style="font-family:'Nimbus Sans L'">
     <tspan x="290" dy="25" id="tspan308" style="">CAL_DATETIME_8</tspan>
-    <tspan style="" x="290" dy="25" id="tspan310">CAL_DESC_8</tspan>
+    <tspan style="" x="290" dy="25" id="tspan310"><![CDATA[CAL_DESC_8]]></tspan>
   </text>
   <text id="textday" x="25" y="33" font-size="40px" style="">DAY_NAME</text>
   <text id="textdate" x="25" y="78" font-size="40px" style="">
diff --git a/screen-template.3.svg b/screen-template.3.svg
@@ -38,19 +38,19 @@
 
    <text id="textprcblock1-3" x="110" y="188" font-size="29px" style="font-size:29px;line-height:0%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L, Bold';font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;">
       <tspan x="110" dy="25" style="font-size:29px;fill:#000000;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" id="tspan66-6">CAL_DATETIME_1</tspan>
-      <tspan style="font-weight:bold;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-style:normal;font-stretch:normal;font-variant:normal;font-size:29px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" x="108.83642" dy="25" id="tspan68-7">CAL_DESC_1</tspan>
+      <tspan style="font-weight:bold;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-style:normal;font-stretch:normal;font-variant:normal;font-size:29px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" x="108.83642" dy="25" id="tspan68-7"><![CDATA[CAL_DESC_1]]></tspan>
    </text>
    <text id="text75-5" x="110" y="258" font-size="29px" style="font-size:29px;line-height:0%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L, Bold';font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;">
       <tspan x="110" dy="25" style="font-size:29px;fill:#000000;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" id="tspan71-3">CAL_DATETIME_2</tspan>
-      <tspan style="font-weight:bold;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-style:normal;font-stretch:normal;font-variant:normal;font-size:29px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" x="110" dy="25" id="tspan73-5">CAL_DESC_2</tspan>
+      <tspan style="font-weight:bold;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-style:normal;font-stretch:normal;font-variant:normal;font-size:29px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" x="110" dy="25" id="tspan73-5"><![CDATA[CAL_DESC_2]]></tspan>
    </text>
    <text id="textprcblock1" x="110" y="330" font-size="29px" style="font-size:29px;line-height:0%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L, Bold';font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;">
       <tspan x="110" dy="25" style="font-size:29px;fill:#000000;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" id="tspan66">CAL_DATETIME_3</tspan>
-      <tspan style="font-weight:bold;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-style:normal;font-stretch:normal;font-variant:normal;font-size:29px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" x="110" dy="25" id="tspan68">CAL_DESC_3</tspan>
+      <tspan style="font-weight:bold;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-style:normal;font-stretch:normal;font-variant:normal;font-size:29px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" x="110" dy="25" id="tspan68"><![CDATA[CAL_DESC_3]]></tspan>
    </text>
    <text id="text75" x="110" y="398" font-size="29px" style="font-size:29px;line-height:0%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L, Bold';font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;">
       <tspan x="110" dy="25" style="font-size:29px;fill:#000000;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" id="tspan71">CAL_DATETIME_4</tspan>
-      <tspan style="font-weight:bold;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-style:normal;font-stretch:normal;font-variant:normal;font-size:29px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" x="110" id="tspan73" dy="25">CAL_DESC_4</tspan>
+      <tspan style="font-weight:bold;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-style:normal;font-stretch:normal;font-variant:normal;font-size:29px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" x="110" id="tspan73" dy="25"><![CDATA[CAL_DESC_4]]></tspan>
    </text>
    
 
diff --git a/screen-template.4.svg b/screen-template.4.svg
@@ -37,19 +37,19 @@
    </g>
    <text id="textprcblock1" x="109.24693" y="328.97311" font-size="29px" style="font-size:29px;line-height:0%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L, Bold';font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;">
       <tspan x="109.24693" dy="25" style="font-size:29px;fill:#ff0000;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" id="tspan66">CAL_DATETIME_3</tspan>
-      <tspan style="font-weight:bold;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-style:normal;font-stretch:normal;font-variant:normal;font-size:29px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" x="109.24693" dy="25" id="tspan68">CAL_DESC_3</tspan>
+      <tspan style="font-weight:bold;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-style:normal;font-stretch:normal;font-variant:normal;font-size:29px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" x="109.24693" dy="25" id="tspan68"><![CDATA[CAL_DESC_3]]></tspan>
    </text>
    <text id="text75" x="109.24693" y="398.49551" font-size="29px" style="font-size:29px;line-height:0%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L, Bold';font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;">
       <tspan x="109.24693" dy="25" style="font-size:29px;fill:#ff0000;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" id="tspan71">CAL_DATETIME_4</tspan>
-      <tspan style="font-weight:bold;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-style:normal;font-stretch:normal;font-variant:normal;font-size:29px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" x="109.24693" id="tspan73" dy="25">CAL_DESC_4</tspan>
+      <tspan style="font-weight:bold;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-style:normal;font-stretch:normal;font-variant:normal;font-size:29px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" x="109.24693" id="tspan73" dy="25"><![CDATA[CAL_DESC_4]]></tspan>
    </text>
    <text id="textprcblock1-3" x="108.83642" y="188.70459" font-size="29px" style="font-size:29px;line-height:0%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L, Bold';font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;">
       <tspan x="108.83642" dy="25" style="font-size:29px;fill:#ff0000;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" id="tspan66-6">CAL_DATETIME_1</tspan>
-      <tspan style="font-weight:bold;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-style:normal;font-stretch:normal;font-variant:normal;font-size:29px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" x="108.83642" dy="25" id="tspan68-7">CAL_DESC_1</tspan>
+      <tspan style="font-weight:bold;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-style:normal;font-stretch:normal;font-variant:normal;font-size:29px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" x="108.83642" dy="25" id="tspan68-7"><![CDATA[CAL_DESC_1]]></tspan>
    </text>
    <text id="text75-5" x="110.3409" y="258.24493" font-size="29px" style="font-size:29px;line-height:0%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L, Bold';font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;">
       <tspan x="110.3409" dy="25" style="font-size:29px;fill:#ff0000;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" id="tspan71-3">CAL_DATETIME_2</tspan>
-      <tspan style="font-weight:bold;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-style:normal;font-stretch:normal;font-variant:normal;font-size:29px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" x="110.3409" dy="25" id="tspan73-5">CAL_DESC_2</tspan>
+      <tspan style="font-weight:bold;-inkscape-font-specification:'Nimbus Sans L, Bold';font-family:'Nimbus Sans L';font-style:normal;font-stretch:normal;font-variant:normal;font-size:29px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;" x="110.3409" dy="25" id="tspan73-5"><![CDATA[CAL_DESC_2]]></tspan>
    </text>
 
    <text id="text3159-2" x="682.87079" y="190.69188" font-size="38px" style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.33333397px;line-height:0%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle">WEATHER_DESC_1</text>
