From 9111ffdf46285c8b09f03a2139f6c3f7d0c02ff9 Mon Sep 17 00:00:00 2001
From: Konrad Oboza <34310128+konradoboza@users.noreply.github.com>
Date: Fri, 7 Feb 2020 16:10:41 +0100
Subject: [PATCH] EZP-31272: Handled anchors generated with name attribute
 (#107)

* EZP-31272: Handled anchors generated with name attribute

* added checking whether anchor names can be mapped to id uniqueness wise

* intentional failed test to check duplicated name attributes

* validation and tests reworked to strip anchors having duplicated names
---
 .../Resources/stylesheets/xhtml5/edit/docbook.xsl  | 14 +++++++++++---
 .../xhtml5/edit/lossy/008-anchor.docbook.xml       | 11 +++++++++++
 .../xhtml5/edit/lossy/008-anchor.xhtml5.edit.xml   |  6 ++++++
 3 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/008-anchor.docbook.xml
 create mode 100644 tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/008-anchor.xhtml5.edit.xml

diff --git a/src/lib/eZ/RichText/Resources/stylesheets/xhtml5/edit/docbook.xsl b/src/lib/eZ/RichText/Resources/stylesheets/xhtml5/edit/docbook.xsl
index 298ec2fa..a42b82b0 100644
--- a/src/lib/eZ/RichText/Resources/stylesheets/xhtml5/edit/docbook.xsl
+++ b/src/lib/eZ/RichText/Resources/stylesheets/xhtml5/edit/docbook.xsl
@@ -255,20 +255,28 @@
   </xsl:template>
 
   <xsl:template name="link.anchor">
+    <xsl:param name="attribute"/>
     <anchor>
       <xsl:attribute name="xml:id">
-        <xsl:value-of select="@id"/>
+        <xsl:value-of select="$attribute"/>
       </xsl:attribute>
     </anchor>
   </xsl:template>
 
-  <xsl:template match="ezxhtml5:a">
+  <xsl:template match="ezxhtml5:a[not(@name=preceding::ezxhtml5:a/@name)]">
     <xsl:choose>
       <xsl:when test="@href">
         <xsl:call-template name="link.href"/>
       </xsl:when>
       <xsl:when test="@id">
-        <xsl:call-template name="link.anchor"/>
+        <xsl:call-template name="link.anchor">
+          <xsl:with-param name="attribute" select="@id"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:when test="@name">
+        <xsl:call-template name="link.anchor">
+          <xsl:with-param name="attribute" select="@name"/>
+        </xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
         <xsl:message terminate="yes">
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/008-anchor.docbook.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/008-anchor.docbook.xml
new file mode 100644
index 00000000..270e5b12
--- /dev/null
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/008-anchor.docbook.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section
+        xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        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><anchor xml:id="top"/>some anchor with a name attribute.</para>
+    <para><anchor xml:id="bottom"/>some anchor with a name attribute.</para>
+    <para>another anchor that should be removed due to lack of name uniqueness.</para>
+</section>
diff --git a/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/008-anchor.xhtml5.edit.xml b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/008-anchor.xhtml5.edit.xml
new file mode 100644
index 00000000..e5d9792e
--- /dev/null
+++ b/tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/lossy/008-anchor.xhtml5.edit.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section xmlns="http://ez.no/namespaces/ezpublish5/xhtml5/edit">
+    <p><a name="top"/>some anchor with a name attribute.</p>
+    <p><a name="bottom"/>some anchor with a name attribute.</p>
+    <p><a name="bottom"/>another anchor that should be removed due to lack of name uniqueness.</p>
+</section>