basic vertical alignment and height for lines

handles alignment.fo


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

2 files changed, 8 insertions, 2 deletions

diff --git a/src/org/apache/fop/fo/flow/Block.java b/src/org/apache/fop/fo/flow/Block.java
index 43f56705a..d234cc159 100644
--- a/src/org/apache/fop/fo/flow/Block.java
+++ b/src/org/apache/fop/fo/flow/Block.java
@@ -16,6 +16,7 @@ import org.apache.fop.apps.FOPException;
 import org.apache.fop.layoutmgr.LayoutManager;
 import org.apache.fop.layoutmgr.BlockLayoutManager;
 import org.apache.fop.util.CharUtilities;
+import org.apache.fop.apps.StreamRenderer;
 
 import org.xml.sax.Attributes;
 
@@ -370,12 +371,13 @@ public class Block extends FObjMixed {
 BlockLayoutManager blm = new BlockLayoutManager(this);
 TextInfo ti = new TextInfo();
 
-/*      try {
+      try {
     ti.fs = propMgr.getFontState(fontInfo);
       } catch (FOPException fopex) {
     log.error("Error setting FontState for characters: " +
         fopex.getMessage());
-      }*/
+      }
+            ti.lineHeight = this.lineHeight;
 
             ColorType c = getProperty("color").getColorType();
             ti.color = c;
diff --git a/src/org/apache/fop/fo/flow/InstreamForeignObject.java b/src/org/apache/fop/fo/flow/InstreamForeignObject.java
index 915e97bc3..9dc8682b6 100644
--- a/src/org/apache/fop/fo/flow/InstreamForeignObject.java
+++ b/src/org/apache/fop/fo/flow/InstreamForeignObject.java
@@ -24,6 +24,7 @@ import org.apache.fop.layout.RelativePositionProps;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.layoutmgr.LayoutManager;
 import org.apache.fop.layoutmgr.LeafNodeLayoutManager;
+import org.apache.fop.layoutmgr.LayoutInfo;
 
 import org.w3c.dom.Document;
 
@@ -136,6 +137,9 @@ public class InstreamForeignObject extends FObj {
         areaCurrent.setWidth((int)size.getX() * 1000);
         areaCurrent.setHeight((int)size.getY() * 1000);
         areaCurrent.setOffset(0);
+        areaCurrent.info = new LayoutInfo();
+        areaCurrent.info.alignment = properties.get("vertical-align").getEnum();
+        areaCurrent.info.lead = areaCurrent.getHeight();
 
         return areaCurrent;
     }