svn commit: r1704130 - /ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl

[jl...@apache.org]

Author: jleroux
Date: Sun Sep 20 13:42:16 2015
New Revision: 1704130

URL: http://svn.apache.org/viewvc?rev=1704130&view=rev
Log:
A patch from Christian Carlow for "FOP renderer doesn't apply title-area-style" https://issues.apache.org/jira/browse/OFBIZ-6356

NotoSans is the defaultFontFamily for FOP and the extra stylings and the font-weight="bold" are not rendered correctly unless changed to another font family

jleroux: this needs clarification, I will ask Christian 

Modified:
    ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl

Modified: ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl?rev=1704130&r1=1704129&r2=1704130&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl Sun Sep 20 13:42:16 2015
@@ -90,7 +90,7 @@ under the License.
 <#-- FIXME: this is an hack to avoid FOP rendering errors for empty lists (fo:table-body cannot be null) -->
 <fo:table-row><fo:table-cell><fo:block/></fo:table-cell></fo:table-row>
 </#macro>
-<#macro renderFormatHeaderRowCellOpen style positionSpan><fo:table-cell <#if positionSpan?has_content && positionSpan gt 1 >number-columns-spanned="${positionSpan}"</#if><@getFoStyle "listtitlestyle"/>><fo:block></#macro>
+<#macro renderFormatHeaderRowCellOpen style positionSpan><fo:table-cell <#if positionSpan?has_content && positionSpan gt 1 >number-columns-spanned="${positionSpan}"</#if><#if style?has_content><@getFoStyle "${style}"/><#else><@getFoStyle "listtitlestyle"/></#if>><fo:block></#macro>
 <#macro renderFormatHeaderRowCellClose></fo:block></fo:table-cell></#macro>
 
 <#macro renderFormatHeaderRowFormCellOpen style><fo:table-cell></#macro>