changed property to trait for areas

added ipd to area


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

2 files changed, 23 insertions, 23 deletions

diff --git a/src/org/apache/fop/render/pdf/PDFRenderer.java b/src/org/apache/fop/render/pdf/PDFRenderer.java
index 4713c38ef..0db612f8d 100644
--- a/src/org/apache/fop/render/pdf/PDFRenderer.java
+++ b/src/org/apache/fop/render/pdf/PDFRenderer.java
@@ -266,10 +266,10 @@ public class PDFRenderer extends PrintRenderer {
 
             FontState fs = null;
 
-            List props = word.getPropertyList();
+            List props = word.getTraitList();
             for(int count = 0; count < props.size(); count++) {
-                Property pro = (Property)props.get(count);
-                if(pro.propType == Property.FONT_STATE) {
+                Trait pro = (Trait)props.get(count);
+                if(pro.propType == Trait.FONT_STATE) {
                     fs = (FontState)pro.data;
                 }
             }
@@ -289,7 +289,7 @@ public class PDFRenderer extends PrintRenderer {
 
             int rx = currentBlockIPPosition;
             // int bl = pageHeight - currentBPPosition;
-            int bl = currentBPPosition;
+            int bl = currentBPPosition + word.getOffset();
 
             // Set letterSpacing
             //float ls = fs.getLetterSpacing() / this.currentFontSize;
@@ -530,7 +530,7 @@ public class PDFRenderer extends PrintRenderer {
     public void renderDocument(Document doc, String ns) {
         RendererContext context;
         context = new RendererContext(mimeType);
-        context.setLogger(log);
+        context.setUserAgent(userAgent);
 
         context.setProperty(PDFXMLHandler.PDF_DOCUMENT, pdfDoc);
         context.setProperty(PDFXMLHandler.PDF_STREAM, currentStream);
diff --git a/src/org/apache/fop/render/xml/XMLRenderer.java b/src/org/apache/fop/render/xml/XMLRenderer.java
index 999e983d4..8e9218eea 100644
--- a/src/org/apache/fop/render/xml/XMLRenderer.java
+++ b/src/org/apache/fop/render/xml/XMLRenderer.java
@@ -277,7 +277,7 @@ public class XMLRenderer extends AbstractRenderer {
 
     protected void renderBlock(Block block) {
         String prop = "";
-        List list = block.getPropertyList();
+        List list = block.getTraitList();
         if (list != null) {
             prop = " props=\"" + getPropString(list) + "\"";
         }
@@ -288,7 +288,7 @@ public class XMLRenderer extends AbstractRenderer {
 
     protected void renderLineArea(LineArea line) {
         String prop = "";
-        List list = line.getPropertyList();
+        List list = line.getTraitList();
         if (list != null) {
             prop = " props=\"" + getPropString(list) + "\"";
         }
@@ -326,7 +326,7 @@ public class XMLRenderer extends AbstractRenderer {
 
     public void renderCharacter(org.apache.fop.area.inline.Character ch) {
         String prop = "";
-        List list = ch.getPropertyList();
+        List list = ch.getTraitList();
         if (list != null) {
             prop = " props=\"" + getPropString(list) + "\"";
         }
@@ -339,7 +339,7 @@ public class XMLRenderer extends AbstractRenderer {
 
     public void renderWord(Word word) {
         String prop = "";
-        List list = word.getPropertyList();
+        List list = word.getTraitList();
         if (list != null) {
             prop = " props=\"" + getPropString(list) + "\"";
         }
@@ -376,45 +376,45 @@ public class XMLRenderer extends AbstractRenderer {
     protected String getPropString(List list) {
         String str = "";
         for (int count = 0; count < list.size(); count++) {
-            Property prop = (Property) list.get(count);
+            Trait prop = (Trait) list.get(count);
             switch (prop.propType) {
-                case Property.INTERNAL_LINK:
+                case Trait.INTERNAL_LINK:
                     str += "internal-link:" + prop.data;
                     break;
-                case Property.EXTERNAL_LINK:
+                case Trait.EXTERNAL_LINK:
                     str += "external-link:" + prop.data;
                     break;
-                case Property.FONT_FAMILY:
+                case Trait.FONT_FAMILY:
                     str += "font-family:" + prop.data;
                     break;
-                case Property.FONT_SIZE:
+                case Trait.FONT_SIZE:
                     str += "font-size:" + prop.data;
                     break;
-                case Property.FONT_WEIGHT:
+                case Trait.FONT_WEIGHT:
                     str += "font-weight:" + prop.data;
                     break;
-                case Property.FONT_STYLE:
+                case Trait.FONT_STYLE:
                     str += "font-style:" + prop.data;
                     break;
-                case Property.COLOR:
+                case Trait.COLOR:
                     str += "color:" + prop.data;
                     break;
-                case Property.BACKGROUND:
+                case Trait.BACKGROUND:
                     str += "background:" + prop.data;
                     break;
-                case Property.UNDERLINE:
+                case Trait.UNDERLINE:
                     str += "underline:" + prop.data;
                     break;
-                case Property.OVERLINE:
+                case Trait.OVERLINE:
                     str += "overline:" + prop.data;
                     break;
-                case Property.LINETHROUGH:
+                case Trait.LINETHROUGH:
                     str += "linethrough:" + prop.data;
                     break;
-                case Property.OFFSET:
+                case Trait.OFFSET:
                     str += "offset:" + prop.data;
                     break;
-                case Property.SHADOW:
+                case Trait.SHADOW:
                     str += "shadow:" + prop.data;
                     break;
                 default: