FOP-3087 Add fonts element after auto-detect element is added to itHEADmain

5 files changed, 24 insertions, 6 deletions

diff --git a/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java b/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java
index 2aca0cd96..3ac9e9d62 100644
--- a/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java
+++ b/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java
@@ -160,9 +160,9 @@ public abstract class AbstractFOPTranscoder extends SVGAbstractTranscoder implem
             if (autoFonts) {
                 DefaultConfiguration c = new DefaultConfiguration("cfg");
                 DefaultConfiguration fonts = new DefaultConfiguration("fonts");
-                c.addChild(fonts);
                 DefaultConfiguration autodetect = new DefaultConfiguration("auto-detect");
                 fonts.addChild(autodetect);
+                c.addChild(fonts);
                 effCfg = c;
             }
         }
diff --git a/fop-core/src/test/java/org/apache/fop/AbstractBasicTranscoderTest.java b/fop-core/src/test/java/org/apache/fop/svg/AbstractBasicTranscoderTest.java
index 7a40b353a..f7abc1d5f 100644
--- a/fop-core/src/test/java/org/apache/fop/AbstractBasicTranscoderTest.java
+++ b/fop-core/src/test/java/org/apache/fop/svg/AbstractBasicTranscoderTest.java
@@ -17,7 +17,7 @@
 
 /* $Id$ */
 
-package org.apache.fop;
+package org.apache.fop.svg;
 
 import java.io.File;
 import java.io.InputStream;
diff --git a/fop-core/src/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java b/fop-core/src/test/java/org/apache/fop/svg/BasicPDFTranscoderTestCase.java
index 0f20a1967..14b1cda89 100644
--- a/fop-core/src/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/svg/BasicPDFTranscoderTestCase.java
@@ -17,11 +17,15 @@
 
 /* $Id$ */
 
-package org.apache.fop;
+package org.apache.fop.svg;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
 
 import org.apache.batik.transcoder.Transcoder;
 
-import org.apache.fop.svg.PDFTranscoder;
+import org.apache.fop.configuration.Configuration;
 
 /**
  * Basic runtime test for the PDF transcoder. It is used to verify that
@@ -34,4 +38,18 @@ public class BasicPDFTranscoderTestCase extends AbstractBasicTranscoderTest {
         return new PDFTranscoder();
     }
 
+    @Test
+    public void testFontAutoDetect() {
+        //Create transcoder
+        PDFTranscoder transcoder = (PDFTranscoder) createTranscoder();
+
+        Configuration effectiveConfiguration = transcoder.getEffectiveConfiguration();
+        Configuration autoDetectConf = effectiveConfiguration.getChild("fonts").getChild("auto-detect");
+
+        assertEquals("The auto-detect conf must be added to it's parent (fonts) "
+                        + "before the parent (fonts) is added to cfg",
+                "DefaultConfiguration",
+                autoDetectConf.getClass().getSimpleName());
+    }
+
 }
diff --git a/fop-core/src/test/java/org/apache/fop/BasicPSTranscoderTestCase.java b/fop-core/src/test/java/org/apache/fop/svg/BasicPSTranscoderTestCase.java
index 2d6fc0d81..658da9cf9 100644
--- a/fop-core/src/test/java/org/apache/fop/BasicPSTranscoderTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/svg/BasicPSTranscoderTestCase.java
@@ -17,7 +17,7 @@
 
 /* $Id$ */
 
-package org.apache.fop;
+package org.apache.fop.svg;
 
 import org.apache.batik.transcoder.Transcoder;
 
diff --git a/fop-core/src/test/java/org/apache/fop/BasicTranscoderTestSuite.java b/fop-core/src/test/java/org/apache/fop/svg/BasicTranscoderTestSuite.java
index a372f737a..97c0be595 100644
--- a/fop-core/src/test/java/org/apache/fop/BasicTranscoderTestSuite.java
+++ b/fop-core/src/test/java/org/apache/fop/svg/BasicTranscoderTestSuite.java
@@ -17,7 +17,7 @@
 
 /* $Id$ */
 
-package org.apache.fop;
+package org.apache.fop.svg;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;