Skip to content

EZP-30732: Allows table cells to contain inlines and blocks #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
SerheyDolgushev wants to merge 3 commits into from
Closed

EZP-30732: Allows table cells to contain inlines and blocks #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c73523
EZP-30732: Allows table cells to contain inlines and blocks
SerheyDolgushev Aug 7, 2019
a011b56
EZP-30732: Test to validate blocks inside a table cell
SerheyDolgushev Aug 7, 2019
23ac9fb
EZP-30732: final fixes
SerheyDolgushev Aug 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions src/lib/eZ/RichText/Resources/schemas/docbook/ezpublish.rng
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,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.
Expand Down
19 changes: 19 additions & 0 deletions tests/lib/eZ/RichText/Validator/DocbookTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>',
[],
],
Expand Down