You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by cr...@apache.org on 2016/07/13 05:15:13 UTC
svn commit: r1752365 - in /forrest/trunk: main/webapp/locationmap-skins.xml
main/webapp/resources.xmap main/webapp/sitemap.xmap site-author/status.xml
Author: crossley
Date: Wed Jul 13 05:15:13 2016
New Revision: 1752365
URL: http://svn.apache.org/viewvc?rev=1752365&view=rev
Log:
Enable web font file formats to be used.
Issue: FOR-1257
Modified:
forrest/trunk/main/webapp/locationmap-skins.xml
forrest/trunk/main/webapp/resources.xmap
forrest/trunk/main/webapp/sitemap.xmap
forrest/trunk/site-author/status.xml
Modified: forrest/trunk/main/webapp/locationmap-skins.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/locationmap-skins.xml?rev=1752365&r1=1752364&r2=1752365&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-skins.xml (original)
+++ forrest/trunk/main/webapp/locationmap-skins.xml Wed Jul 13 05:15:13 2016
@@ -50,6 +50,13 @@
<location src="{forrest:forrest.context}/skins/common/css/{1}.css" />
</select>
</match>
+ <match pattern="skin.fonts.**">
+ <select>
+ <location src="{properties:skins-dir}{forrest:forrest.skin}/fonts/{1}" />
+ <location src="{forrest:forrest.context}/skins/{forrest:forrest.skin}/fonts/{1}" />
+ <location src="{forrest:forrest.context}/skins/common/fonts/{1}" />
+ </select>
+ </match>
<match pattern="skin.images.corner.**.*">
<select>
<location src="{properties:skins-dir}{forrest:forrest.skin}/{1}/{2}.svg.xslt"/>
Modified: forrest/trunk/main/webapp/resources.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources.xmap?rev=1752365&r1=1752364&r2=1752365&view=diff
==============================================================================
--- forrest/trunk/main/webapp/resources.xmap (original)
+++ forrest/trunk/main/webapp/resources.xmap Wed Jul 13 05:15:13 2016
@@ -160,6 +160,22 @@ $Revision: 1.13 $
<map:match pattern="**css/**.css">
<map:read src="{lm:project.css.{2}}" mime-type="text/css" />
</map:match>
+<!-- skin-level fonts -->
+ <map:match pattern="**fonts/**.woff2">
+ <map:read src="{lm:skin.fonts.{2}.woff2}" mime-type="font/woff2" />
+ </map:match>
+ <map:match pattern="**fonts/**.woff">
+ <map:read src="{lm:skin.fonts.{2}.woff}" mime-type="application/font-woff" />
+ </map:match>
+ <map:match pattern="**fonts/**.svg">
+ <map:read src="{lm:skin.fonts.{2}.svg}" mime-type="image/svg+xml" />
+ </map:match>
+ <map:match pattern="**fonts/**.eot">
+ <map:read src="{lm:skin.fonts.{2}.eot}" mime-type="application/vnd.ms-fontobject" />
+ </map:match>
+ <map:match pattern="**fonts/**.ttf">
+ <map:read src="{lm:skin.fonts.{2}.ttf}" mime-type="application/font-sfnt" />
+ </map:match>
<!-- special case corner generator pipeline -->
<map:match pattern="skin/images**/*c-*-*-*-1*-2*-3*.png">
<map:call resource="read-svg2png-corner-resource">
Modified: forrest/trunk/main/webapp/sitemap.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/sitemap.xmap?rev=1752365&r1=1752364&r2=1752365&view=diff
==============================================================================
--- forrest/trunk/main/webapp/sitemap.xmap (original)
+++ forrest/trunk/main/webapp/sitemap.xmap Wed Jul 13 05:15:13 2016
@@ -613,6 +613,9 @@ $Revision: 1.12 $
<map:match pattern="**.ico">
<map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
</map:match>
+ <map:match type="regexp" pattern="^(.+)?fonts/.+\.(woff2|woff|svg|eot|ttf)$">
+ <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
+ </map:match>
<map:match type="regexp" pattern="^.+$">
<map:select type="exists">
<map:when test="{lm:project.{0}}">
Modified: forrest/trunk/site-author/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=1752365&r1=1752364&r2=1752365&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Wed Jul 13 05:15:13 2016
@@ -153,7 +153,13 @@
Added document to facilitate
<link href="site:upgrading_010">upgrading to v0.10-dev</link>
</action>
-<!-- 2015-## -->
+<!-- 2016-## -->
+<!-- 2016-07 -->
+ <action context="code" type="add" dev="DC" fixes-bug="FOR-1257">
+ Enabled web font file formats to be used. For example, the new
+ Bootstrap-based CSS skin "fleece" uses
+ <link href="http://glyphicons.com/">GLYPHICONS Halflings</link> font.
+ </action>
<!-- 2015-11 -->
<action context="code" type="add" dev="DC" fixes-bug="FOR-1255">
Backported the feature from the "scales" skin to the "pelt" skin for