Added support for AFP font embedding. Note: this changes the default behaviour. Like with PDF and PS, all fonts are embedded by default unless matched in the "referenced-fonts" section in the configuration.

Added support for embedding external AFP form maps (form defs) using the afp:include-form-map extension.
Fixed a small problem with AFP-related events.
DefaultFOPResourceAccessor got a fallback to the user agent's base URI if no category base URI is specified.

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

2 files changed, 14 insertions, 3 deletions

diff --git a/test/layoutengine/standard-testcases/afp-extension_1.xml b/test/layoutengine/standard-testcases/afp-extension_1.xml
index 70bbef450..41659ab6d 100644
--- a/test/layoutengine/standard-testcases/afp-extension_1.xml
+++ b/test/layoutengine/standard-testcases/afp-extension_1.xml
@@ -36,8 +36,13 @@
           <fo:region-body/>
         </fo:simple-page-master>
       </fo:layout-master-set>
+      
+      <fo:declarations>
+        <afp:include-form-map name="FORMMAP1" src="file:../../resources/afp/F1SAMPLE.afp"/>
+      </fo:declarations>
+      
       <fo:page-sequence master-reference="normal" fox:test-ignore="this">
-        <afp:invoke-medium-map name="MYMAP"/>
+        <afp:invoke-medium-map name="NOPAR"/>
         <afp:tag-logical-element name="foo" value="bar"/>
         <fo:flow flow-name="xsl-region-body">
           <fo:block>Text on page <fo:page-number/>.</fo:block>
@@ -47,6 +52,9 @@
     </fo:root>
   </fo>
   <checks xmlns:afp="apache:fop:extensions:afp">
+    <eval expected="FORMMAP1" xpath="/areaTree/extension-attachments/afp:include-form-map/@name"/>
+    <eval expected="file:../../resources/afp/F1SAMPLE.afp" xpath="/areaTree/extension-attachments/afp:include-form-map/@src"/>
+    
     <eval expected="4" xpath="count(/areaTree/pageSequence/pageViewport[@nr=1]/page/extension-attachments/child::*)"/>
     <eval expected="O1SAMP1 " xpath="/areaTree/pageSequence/pageViewport[@nr=1]/page/extension-attachments/child::*[1]/@name"/>
     <eval expected="S1ISLOGO" xpath="/areaTree/pageSequence/pageViewport[@nr=1]/page/extension-attachments/child::*[2]/@name"/>
@@ -57,7 +65,7 @@
     <eval expected="4" xpath="count(/areaTree/pageSequence/pageViewport[@nr=2]/page/extension-attachments/child::*)"/>
     
     <eval expected="2" xpath="count(/areaTree/pageSequence/extension-attachments/child::*)"/>
-    <eval expected="MYMAP" xpath="/areaTree/pageSequence/extension-attachments/child::*[1]/@name"/>
+    <eval expected="NOPAR" xpath="/areaTree/pageSequence/extension-attachments/child::*[1]/@name"/>
     <eval expected="bar" xpath="/areaTree/pageSequence/extension-attachments/afp:tag-logical-element[@name = 'foo']/@value"/>
     
     <!-- This just tests if extension attributes make it through to the PageSequence object. -->
@@ -65,6 +73,9 @@
   </checks>
   <if-checks xmlns:if="http://xmlgraphics.apache.org/fop/intermediate"
         xmlns:afp="apache:fop:extensions:afp">
+    <eval expected="FORMMAP1" xpath="/if:document/if:header/afp:include-form-map/@name"/>
+    <eval expected="file:../../resources/afp/F1SAMPLE.afp" xpath="/if:document/if:header/afp:include-form-map/@src"/>
+    
     <eval expected="4" xpath="count(//if:page[@name = '1']/if:page-header/child::*)"/>
     <eval expected="O1SAMP1 " xpath="//if:page[@name = '1']/if:page-header/afp:include-page-overlay[1]/@name"/>
     <eval expected="S1ISLOGO" xpath="//if:page[@name = '1']/if:page-header/afp:include-page-segment[1]/@name"/>
@@ -74,7 +85,7 @@
     
     <eval expected="4" xpath="count(//if:page[@name = '2']/if:page-header/child::*)"/>
         
-    <eval expected="MYMAP" xpath="//if:page-sequence/afp:invoke-medium-map/@name"/>
+    <eval expected="NOPAR" xpath="//if:page-sequence/afp:invoke-medium-map/@name"/>
     <eval expected="bar" xpath="//if:page-sequence/afp:tag-logical-element[@name = 'foo']/@value"/>
 
     <!-- This just tests if extension attributes make it through to the PageSequence object. -->
diff --git a/test/resources/afp/F1SAMPLE.afp b/test/resources/afp/F1SAMPLE.afp
new file mode 100644
index 000000000..9dfd5b910
--- /dev/null
+++ b/test/resources/afp/F1SAMPLE.afp