Merge branch '6.7' into 6.13

eZ/Publish/Core/FieldType/RichText/Resources/schemas/docbook/ezpublish.rng

@@ -22,6 +22,36 @@
       </a:documentation>
       <ref name="db.title"/>
     </define>
+
+    <define name="db.blockquote.info" combine="choice">
+      <a:documentation>
+        Needed by the LIBXML engine to allow for multiple title elements on the same level below blockquote
+      </a:documentation>
+      <optional>
+        <ref name="db.title"/>
+      </optional>
+    </define>
+
+    <define name="db.superscript.attlist" combine="interleave">
+      <zeroOrMore>
+        <choice>
+          <text/>
+          <ref name="db.emphasis"/>
+          <ref name="db.link"/>
+        </choice>
+      </zeroOrMore>
+    </define>
+
+    <define name="db.subscript.attlist" combine="interleave">
+      <zeroOrMore>
+        <choice>
+          <text/>
+          <ref name="db.emphasis"/>
+          <ref name="db.link"/>
+        </choice>
+      </zeroOrMore>
+    </define>
+
     <define name="db.orderedlist">
       <element name="orderedlist">
         <a:documentation>A list in which each entry is marked with a sequentially incremented label</a:documentation>

eZ/Publish/Core/FieldType/Tests/RichText/Validator/DocbookTest.php

@@ -57,6 +57,63 @@ public function providerForTestValidate()
 ',
                 array(),
             ),
+            array(
+                '<?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">
+  <blockquote>
+    <para>Some comments to people\'s comments!</para>
+  </blockquote>
+  <blockquote>
+    <title ezxhtml:level="3">Header level 3</title>
+    <title ezxhtml:level="4">Header level 4</title>
+    <para>foobar quote<link xlink:href="ezurl://1044" xlink:show="none">http://ez.no</link> for more info.</para>
+  </blockquote>
+</section>
+',
+                array(),
+            ),
+            array(
+                '<?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>test
+        <superscript>1
+            <emphasis role="strong">bold</emphasis>
+            <emphasis>italic</emphasis>
+            <emphasis role="underlined">underline</emphasis> superscript
+            <link xlink:href="http://ez.no" xlink:show="none" xlink:title="link tile">link</link>
+            <emphasis role="strikedthrough">strikedthrough</emphasis>
+        </superscript>
+    </para>
+</section>',
+                array(),
+            ),
+            array(
+                '<?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>test
+        <subscript>1
+            <emphasis role="strong">bold</emphasis>
+            <emphasis>italic</emphasis>
+            <emphasis role="underlined">underline</emphasis> subscript
+            <link xlink:href="http://ez.no" xlink:show="none" xlink:title="link tile">link</link>
+            <emphasis role="strikedthrough">strikedthrough</emphasis>
+        </subscript>
+    </para>
+</section>',
+                array(),
+            ),
         );
     }