Skip to content

Commit bb2fd3c

Browse files
Merge remote-tracking branch 'ibexa/4.1' into main
2 parents a5b2274 + 9bb31bd commit bb2fd3c

File tree

4 files changed

+12
-0
lines changed

4 files changed

+12
-0
lines changed

src/bundle/Resources/richtext/schemas/docbook/ezpublish.rng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,7 @@
777777
<value>left</value>
778778
<value>center</value>
779779
<value>right</value>
780+
<value>justify</value>
780781
</choice>
781782
</attribute>
782783
</define>

tests/lib/RichText/Converter/Xslt/_fixtures/docbook/031-ezstyle.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
<eztemplate name="highlighted_block" type="style" ezxhtml:align="center">
1414
<ezcontent>Highlighted block with "center" align.</ezcontent>
1515
</eztemplate>
16+
<eztemplate name="highlighted_block" type="style" ezxhtml:align="justify">
17+
<ezcontent>Highlighted block with "justify" align.</ezcontent>
18+
</eztemplate>
1619
<eztemplate name="highlighted_block" type="style">
1720
<ezcontent><literallayout>Highlighted block with multiple lines
1821
Highlighted block with multiple lines

tests/lib/RichText/Converter/Xslt/_fixtures/xhtml5/edit/031-ezstyle.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<div data-ezelement="eztemplate" data-eztype="style" data-ezname="highlighted_block" style="text-align:left;">Highlighted block with "left" align.</div>
44
<div data-ezelement="eztemplate" data-eztype="style" data-ezname="highlighted_block" style="text-align:right;">Highlighted block with "right" align.</div>
55
<div data-ezelement="eztemplate" data-eztype="style" data-ezname="highlighted_block" style="text-align:center;">Highlighted block with "center" align.</div>
6+
<div data-ezelement="eztemplate" data-eztype="style" data-ezname="highlighted_block" style="text-align:justify;">Highlighted block with "justify" align.</div>
67
<div data-ezelement="eztemplate" data-eztype="style" data-ezname="highlighted_block">Highlighted block with multiple lines<br/>Highlighted block with multiple lines<br/>Highlighted block with multiple lines</div>
78
<div data-ezelement="eztemplate" data-eztype="style" data-ezname="highlighted_block">Highlighted block with multiple lines and emphasis<br/><strong>Highlighted block with multiple lines and emphasis</strong><br/>Highlighted block with multiple lines and emphasis</div>
89
</section>

tests/lib/RichText/Converter/Xslt/_fixtures/xhtml5/output/031-ezstyle.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@
2121
</param>
2222
<param name="align">center</param>
2323
</template-output>
24+
<template-output is-inline="false" name="highlighted_block" type="style">
25+
<param name="name">highlighted_block</param>
26+
<param name="content">
27+
<section>Highlighted block with "justify" align.</section>
28+
</param>
29+
<param name="align">justify</param>
30+
</template-output>
2431
<template-output is-inline="false" name="highlighted_block" type="style">
2532
<param name="name">highlighted_block</param>
2633
<param name="content">

0 commit comments

Comments
 (0)