Description Philip Langer 2015-02-02 09:07:36 EST

In the Mars version of Papyrus, users may use rich text in, e.g., UML Comments, with an extra Papyrus plug-in. This feature has been tracked in bug 399853 on the Papyrus side. The rich text editor in Papyrus is basically a wrapper of the rich text editor available in the Eclipse Process Framework (EPF).

EMF Compare should provide a dedicated rich text content merge viewer for differences of values that live in a rich text editor inside the Papyrus UI as rich text from a user perspective.

I'd suggest tackling this issue in three steps:

1. Provide a content merge viewer that only reuses the rich text editors for showing and editing the left and right version

2. Design and realize a way to show the differences using some sort of markers (colors and strike-through font etc.) within the rendered _read-only_ rich text editor in a separate tab. For computing the differences we can re-use google dmp (word-based diff), which is already included in EMF Compare core.

3.  Design and realize a way to show the differences using some sort of markers (colors and strike-through font etc.) within the rendered and _editable_ rich text editor, which is much more complicated as the change annotations and editing has to work within the same viewer.

Let me know what you think. Alexandra will push a draft to gerrit for step 1.