From 7c73523390355fd001fd51fbc7394b3c2922b1be Mon Sep 17 00:00:00 2001
From: Serhey Dolgushev <dolgushev.serhey@gmail.com>
Date: Wed, 7 Aug 2019 16:04:09 +0300
Subject: [PATCH 1/3] EZP-30732: Allows table cells to contain inlines and
 blocks

---
 .../Resources/schemas/docbook/ezpublish.rng   | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/lib/eZ/RichText/Resources/schemas/docbook/ezpublish.rng b/src/lib/eZ/RichText/Resources/schemas/docbook/ezpublish.rng
index ea3f1f7f..3d5b8b84 100644
--- a/src/lib/eZ/RichText/Resources/schemas/docbook/ezpublish.rng
+++ b/src/lib/eZ/RichText/Resources/schemas/docbook/ezpublish.rng
@@ -462,6 +462,30 @@
     <define name="db.wordasword"><notAllowed/></define>
     <define name="db.xref"><notAllowed/></define>
     <define name="db.year"><notAllowed/></define>
+
+    <define name="db.html.th">
+      <element name="th">
+        <a:documentation>A table header entry in an HTML table</a:documentation>
+        <ref name="db.html.th.attlist"/>
+        <zeroOrMore>
+          <choice>
+            <ref name="db.all.inlines"/>
+            <ref name="db.all.blocks"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="db.html.td">
+      <element name="td">
+        <a:documentation>A table entry in an HTML table</a:documentation>
+        <zeroOrMore>
+          <choice>
+            <ref name="db.all.inlines"/>
+            <ref name="db.all.blocks"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
   </include>
 
   <define name="ez.db.section">

From a011b5650c41031df672525379ef7437f5de6965 Mon Sep 17 00:00:00 2001
From: Serhey Dolgushev <dolgushev.serhey@gmail.com>
Date: Wed, 7 Aug 2019 16:15:24 +0300
Subject: [PATCH 2/3] EZP-30732: Test to validate blocks inside a table cell

---
 .../lib/eZ/RichText/Validator/DocbookTest.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/lib/eZ/RichText/Validator/DocbookTest.php b/tests/lib/eZ/RichText/Validator/DocbookTest.php
index bc2f6b77..a7f39b2f 100644
--- a/tests/lib/eZ/RichText/Validator/DocbookTest.php
+++ b/tests/lib/eZ/RichText/Validator/DocbookTest.php
@@ -111,6 +111,25 @@ public function providerForTestValidate()
             <emphasis role="strikedthrough">strikedthrough</emphasis>
         </subscript>
     </para>
+</section>',
+                [],
+            ],
+            [
+                '<?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">
+    <informaltable width="100%" border="1">
+        <tbody>
+            <tr>
+                <td>
+                    <blockquote/>
+                </td>
+            </tr>
+        </tbody>
+    </informaltable>
 </section>',
                 [],
             ],

From 23ac9fbb9141c7474979ec214b9fe905b9d30018 Mon Sep 17 00:00:00 2001
From: Serhey Dolgushev <dolgushev.serhey@gmail.com>
Date: Wed, 7 Aug 2019 17:38:36 +0300
Subject: [PATCH 3/3] EZP-30732: final fixes

---
 .../Resources/schemas/docbook/ezpublish.rng   | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/lib/eZ/RichText/Resources/schemas/docbook/ezpublish.rng b/src/lib/eZ/RichText/Resources/schemas/docbook/ezpublish.rng
index 3d5b8b84..6a77e1d8 100644
--- a/src/lib/eZ/RichText/Resources/schemas/docbook/ezpublish.rng
+++ b/src/lib/eZ/RichText/Resources/schemas/docbook/ezpublish.rng
@@ -462,30 +462,6 @@
     <define name="db.wordasword"><notAllowed/></define>
     <define name="db.xref"><notAllowed/></define>
     <define name="db.year"><notAllowed/></define>
-
-    <define name="db.html.th">
-      <element name="th">
-        <a:documentation>A table header entry in an HTML table</a:documentation>
-        <ref name="db.html.th.attlist"/>
-        <zeroOrMore>
-          <choice>
-            <ref name="db.all.inlines"/>
-            <ref name="db.all.blocks"/>
-          </choice>
-        </zeroOrMore>
-      </element>
-    </define>
-    <define name="db.html.td">
-      <element name="td">
-        <a:documentation>A table entry in an HTML table</a:documentation>
-        <zeroOrMore>
-          <choice>
-            <ref name="db.all.inlines"/>
-            <ref name="db.all.blocks"/>
-          </choice>
-        </zeroOrMore>
-      </element>
-    </define>
   </include>
 
   <define name="ez.db.section">
@@ -856,6 +832,30 @@
     </optional>
   </define>
 
+  <define name="db.html.th" combine="choice">
+    <element name="th">
+      <a:documentation>A table header entry in an HTML table</a:documentation>
+      <ref name="db.html.th.attlist"/>
+      <zeroOrMore>
+        <choice>
+          <ref name="db.all.inlines"/>
+          <ref name="db.all.blocks"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="db.html.td" combine="choice">
+    <element name="td">
+      <a:documentation>A table entry in an HTML table</a:documentation>
+      <zeroOrMore>
+        <choice>
+          <ref name="db.all.inlines"/>
+          <ref name="db.all.blocks"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+
   <div>
     <a:documentation>
       Adding child ezattribute element to the selected elements.