You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/12/24 14:45:03 UTC
svn commit: r1647782 - in /ofbiz/trunk: ./
applications/content/webapp/content/ framework/base/config/
framework/resources/fonts/ framework/resources/fonts/NotoSans/
framework/webapp/config/
Author: jleroux
Date: Wed Dec 24 13:45:03 2014
New Revision: 1647782
URL: http://svn.apache.org/r1647782
Log:
Implements "Improve the way FOP handles fonts notably for currency symbols" https://issues.apache.org/jira/browse/OFBIZ-5917
Adds
<auto-detect/>
in the fonts section of our fop.xconf
Adds the Google NotoSans font which is Apache licensed
* http://www.google.com/fonts/specimen/Noto+Sans
* https://www.google.com/get/noto/#/
Uses NotoSans as the default FOP font. For that puts the NotoSans font 4 files in framework/resources/fonts and add <directory>framework/resources/fonts/NotoSansFonts</directory> in fop.xconf
Renders ₹ in content/control/fonts.pdf as we do for €. Other symbols could be added later when needed, backed by Google NotoSans font...
Renders the NotoSans content/control/fonts.pdf as we do for other main fonts
Adds the rupee symbol (₹) to antisamy-esapi.xml file like we have the euro symbol (€)
Added:
ofbiz/trunk/framework/resources/fonts/
ofbiz/trunk/framework/resources/fonts/NotoSans/
ofbiz/trunk/framework/resources/fonts/NotoSans/NotoSans-Bold.ttf (with props)
ofbiz/trunk/framework/resources/fonts/NotoSans/NotoSans-BoldItalic.ttf (with props)
ofbiz/trunk/framework/resources/fonts/NotoSans/NotoSans-Italic.ttf (with props)
ofbiz/trunk/framework/resources/fonts/NotoSans/NotoSans-Regular.ttf (with props)
Modified:
ofbiz/trunk/LICENSE
ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl
ofbiz/trunk/framework/base/config/antisamy-esapi.xml
ofbiz/trunk/framework/webapp/config/fop.properties
ofbiz/trunk/framework/webapp/config/fop.xconf
Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1647782&r1=1647781&r2=1647782&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Wed Dec 24 13:45:03 2014
@@ -111,6 +111,7 @@ applications/content/lib/tika-parsers-1.
applications/product/lib/dozer-4.2.1.jar
applications/product/lib/watermarker-0.0.4.jar
framework/images/webapp/images/date/timezones*
+framework/resources/fonts/NotoSans/*
=========================================================================
Apache License
Version 2.0, January 2004
Modified: ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl?rev=1647782&r1=1647781&r2=1647782&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl Wed Dec 24 13:45:03 2014
@@ -1302,17 +1302,281 @@ Courier
</fo:table-body>
</fo:table>
</fo:block>
-
- <fo:block font-family="Helvetica" font-size="12pt">
- Some special characters:
+
+
+ <fo:block font-family="Helvetica" font-size="14pt">
+NotoSans
</fo:block>
- <fo:block space-after.optimum="10pt" font-family="Helvetica">
-Euro ( dec 8364, hex 20AC): €
+ <fo:block space-after.optimum="10pt" font-family="NotoSans" font-size="10pt">
+<fo:table>
+<fo:table-column column-width="65pt"/>
+<fo:table-column column-width="30pt"/>
+<fo:table-column column-width="65pt"/>
+<fo:table-column column-width="30pt"/>
+<fo:table-column column-width="65pt"/>
+<fo:table-column column-width="30pt"/>
+<fo:table-column column-width="65pt"/>
+<fo:table-body>
+<fo:table-row>
+<fo:table-cell>
+ <fo:block>
+&#x21; : !
+&#x22; : "
+&#x23; : #
+&#x24; : $
+&#x25; : %
+&#x26; : &
+&#x27; : '
+&#x28; : (
+&#x29; : )
+&#x2A; : *
+&#x2B; : +
+&#x2C; : ,
+&#x2D; : -
+&#x2E; : .
+&#x2F; : /
+&#x30; : 0
+&#x31; : 1
+&#x32; : 2
+&#x33; : 3
+&#x34; : 4
+&#x35; : 5
+&#x36; : 6
+&#x37; : 7
+&#x38; : 8
+&#x39; : 9
+&#x3A; : :
+&#x3B; : ;
+&#x3C; : <
+&#x3D; : =
+&#x3E; : >
+&#x3F; : ?
+&#x40; : @
+&#x41; : A
+&#x42; : B
+&#x43; : C
+&#x44; : D
+&#x45; : E
+&#x46; : F
+&#x47; : G
+&#x48; : H
+&#x49; : I
+&#x4A; : J
+&#x4B; : K
+&#x4C; : L
+&#x4D; : M
+&#x4E; : N
+&#x4F; : O
+&#x50; : P
+&#x51; : Q
+&#x52; : R
+&#x53; : S
+&#x54; : T
+&#x55; : U
+ </fo:block>
+</fo:table-cell>
+<fo:table-cell>
+ <fo:block>
+ </fo:block>
+</fo:table-cell>
+<fo:table-cell>
+ <fo:block>
+&#x56; : V
+&#x57; : W
+&#x58; : X
+&#x59; : Y
+&#x5A; : Z
+&#x5B; : [
+&#x5C; : \
+&#x5D; : ]
+&#x5E; : ^
+&#x5F; : _
+&#x60; : `
+&#x61; : a
+&#x62; : b
+&#x63; : c
+&#x64; : d
+&#x65; : e
+&#x66; : f
+&#x67; : g
+&#x68; : h
+&#x69; : i
+&#x6A; : j
+&#x6B; : k
+&#x6C; : l
+&#x6D; : m
+&#x6E; : n
+&#x6F; : o
+&#x70; : p
+&#x71; : q
+&#x72; : r
+&#x73; : s
+&#x74; : t
+&#x75; : u
+&#x76; : v
+&#x77; : w
+&#x78; : x
+&#x79; : y
+&#x7A; : z
+&#x7B; : {
+&#x7C; : |
+&#x7D; : }
+&#x7E; : ~
+&#xA1; : ¡
+&#xA2; : ¢
+&#xA3; : £
+&#xA4; : ¤
+&#xA5; : ¥
+&#xA6; : ¦
+&#xA7; : §
+&#xA8; : ¨
+&#xA9; : ©
+&#xAA; : ª
+&#xAB; : «
+&#xAC; : ¬
+ </fo:block>
+</fo:table-cell>
+<fo:table-cell>
+ <fo:block>
+ </fo:block>
+</fo:table-cell>
+<fo:table-cell>
+ <fo:block>
+&#xAE; : ®
+&#xAF; : ¯
+&#xB0; : °
+&#xB1; : ±
+&#xB2; : ²
+&#xB3; : ³
+&#xB4; : ´
+&#xB5; : µ
+&#xB6; : ¶
+&#xB7; : ·
+&#xB8; : ¸
+&#xB9; : ¹
+&#xBA; : º
+&#xBB; : »
+&#xBC; : ¼
+&#xBD; : ½
+&#xBE; : ¾
+&#xBF; : ¿
+&#xC0; : À
+&#xC1; : Á
+&#xC2; : Â
+&#xC3; : Ã
+&#xC4; : Ä
+&#xC5; : Å
+&#xC6; : Æ
+&#xC7; : Ç
+&#xC8; : È
+&#xC9; : É
+&#xCA; : Ê
+&#xCB; : Ë
+&#xCC; : Ì
+&#xCD; : Í
+&#xCE; : Î
+&#xCF; : Ï
+&#xD0; : Ð
+&#xD1; : Ñ
+&#xD2; : Ò
+&#xD3; : Ó
+&#xD4; : Ô
+&#xD5; : Õ
+&#xD6; : Ö
+&#xD7; : ×
+&#xD8; : Ø
+&#xD9; : Ù
+&#xDA; : Ú
+&#xDB; : Û
+&#xDC; : Ü
+&#xDD; : Ý
+&#xDE; : Þ
+&#xDF; : ß
+&#xE0; : à
+&#xE1; : á
+&#xE2; : â
+ </fo:block>
+</fo:table-cell>
+<fo:table-cell>
+ <fo:block>
+ </fo:block>
+</fo:table-cell>
+<fo:table-cell>
+ <fo:block>
+&#xE3; : ã
+&#xE4; : ä
+&#xE5; : å
+&#xE6; : æ
+&#xE7; : ç
+&#xE8; : è
+&#xE9; : é
+&#xEA; : ê
+&#xEB; : ë
+&#xEC; : ì
+&#xED; : í
+&#xEE; : î
+&#xEF; : ï
+&#xF0; : ð
+&#xF1; : ñ
+&#xF2; : ò
+&#xF3; : ó
+&#xF4; : ô
+&#xF5; : õ
+&#xF6; : ö
+&#xF7; : ÷
+&#xF8; : ø
+&#xF9; : ù
+&#xFA; : ú
+&#xFB; : û
+&#xFC; : ü
+&#xFD; : ý
+&#xFE; : þ
+&#xFF; : ÿ
+&#x0152; : Œ
+&#x0153; : œ
+&#x0160; : Š
+&#x0161; : š
+&#x0178; : Ÿ
+&#x017D; : Ž
+&#x017E; : ž
+&#x0192; : ƒ
+&#x02DC; : ˜
+&#x2013; : –
+&#x2014; : —
+&#x2018; : ‘
+&#x2019; : ’
+&#x201A; : ‚
+&#x201C; : “
+&#x201D; : ”
+&#x201E; : „
+&#x2020; : †
+&#x2021; : ‡
+&#x2022; : •
+&#x2026; : …
+&#x2030; : ‰
+&#x2039; : ‹
+&#x203A; : ›
+&#x2122; : ™
+ </fo:block>
+</fo:table-cell>
+</fo:table-row>
+</fo:table-body>
+</fo:table>
</fo:block>
+
- <fo:block space-after.optimum="10pt" font-family="Helvetica">
-
+ <fo:block font-family="Helvetica" font-size="12pt">
+Some special characters:
+ </fo:block>
+ <fo:block font-family="Helvetica" font-size="12pt">
+Euro symbol in Helvetica 12 ( dec 8364, hex 20AC): €
+ </fo:block>
+ <fo:block font-family="NotoSans" font-size="12pt">
+Ruppe symbol in NotoSans 12 (dec 8377, hex 20B9): ₹
+ </fo:block>
+ <fo:block font-family="NotoSans" font-size="12pt">
+I ♥ NotoSans!
</fo:block>
</fo:flow>
Modified: ofbiz/trunk/framework/base/config/antisamy-esapi.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/antisamy-esapi.xml?rev=1647782&r1=1647781&r2=1647782&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/antisamy-esapi.xml (original)
+++ ofbiz/trunk/framework/base/config/antisamy-esapi.xml Wed Dec 24 13:45:03 2014
@@ -479,5 +479,6 @@ OFBiz additional allowed tags:
<!-- rsaquo is proposed but not yet ISO standardized -->
<entity name="euro" cdata="&#8364;"/> <!--euro sign, U+20AC NEW -->
<entity name="rupee" cdata="&#8377;"/> <!--rupee sign, U+20B9 NEW -->
+ <entity name="rupee" cdata="&#8377;"/> <!--rupee sign, U+20B9 NEW -->
</html-entities>
</anti-samy-rules>
Added: ofbiz/trunk/framework/resources/fonts/NotoSans/NotoSans-Bold.ttf
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/resources/fonts/NotoSans/NotoSans-Bold.ttf?rev=1647782&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ofbiz/trunk/framework/resources/fonts/NotoSans/NotoSans-Bold.ttf
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ofbiz/trunk/framework/resources/fonts/NotoSans/NotoSans-BoldItalic.ttf
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/resources/fonts/NotoSans/NotoSans-BoldItalic.ttf?rev=1647782&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ofbiz/trunk/framework/resources/fonts/NotoSans/NotoSans-BoldItalic.ttf
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ofbiz/trunk/framework/resources/fonts/NotoSans/NotoSans-Italic.ttf
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/resources/fonts/NotoSans/NotoSans-Italic.ttf?rev=1647782&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ofbiz/trunk/framework/resources/fonts/NotoSans/NotoSans-Italic.ttf
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ofbiz/trunk/framework/resources/fonts/NotoSans/NotoSans-Regular.ttf
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/resources/fonts/NotoSans/NotoSans-Regular.ttf?rev=1647782&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ofbiz/trunk/framework/resources/fonts/NotoSans/NotoSans-Regular.ttf
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: ofbiz/trunk/framework/webapp/config/fop.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/config/fop.properties?rev=1647782&r1=1647781&r2=1647782&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/config/fop.properties (original)
+++ ofbiz/trunk/framework/webapp/config/fop.properties Wed Dec 24 13:45:03 2014
@@ -21,7 +21,7 @@
fop.path=/framework/webapp/config
#Set default font family
-fop.font.family=any
+fop.font.family=NotoSans
#Set font base url
fop.font.base.url=/framework/webapp/config/
Modified: ofbiz/trunk/framework/webapp/config/fop.xconf
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/config/fop.xconf?rev=1647782&r1=1647781&r2=1647782&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/config/fop.xconf (original)
+++ ofbiz/trunk/framework/webapp/config/fop.xconf Wed Dec 24 13:45:03 2014
@@ -95,6 +95,8 @@ the location of this file.
<font-triplet name="ArialMT" style="normal" weight="bold"/>
</font>
-->
+ <auto-detect/>
+ <directory>framework/resources/fonts/NotoSans</directory>
</fonts>
<!-- This option lets you specify additional options on an XML handler -->