From ab34cdb33d6cdbf2976e104488353cd4d151bfa6 Mon Sep 17 00:00:00 2001
From: Serhey Dolgushev <dolgushev.serhey@gmail.com>
Date: Mon, 2 Dec 2019 16:56:05 +0000
Subject: [PATCH 1/2] Dont use zero width sapce for EZP-29882

---
 .../Resources/stylesheets/docbook/xhtml5/edit/core.xsl        | 2 +-
 .../Converter/Xslt/_fixtures/xhtml5/edit/023-embedInline.xml  | 4 ++--
 .../xhtml5/edit/035-itemizedListWithNestedElements.xml        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/eZ/RichText/Resources/stylesheets/docbook/xhtml5/edit/core.xsl b/src/lib/eZ/RichText/Resources/stylesheets/docbook/xhtml5/edit/core.xsl
index 1f2177e6..7b6e0d5c 100644
--- a/src/lib/eZ/RichText/Resources/stylesheets/docbook/xhtml5/edit/core.xsl
+++ b/src/lib/eZ/RichText/Resources/stylesheets/docbook/xhtml5/edit/core.xsl
@@ -585,7 +585,7 @@
       <xsl:call-template name="ezattribute"/>
       <xsl:apply-templates/>
       <xsl:if test="./docbook:ezattribute or not(node())">
-        <xsl:text> </xsl:text>
+        <xsl:text>ao-upcast-placeholder</xsl:text>
       </xsl:if>
     </xsl:element>
   </xsl:template>
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/023-embedInline.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/023-embedInline.xml
index 52aaf31d..a13e0641 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/023-embedInline.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/023-embedInline.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://ez.no/namespaces/ezpublish5/xhtml5/edit">
-  <p>Some <span data-ezelement="ezembedinline" id="id3" data-href="ezcontent://601" data-ezview="embed-inline-custom" class="embedClass" data-ezalign="left"> </span> for the otherwise unremarkable paragraph.</p>
+  <p>Some <span data-ezelement="ezembedinline" id="id3" data-href="ezcontent://601" data-ezview="embed-inline-custom" class="embedClass" data-ezalign="left">ao-upcast-placeholder</span> for the otherwise unremarkable paragraph.</p>
   <p>This paragraph is just showing off its <span data-ezelement="ezembedinline" id="id5" data-href="ezcontent://501" data-ezview="embed-inline" class="embedClass2" data-ezalign="right">
     <span data-ezelement="ezconfig">
       <span data-ezelement="ezvalue" data-ezvalue-key="size">medium</span>
     </span>
   </span> content.</p>
-  <p>Some<span data-ezattribute-name-1="value 1" data-ezattribute-name-2="value 2" data-ezelement="ezembedinline" id="id4" data-href="ezcontent://601"> </span> content.</p>
+  <p>Some<span data-ezattribute-name-1="value 1" data-ezattribute-name-2="value 2" data-ezelement="ezembedinline" id="id4" data-href="ezcontent://601">ao-upcast-placeholder</span> content.</p>
 </section>
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/035-itemizedListWithNestedElements.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/035-itemizedListWithNestedElements.xml
index 7c44a81d..910f2e11 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/035-itemizedListWithNestedElements.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/035-itemizedListWithNestedElements.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://ez.no/namespaces/ezpublish5/xhtml5/edit">
   <ul>
-    <li>This is a list item <span data-ezelement="ezembedinline" data-href="ezcontent://52" data-ezview="embed-inline"> </span></li>
+    <li>This is a list item <span data-ezelement="ezembedinline" data-href="ezcontent://52" data-ezview="embed-inline">ao-upcast-placeholder</span></li>
   </ul>
 </section>

From 980505ccf3a185cf6b7f027235ccc334599581a2 Mon Sep 17 00:00:00 2001
From: Andrew Longosz <alongosz@users.noreply.github.com>
Date: Tue, 21 Jan 2020 11:59:53 +0100
Subject: [PATCH 2/2] Renamed ao-upcast-placeholder to oe-upcast-placeholder

---
 .../Resources/stylesheets/docbook/xhtml5/edit/core.xsl        | 2 +-
 .../Converter/Xslt/_fixtures/xhtml5/edit/023-embedInline.xml  | 4 ++--
 .../xhtml5/edit/035-itemizedListWithNestedElements.xml        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/eZ/RichText/Resources/stylesheets/docbook/xhtml5/edit/core.xsl b/src/lib/eZ/RichText/Resources/stylesheets/docbook/xhtml5/edit/core.xsl
index 7b6e0d5c..2efde989 100644
--- a/src/lib/eZ/RichText/Resources/stylesheets/docbook/xhtml5/edit/core.xsl
+++ b/src/lib/eZ/RichText/Resources/stylesheets/docbook/xhtml5/edit/core.xsl
@@ -585,7 +585,7 @@
       <xsl:call-template name="ezattribute"/>
       <xsl:apply-templates/>
       <xsl:if test="./docbook:ezattribute or not(node())">
-        <xsl:text>ao-upcast-placeholder</xsl:text>
+        <xsl:text>oe-upcast-placeholder</xsl:text>
       </xsl:if>
     </xsl:element>
   </xsl:template>
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/023-embedInline.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/023-embedInline.xml
index a13e0641..7fce1ac4 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/023-embedInline.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/023-embedInline.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://ez.no/namespaces/ezpublish5/xhtml5/edit">
-  <p>Some <span data-ezelement="ezembedinline" id="id3" data-href="ezcontent://601" data-ezview="embed-inline-custom" class="embedClass" data-ezalign="left">ao-upcast-placeholder</span> for the otherwise unremarkable paragraph.</p>
+  <p>Some <span data-ezelement="ezembedinline" id="id3" data-href="ezcontent://601" data-ezview="embed-inline-custom" class="embedClass" data-ezalign="left">oe-upcast-placeholder</span> for the otherwise unremarkable paragraph.</p>
   <p>This paragraph is just showing off its <span data-ezelement="ezembedinline" id="id5" data-href="ezcontent://501" data-ezview="embed-inline" class="embedClass2" data-ezalign="right">
     <span data-ezelement="ezconfig">
       <span data-ezelement="ezvalue" data-ezvalue-key="size">medium</span>
     </span>
   </span> content.</p>
-  <p>Some<span data-ezattribute-name-1="value 1" data-ezattribute-name-2="value 2" data-ezelement="ezembedinline" id="id4" data-href="ezcontent://601">ao-upcast-placeholder</span> content.</p>
+  <p>Some<span data-ezattribute-name-1="value 1" data-ezattribute-name-2="value 2" data-ezelement="ezembedinline" id="id4" data-href="ezcontent://601">oe-upcast-placeholder</span> content.</p>
 </section>
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/035-itemizedListWithNestedElements.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/035-itemizedListWithNestedElements.xml
index 910f2e11..d5303d3c 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/035-itemizedListWithNestedElements.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/035-itemizedListWithNestedElements.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://ez.no/namespaces/ezpublish5/xhtml5/edit">
   <ul>
-    <li>This is a list item <span data-ezelement="ezembedinline" data-href="ezcontent://52" data-ezview="embed-inline">ao-upcast-placeholder</span></li>
+    <li>This is a list item <span data-ezelement="ezembedinline" data-href="ezcontent://52" data-ezview="embed-inline">oe-upcast-placeholder</span></li>
   </ul>
 </section>