Fix font triplet registration (weight and style were mixed)

Provide logger to PDF Document

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

diff --git a/src/java/org/apache/fop/render/pdf/PDFRenderer.java b/src/java/org/apache/fop/render/pdf/PDFRenderer.java
index aff0e6d8f6f0486334074dc7f97defedf82342cd..dc654b8da730c5f98a5da546a50a92a6c416ed73 100644 (file)
--- a/src/java/org/apache/fop/render/pdf/PDFRenderer.java
+++ b/src/java/org/apache/fop/render/pdf/PDFRenderer.java
@@ -259,8 +259,8 @@ public class PDFRenderer extends PrintRenderer {
             List tripleList = new java.util.ArrayList();
             for (int j = 0; j < triple.length; j++) {
                 tripleList.add(new FontTriplet(triple[j].getAttribute("name"),
-                                               triple[j].getAttribute("style"),
-                                               triple[j].getAttribute("weight")));
+                                               triple[j].getAttribute("weight"),
+                                               triple[j].getAttribute("style")));
             }
 
             EmbedFontInfo efi;
@@ -313,6 +313,7 @@ public class PDFRenderer extends PrintRenderer {
         ostream = stream;
         producer = "FOP " + Version.getVersion();
         this.pdfDoc = new PDFDocument(producer);
+        setupLogger(this.pdfDoc);
         this.pdfDoc.setCreator(creator);
         this.pdfDoc.setFilterMap(filterMap);
         this.pdfDoc.outputHeader(stream);