Added support for relative font config URLs (metrics-url and embed-url). These URLs are now resolved through the FOP config URI resolver. A new configuration item font-base has been added which defines the base URL to be used for resolution of the font URLs. If it is not given the normal FOP base URL is used. Unrelated to this feature the patch also contains a new image class (java 1.4 specific) for JPEG images. This is for renderers (e.g. AFP) which require access to the decoded JPEG.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@366718 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 19 insertions, 4 deletions

diff --git a/src/documentation/content/xdocs/trunk/configuration.xml b/src/documentation/content/xdocs/trunk/configuration.xml
index 0b845bcf9..258b5ac04 100644
--- a/src/documentation/content/xdocs/trunk/configuration.xml
+++ b/src/documentation/content/xdocs/trunk/configuration.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 <!--
-  Copyright 1999-2005 The Apache Software Foundation
+  Copyright 1999-2006 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -71,6 +71,13 @@
         <td>Specifies the base URL based on which relative URL will be resolved.</td>
       </tr>
       <tr>
+        <td>font-base</td>
+        <td>URL</td>
+        <td>Specifies the base URL based on which relative font URLs will be resolved.
+        If not specified defaults to the base URL above.
+        </td>
+      </tr>
+      <tr>
         <td>source-resolution</td>
         <td>Integer, dpi</td>
         <td>
@@ -132,6 +139,9 @@
   <!-- Base URL for resolving relative URLs -->
   <base>./</base>
 
+  <!-- Font Base URL for resolving relative font URLs -->
+  <font-base>./</font-base>
+
   <!-- Source resolution in dpi (dots/pixels per inch) for determining the size of pixels in SVG and bitmap images, default: 72dpi -->
   <source-resolution>72</source-resolution>
   <!-- Target resolution in dpi (dots/pixels per inch) for specifying the target resolution for generated bitmaps, default: 72dpi -->
diff --git a/src/documentation/content/xdocs/trunk/embedding.xml b/src/documentation/content/xdocs/trunk/embedding.xml
index 9833faa0f..3dd1115ab 100644
--- a/src/documentation/content/xdocs/trunk/embedding.xml
+++ b/src/documentation/content/xdocs/trunk/embedding.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 <!--
-  Copyright 1999-2005 The Apache Software Foundation
+  Copyright 1999-2006 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -274,6 +274,12 @@ Fop fop = new Fop(MimeConstants.MIME_POSTSCRIPT, userAgent);]]></source>
       </li>
       <li>
         <p>
+          The <strong>font base URL</strong> to use when resolving relative URLs for fonts. Example:
+        </p>
+        <source>userAgent.setFontBaseURL("file:///C:/Temp/fonts");</source>
+      </li>
+      <li>
+        <p>
           Disable <strong>strict validation</strong>. When disabled FOP is less strict about the rules established by the XSL-FO specification. Example:
         </p>
         <source>userAgent.setStrictValidation(false);</source>
diff --git a/src/documentation/content/xdocs/trunk/fonts.xml b/src/documentation/content/xdocs/trunk/fonts.xml
index 13478a5c1..683fa355b 100644
--- a/src/documentation/content/xdocs/trunk/fonts.xml
+++ b/src/documentation/content/xdocs/trunk/fonts.xml
@@ -241,9 +241,8 @@ It will display all of the font names and exit with an Exception.</p>
         <ul>
           <li>
             URLs are used to access the font metric and font files.
-            <!--Relative URLs are resolved relative to the fontBaseDir property (or baseDir) if available.-->
+            Relative URLs are resolved relative to the font-base property (or base) if available.
             See <a href="configuration.html">FOP: Configuration</a> for more information.
-            <note>Relative font URLs are currently not possible. You need to specify absolute URLs. Patches are welcome! :-)</note>
           </li>
           <li>The "kerning" and "embed-url" attributes are optional. Kerning is currently not used at all. If embedding is off, the output will position the text correctly (from the metrics file), but it will not be displayed or printed correctly unless the viewer has the applicable font available to their local system.</li>
           <li>When setting the embed-url attribute for Type 1 fonts, be sure to specify the PFB (actual font data), not PFM (font metrics) file that you used to generate the XML font metrics file.</li>