changed inline references to layout.inline

also renderers now render a word area


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

4 files changed, 8 insertions, 4 deletions

diff --git a/src/org/apache/fop/render/Renderer.java b/src/org/apache/fop/render/Renderer.java
index fb3bff7a3..5fcf18d16 100644
--- a/src/org/apache/fop/render/Renderer.java
+++ b/src/org/apache/fop/render/Renderer.java
@@ -55,6 +55,7 @@ import org.apache.fop.dom.svg.SVGArea;
 import org.apache.fop.image.ImageArea;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.layout.*;
+import org.apache.fop.layout.inline.*;
 
 // Java
 import java.io.OutputStream;
@@ -102,7 +103,7 @@ public interface Renderer {
     public void renderImageArea(ImageArea area);
 
     /** render the given inline area */
-    public void renderInlineArea(InlineArea area);
+    public void renderWordArea(WordArea area);
 
     /** render the given inline space */
     public void renderInlineSpace(InlineSpace space);
diff --git a/src/org/apache/fop/render/awt/AWTRenderer.java b/src/org/apache/fop/render/awt/AWTRenderer.java
index 1d6fd682f..52b90a7b1 100644
--- a/src/org/apache/fop/render/awt/AWTRenderer.java
+++ b/src/org/apache/fop/render/awt/AWTRenderer.java
@@ -10,6 +10,7 @@ package org.apache.fop.render.awt;
  */
 
 import org.apache.fop.layout.*;
+import org.apache.fop.layout.inline.*;
 import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.datatypes.*;
 import org.apache.fop.image.*;
@@ -542,7 +543,7 @@ public class AWTRenderer implements Renderer, Printable, Pageable {
 
     }
 
-    public void renderInlineArea(InlineArea area) {
+    public void renderWordArea(WordArea area) {
         char ch;
         StringBuffer pdf = new StringBuffer();
 
diff --git a/src/org/apache/fop/render/pdf/PDFRenderer.java b/src/org/apache/fop/render/pdf/PDFRenderer.java
index 275415462..0f29c65e6 100644
--- a/src/org/apache/fop/render/pdf/PDFRenderer.java
+++ b/src/org/apache/fop/render/pdf/PDFRenderer.java
@@ -59,6 +59,7 @@ import org.apache.fop.image.FopImage;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.*;
+import org.apache.fop.layout.inline.*;
 import org.apache.fop.datatypes.*;
 import org.apache.fop.svg.PathPoint;
 import org.apache.fop.pdf.*;
@@ -565,7 +566,7 @@ public class PDFRenderer implements Renderer {
        *
        * @param area inline area to render
        */
-    public void renderInlineArea(InlineArea area) {
+    public void renderWordArea(WordArea area) {
         char ch;
         StringBuffer pdf = new StringBuffer();
 
diff --git a/src/org/apache/fop/render/xml/XMLRenderer.java b/src/org/apache/fop/render/xml/XMLRenderer.java
index ff8e2defa..767ccab04 100644
--- a/src/org/apache/fop/render/xml/XMLRenderer.java
+++ b/src/org/apache/fop/render/xml/XMLRenderer.java
@@ -58,6 +58,7 @@ import org.apache.fop.dom.svg.SVGArea;
 import org.apache.fop.render.Renderer;
 import org.apache.fop.image.ImageArea;
 import org.apache.fop.layout.*;
+import org.apache.fop.layout.inline.*;
 import org.apache.fop.pdf.*;
 import org.apache.fop.fo.properties.LeaderPattern;
 
@@ -279,7 +280,7 @@ public class XMLRenderer implements Renderer {
      *
      * @param area the area to render
      */
-    public void renderInlineArea(InlineArea area) {
+    public void renderWordArea(WordArea area) {
 	String fontWeight = area.getFontState().getFontWeight();
 	StringBuffer sb = new StringBuffer();
 	String s = area.getText();