EZP-29346: ezxmltext -> ricktext conversion : align=LEFT ( uppercase …

…) fails (ezsystems#52)
ezecosystem · Jun 28, 2018 · 55c6115 · 55c6115
1 parent c925216
commit 55c6115
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/lib/FieldType/XmlText/Input/Resources/stylesheets/eZXml2Docbook_core.xsl b/lib/FieldType/XmlText/Input/Resources/stylesheets/eZXml2Docbook_core.xsl
@@ -15,6 +15,9 @@
   <xsl:key name="ids" match="*[@xhtml:id]" use="@xhtml:id"/>
   <xsl:key name="ids" match="//embed[@ezlegacytmp-embed-link-id]" use="@ezlegacytmp-embed-link-id"/>
 
+  <xsl:variable name="lowercase" select="'abcdefghijklmnopqrstuvwxyz'" />
+  <xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'" />
+
   <xsl:template match="custom">
     <xsl:element name="eztemplateinline" namespace="http://docbook.org/ns/docbook">
       <xsl:attribute name="name">
@@ -27,7 +30,7 @@
       </xsl:if>
       <xsl:if test="@custom:align">
         <xsl:attribute name="ezxhtml:align">
-          <xsl:value-of select="@custom:align"/>
+          <xsl:value-of select="translate(@custom:align, $uppercase, $lowercase)"/>
         </xsl:attribute>
       </xsl:if>
       <xsl:if test="./text()">
@@ -59,7 +62,7 @@
       </xsl:if>
       <xsl:if test="@custom:align">
         <xsl:attribute name="ezxhtml:align">
-          <xsl:value-of select="@custom:align"/>
+          <xsl:value-of select="translate(@custom:align, $uppercase, $lowercase)"/>
         </xsl:attribute>
       </xsl:if>
       <xsl:if test="./* | ./text()">
@@ -114,7 +117,7 @@
       </xsl:if>
       <xsl:if test="@align">
         <xsl:attribute name="ezxhtml:textalign">
-          <xsl:value-of select="@align"/>
+          <xsl:value-of select="translate(@align, $uppercase, $lowercase)"/>
         </xsl:attribute>
       </xsl:if>
       <xsl:variable name="lines" select="line"/>
@@ -320,7 +323,7 @@
       </xsl:if>
       <xsl:if test="@align">
         <xsl:attribute name="ezxhtml:textalign">
-          <xsl:value-of select="@align"/>
+          <xsl:value-of select="translate(@align, $uppercase, $lowercase)"/>
         </xsl:attribute>
       </xsl:if>
       <xsl:apply-templates/>
@@ -433,7 +436,7 @@
       </xsl:if>
       <xsl:if test="@align">
         <xsl:attribute name="ezxhtml:textalign">
-          <xsl:value-of select="@align"/>
+          <xsl:value-of select="translate(@align, $uppercase, $lowercase)"/>
         </xsl:attribute>
       </xsl:if>
       <xsl:if test="@xhtml:width">
@@ -479,7 +482,7 @@
       </xsl:if>
       <xsl:if test="@align">
         <xsl:attribute name="ezxhtml:textalign">
-          <xsl:value-of select="@align"/>
+          <xsl:value-of select="translate(@align, $uppercase, $lowercase)"/>
         </xsl:attribute>
       </xsl:if>
       <xsl:if test="@xhtml:width">
@@ -489,7 +492,7 @@
       </xsl:if>
       <xsl:if test="@custom:valign">
         <xsl:attribute name="valign">
-          <xsl:value-of select="@custom:valign"/>
+          <xsl:value-of select="translate(@custom:valign, $uppercase, $lowercase)"/>
         </xsl:attribute>
       </xsl:if>
       <xsl:if test="@xhtml:colspan">
@@ -556,7 +559,7 @@
       </xsl:if>
       <xsl:if test="@align">
         <xsl:attribute name="ezxhtml:align">
-          <xsl:value-of select="@align"/>
+          <xsl:value-of select="translate(@align, $uppercase, $lowercase)"/>
         </xsl:attribute>
       </xsl:if>
       <xsl:if test="@*[starts-with( name( . ), 'ezlegacytmp-embed-link-' )]">

diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/input/010-align.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/input/010-align.xml
@@ -4,6 +4,7 @@
         xmlns:xhtml="http://ez.no/namespaces/ezpublish3/xhtml/"
         xmlns:custom="http://ez.no/namespaces/ezpublish3/custom/">
     <paragraph align="left">align left</paragraph>
+    <paragraph align="LEFT">align LEFT</paragraph>
     <paragraph align="center">aligne center</paragraph>
     <paragraph align="right">align right</paragraph>
     <paragraph align="justify">align fullheader align fullheaderalign fullheaderalign fullheaderalign fullheaderalign fullheaderalign fullheader</paragraph>

diff --git a/tests/lib/FieldType/Converter/_fixtures/richtext/output/010-align.xml b/tests/lib/FieldType/Converter/_fixtures/richtext/output/010-align.xml
@@ -5,6 +5,7 @@
         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 ezxhtml:textalign="left">align left</para>
+    <para ezxhtml:textalign="left">align LEFT</para>
     <para ezxhtml:textalign="center">aligne center</para>
     <para ezxhtml:textalign="right">align right</para>
     <para ezxhtml:textalign="justify">align fullheader align fullheaderalign fullheaderalign fullheaderalign fullheaderalign fullheaderalign fullheader</para>