From c1d27158065cfb99b204b93a4171db548c4045b5 Mon Sep 17 00:00:00 2001
From: Konrad Oboza <34310128+konradoboza@users.noreply.github.com>
Date: Thu, 11 Jul 2019 13:41:05 +0200
Subject: [PATCH] EZP-30628: Soft return inside inline style is removed after
 edit (#48)

* EZP-30628: Soft return inside inline style is removed after edit

* changed eztemplateinline/ezcontent matcher more specific and check if literallayout is parent
---
 .../Resources/stylesheets/docbook/xhtml5/edit/core.xsl      | 6 ++++++
 .../Converter/Xslt/_fixtures/docbook/032-ezstyleinline.xml  | 5 ++++-
 .../Xslt/_fixtures/xhtml5/edit/032-ezstyleinline.xml        | 2 +-
 3 files changed, 11 insertions(+), 2 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 1166f064..2929b9f8 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
@@ -729,6 +729,12 @@
     <xsl:apply-templates select="node()|@*"/>
   </xsl:template>
 
+  <xsl:template match="docbook:literallayout/docbook:eztemplateinline/docbook:ezcontent/text()">
+    <xsl:call-template name="breakLine">
+      <xsl:with-param name="text" select="."/>
+    </xsl:call-template>
+  </xsl:template>
+
   <xsl:template name="extractStyleValue">
     <xsl:param name="style"/>
     <xsl:param name="property"/>
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/032-ezstyleinline.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/032-ezstyleinline.xml
index 82fb1233..fdc5e715 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/032-ezstyleinline.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/docbook/032-ezstyleinline.xml
@@ -4,5 +4,8 @@
          xmlns:ezxhtml="http://ez.no/xmlns/ezpublish/docbook/xhtml"
          xmlns:ezcustom="http://ez.no/xmlns/ezpublish/docbook/custom"
          version="5.0-variant ezpublish-1.0">
-    <para>Some <eztemplateinline type="style" name="highlighted_word"><ezcontent>highlighted words</ezcontent></eztemplateinline> for the otherwise unremarkable paragraph.</para>
+    <para>
+        <literallayout class="normal">Some <eztemplateinline type="style" name="highlighted_word"><ezcontent>highlighted words
+with line break</ezcontent></eztemplateinline> for the otherwise unremarkable paragraph.</literallayout>
+    </para>
 </section>
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/032-ezstyleinline.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/032-ezstyleinline.xml
index 05b7913d..d604f1c2 100644
--- a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/032-ezstyleinline.xml
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/032-ezstyleinline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section xmlns="http://ez.no/namespaces/ezpublish5/xhtml5/edit">
-    <p>Some <span data-ezelement="eztemplateinline" data-eztype="style" data-ezname="highlighted_word">highlighted words</span> for the otherwise unremarkable paragraph.</p>
+    <p>Some <span data-ezelement="eztemplateinline" data-eztype="style" data-ezname="highlighted_word">highlighted words<br/>with line break</span> for the otherwise unremarkable paragraph.</p>
 </section>