From 6e9ec27896e5693f3edba00a06811c7294aa67b4 Mon Sep 17 00:00:00 2001
From: Johannes Heinecke <johannes.heinecke@orange.fr>
Date: Sat, 21 Dec 2024 11:25:17 +0100
Subject: [PATCH] display "<" and ">" correctly in comments and conllu preview

---
 CHANGES.md  | 3 +++
 Dockerfile  | 8 ++++----
 README.md   | 2 +-
 gui/edit.js | 7 ++++---
 pom.xml     | 4 ++--
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 72ad0ee..68cb3e3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,8 @@
 # Changes
 
+## Version 2.29.2
+* corrected bug: "<" and ">" in comments are now correctly displayed
+
 ## Version 2.29.1
 * Fatal error if gui/ does not contain necessary html, css, js files and jquery libraries
 * test modified
diff --git a/Dockerfile b/Dockerfile
index 6e14573..b75931f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
 FROM openjdk:17-alpine
 
-ARG VERSION=2.29.0
-# docker build --build-arg VERSION=2.29.0 -t jheinecke/conllueditor:2.29.0 .
-# docker build --build-arg VERSION=2.29.0 -t jheinecke/conllueditor:latest .
+ARG VERSION=2.29.2
+# docker build --build-arg VERSION=2.29.2 -t jheinecke/conllueditor:2.29.2 .
+# docker build --build-arg VERSION=2.29.2 -t jheinecke/conllueditor:latest .
 # docker run -t --rm --name conllueditor -p 5555:5555 --user 1000:1000  -v </absolute/path/to/datadir>:/data  --env filename=tt.conllu jheinecke/conllueditor:latest
-# docker push jheinecke/conllueditor:2.29.0
+# docker push jheinecke/conllueditor:2.29.2
 # docker push jheinecke/conllueditor:latest
 
 # docker exec -it conllueditor /bin/sh
diff --git a/README.md b/README.md
index 856b2f2..aabf985 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ The editor provides the following functionalities:
 * finding similar or identical sentence in a list of CoNLL-U files, see section [Find Similar Sentences](#find-similar-sentences)
 * configuring the UI on order to hide unneeded functionalities which otherwise clutter the UI
 
-Current version: 2.29.1 (see [change history](CHANGES.md))
+Current version: 2.29.2 (see [change history](CHANGES.md))
 
 ConlluEditor can also be used as front-end to display the results of dependency parsing in the same way as the editor.
 * dependency tree/dependency hedge
diff --git a/gui/edit.js b/gui/edit.js
index b5fca9a..6028036 100644
--- a/gui/edit.js
+++ b/gui/edit.js
@@ -28,7 +28,7 @@
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
  @author Johannes Heinecke
- @version 2.29.0 as of 3rd November 2024
+ @version 2.29.2 as of 21st December 2024
  */
 
 
@@ -152,7 +152,7 @@ function getRaw(what, title) {
             //$('#rawtext').empty();
             //$('#showRawModalLabel').html(what);
             //console.log("DD " + JSON.stringify(data));
-            $('#rawtext').append(data.raw);
+            $('#rawtext').append(data.raw.replaceAll("<", "&lt;").replaceAll(">", "&gt;"));
         }
     });
 }
@@ -1913,7 +1913,8 @@ function formatPhrase(item) {
 
 
         // display comments
-        $("#commentfield").append(item.comments)
+        var cc = item.comments.replaceAll("<", "&lt;").replaceAll(">", "&gt;");
+        $("#commentfield").append(cc);
 
         // install svg download button
         downloadSVG("a2");
diff --git a/pom.xml b/pom.xml
index 0cb6c1d..8c173ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,13 +32,13 @@
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
     author Johannes Heinecke
-    version 2.29.1 as of 9th November 2024
+    version 2.29.2 as of 21st December 2024
     -->
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.orange.labs</groupId>
     <artifactId>ConlluEditor</artifactId>
-    <version>2.29.1</version>
+    <version>2.29.2</version>
     <packaging>jar</packaging>
 
     <properties>