Skip to content

Commit fe63ad0

Browse files
committed
[mod-fop] fix cell vertifcal align #104
1 parent a44bbc6 commit fe63ad0

File tree

3 files changed

+16
-1
lines changed

3 files changed

+16
-1
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
- [playground-quarkus] quarkus-version set to 3.6.1
1313

14+
### Fixed
15+
16+
- [mod-fop] fix cell vertifcal align #104
17+
1418
## [3.2.3] - 2023-12-05
1519

1620
- [val-p7m] P7MContentValidator (validate p7m and possibly its content with a facade)

fj-doc-mod-fop/src/main/resources/fj_doc_mod_fop_config/template/macro/doc_element.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ text-indent : text-indent
172172

173173
<#macro handleCellSpan cell><#if cell.columnSpan != 1> number-columns-spanned="${cell.columnSpan}"</#if><#if cell.rowSpan != 1> number-rows-spanned="${cell.rowSpan}"</#if></#macro>
174174

175-
<#macro handleVerticalAlign valignValue><#if valignValue = 5> vertical-align="middle"<#elseif valignValue = 4> vertical-align="top"<#elseif valignValue = 6> vertical-align="bottom"</#if></#macro>
175+
<#macro handleVerticalAlign valignValue><#if valignValue = 5> vertical-align="middle" display-align="center"<#elseif valignValue = 4> vertical-align="top"<#elseif valignValue = 6> vertical-align="bottom" display-align="after"</#if></#macro>
176176

177177
<#macro handleStyle styleValue><#if styleValue = 2> font-weight="bold"<#elseif styleValue = 3> text-decoration="underline"<#elseif styleValue = 4> font-style="italic"<#elseif styleValue = 5> font-style="italic" font-weight="bold"<#elseif styleValue = 1> font-style="normal" font-weight="normal"</#if></#macro>
178178

fj-doc-mod-fop/src/test/resources/sample/doc_alt_01.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,17 @@
4343
<para>King</para>
4444
</cell>
4545
</row>
46+
<row>
47+
<cell valign="middle">
48+
<para>Multi row text content to test vertical allign of other cells in the row</para>
49+
</cell>
50+
<cell valign="middle">
51+
<para>Elrond</para>
52+
</cell>
53+
<cell valign="bottom">
54+
<para>Gil-Galad</para>
55+
</cell>
56+
</row>
4657
</table>
4758
</body>
4859
</doc>

0 commit comments

Comments
 (0)