You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2005/08/12 11:50:32 UTC
svn commit: r232250 [2/2] - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/area/ src/java/org/apache/fop/area/inline/
src/java/org/apache/fop/fo/ src/java/org/apache/fop/fo/flow/
src/java/org/apache/fop/layoutmgr/ src/java/org/apache/fop/layoutmgr/...
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java?rev=232250&r1=232249&r2=232250&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java Fri Aug 12 02:50:01 2005
@@ -52,6 +52,7 @@
import org.apache.fop.area.inline.ForeignObject;
import org.apache.fop.area.inline.Image;
import org.apache.fop.area.inline.InlineArea;
+import org.apache.fop.area.inline.InlineBlockParent;
import org.apache.fop.area.inline.InlineParent;
import org.apache.fop.area.inline.Leader;
import org.apache.fop.area.inline.Space;
@@ -116,22 +117,22 @@
}
/**
- * @see org.apache.fop.render.Renderer
+ * @see org.apache.fop.render.Renderer#setupFontInfo(FontInfo)
*/
public abstract void setupFontInfo(FontInfo fontInfo);
/**
- * @see org.apache.fop.render.Renderer
+ * @see org.apache.fop.render.Renderer#setUserAgent(FOUserAgent)
*/
public void setUserAgent(FOUserAgent agent) {
userAgent = agent;
}
- /** @see org.apache.fop.render.Renderer */
+ /** @see org.apache.fop.render.Renderer#startRenderer(OutputStream) */
public void startRenderer(OutputStream outputStream)
throws IOException { }
- /** @see org.apache.fop.render.Renderer */
+ /** @see org.apache.fop.render.Renderer#stopRenderer() */
public void stopRenderer()
throws IOException { }
@@ -148,7 +149,7 @@
}
/**
- * @see org.apache.fop.render.Renderer
+ * @see org.apache.fop.render.Renderer#processOffDocumentItem(OffDocumentItem)
*/
public void processOffDocumentItem(OffDocumentItem oDI) { }
@@ -159,7 +160,7 @@
* page should not be rendered. The page will be rendered at a later time
* by the call to render page.
*
- * @see org.apache.fop.render.Renderer
+ * @see org.apache.fop.render.Renderer#preparePage(PageViewport)
*/
public void preparePage(PageViewport page) { }
@@ -196,14 +197,14 @@
return sb.toString();
}
- /** @see org.apache.fop.render.Renderer */
+ /** @see org.apache.fop.render.Renderer#startPageSequence(LineArea) */
public void startPageSequence(LineArea seqTitle) {
//do nothing
}
// normally this would be overriden to create a page in the
// output
- /** @see org.apache.fop.render.Renderer */
+ /** @see org.apache.fop.render.Renderer#renderPage(PageViewport) */
public void renderPage(PageViewport page)
throws IOException, FOPException {
@@ -501,6 +502,7 @@
+ parent.getStartIndent()
+ line.getStartIndent();
renderLineArea(line);
+ //InlineArea child = (InlineArea) line.getInlineAreas().get(0);
currentBPPosition += line.getAllocBPD();
}
currentIPPosition = saveIP;
@@ -584,6 +586,8 @@
renderText((TextArea) inlineArea);
} else if (inlineArea instanceof InlineParent) {
renderInlineParent((InlineParent) inlineArea);
+ } else if (inlineArea instanceof InlineBlockParent) {
+ renderInlineBlockParent((InlineBlockParent) inlineArea);
} else if (inlineArea instanceof Space) {
renderInlineSpace((Space) inlineArea);
} else if (inlineArea instanceof Character) {
@@ -596,12 +600,10 @@
}
- /** @see org.apache.fop.render.Renderer */
protected void renderCharacter(Character ch) {
currentIPPosition += ch.getAllocIPD();
}
- /** @see org.apache.fop.render.Renderer */
protected void renderInlineSpace(Space space) {
// an inline space moves the inline progression position
// for the current block by the width or height of the space
@@ -610,17 +612,14 @@
currentIPPosition += space.getAllocIPD();
}
- /** @see org.apache.fop.render.Renderer */
protected void renderLeader(Leader area) {
currentIPPosition += area.getAllocIPD();
}
- /** @see org.apache.fop.render.Renderer */
protected void renderText(TextArea text) {
currentIPPosition += text.getAllocIPD();
}
- /** @see org.apache.fop.render.Renderer */
protected void renderInlineParent(InlineParent ip) {
int saveIP = currentIPPosition;
Iterator iter = ip.getChildAreas().iterator();
@@ -630,7 +629,13 @@
currentIPPosition = saveIP + ip.getAllocIPD();
}
- /** @see org.apache.fop.render.Renderer */
+ protected void renderInlineBlockParent(InlineBlockParent ibp) {
+ // For inline content the BP position is updated by the enclosing line area
+ int saveBP = currentBPPosition;
+ renderBlock(ibp.getChildArea());
+ currentBPPosition = saveBP;
+ }
+
protected void renderViewport(Viewport viewport) {
Area content = viewport.getContent();
int saveBP = currentBPPosition;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java?rev=232250&r1=232249&r2=232250&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java Fri Aug 12 02:50:01 2005
@@ -51,6 +51,7 @@
import org.apache.fop.area.BookmarkData;
import org.apache.fop.area.inline.Character;
import org.apache.fop.area.inline.InlineArea;
+import org.apache.fop.area.inline.InlineBlockParent;
import org.apache.fop.area.inline.TextArea;
import org.apache.fop.area.inline.Viewport;
import org.apache.fop.area.inline.ForeignObject;
@@ -1302,6 +1303,17 @@
}
}
+ /** @see org.apache.fop.render.AbstractRenderer */
+ protected void renderInlineBlockParent(InlineBlockParent ibp) {
+ float start = currentIPPosition / 1000f;
+ float top = (ibp.getOffset() + currentBPPosition) / 1000f;
+ float width = ibp.getIPD() / 1000f;
+ float height = ibp.getBPD() / 1000f;
+ drawBackAndBorders(ibp, start, top, width, height);
+
+ super.renderInlineBlockParent(ibp);
+ }
+
/**
* @see org.apache.fop.render.Renderer#renderCharacter(Character)
*/
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java?rev=232250&r1=232249&r2=232250&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java Fri Aug 12 02:50:01 2005
@@ -60,6 +60,7 @@
import org.apache.fop.area.inline.ForeignObject;
import org.apache.fop.area.inline.Image;
import org.apache.fop.area.inline.InlineArea;
+import org.apache.fop.area.inline.InlineBlockParent;
import org.apache.fop.area.inline.InlineParent;
import org.apache.fop.area.inline.Leader;
import org.apache.fop.area.inline.Space;
@@ -513,13 +514,14 @@
atts.clear();
addAreaAttributes(line);
addTraitAttributes(line);
+ addAttribute("vpos", currentBPPosition);
startElement("lineArea", atts);
super.renderLineArea(line);
endElement("lineArea");
}
/**
- * @see org.apache.fop.render.Renderer#renderViewport(Viewport)
+ * @see org.apache.fop.render.AbstractRenderer#renderViewport(Viewport)
*/
protected void renderViewport(Viewport viewport) {
atts.clear();
@@ -544,7 +546,7 @@
}
/**
- * @see org.apache.fop.render.Renderer#renderContainer(Container)
+ * @see org.apache.fop.render.AbstractRenderer#renderContainer(Container)
*/
public void renderContainer(Container cont) {
startElement("container");
@@ -570,7 +572,7 @@
}
/**
- * @see org.apache.fop.render.Renderer#renderCharacter(Character)
+ * @see org.apache.fop.render.AbstractRenderer#renderCharacter(Character)
*/
protected void renderCharacter(org.apache.fop.area.inline.Character ch) {
atts.clear();
@@ -582,7 +584,7 @@
}
/**
- * @see org.apache.fop.render.Renderer#renderInlineSpace(Space)
+ * @see org.apache.fop.render.AbstractRenderer#renderInlineSpace(Space)
*/
protected void renderInlineSpace(Space space) {
atts.clear();
@@ -592,7 +594,7 @@
}
/**
- * @see org.apache.fop.render.Renderer#renderText(TextArea)
+ * @see org.apache.fop.render.AbstractRenderer#renderText(TextArea)
*/
protected void renderText(TextArea text) {
atts.clear();
@@ -603,6 +605,7 @@
addAttribute("tlsadjust", text.getTextLetterSpaceAdjust());
}
addAttribute("vpos", text.getOffset());
+ addAreaAttributes(text);
addTraitAttributes(text);
startElement("text", atts);
characters(text.getTextArea());
@@ -611,18 +614,28 @@
}
/**
- * @see org.apache.fop.render.Renderer#renderInlineParent(InlineParent)
+ * @see org.apache.fop.render.AbstractRenderer#renderInlineParent(InlineParent)
*/
protected void renderInlineParent(InlineParent ip) {
atts.clear();
+ addAreaAttributes(ip);
addTraitAttributes(ip);
startElement("inlineparent", atts);
super.renderInlineParent(ip);
endElement("inlineparent");
}
+ protected void renderInlineBlockParent(InlineBlockParent ibp) {
+ atts.clear();
+ addAreaAttributes(ibp);
+ addTraitAttributes(ibp);
+ startElement("inlineblockparent", atts);
+ super.renderInlineBlockParent(ibp);
+ endElement("inlineblockparent");
+ }
+
/**
- * @see org.apache.fop.render.Renderer#renderLeader(Leader)
+ * @see org.apache.fop.render.AbstractRenderer#renderLeader(Leader)
*/
protected void renderLeader(Leader area) {
String style = "solid";
@@ -656,7 +669,7 @@
super.renderLeader(area);
}
- /** @see org.apache.fop.render.AbstractRenderer */
+ /** @see org.apache.fop.render.AbstractRenderer#getMimeType() */
public String getMimeType() {
return XML_MIME_TYPE;
}
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/logging/LoggingElementListObserver.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/java/org/apache/fop/logging/LoggingElementListObserver.java?rev=232250&r1=232249&r2=232250&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/logging/LoggingElementListObserver.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/logging/LoggingElementListObserver.java Fri Aug 12 02:50:01 2005
@@ -44,6 +44,10 @@
}
log.debug(" ");
log.debug("ElementList: category=" + category + ", id=" + id);
+ if (elementList == null) {
+ log.debug("<<empty list>>");
+ return;
+ }
ListIterator tempIter = elementList.listIterator();
KnuthElement temp;
while (tempIter.hasNext()) {
Modified: xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.txt
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.txt?rev=232250&r1=232249&r2=232250&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.txt (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.txt Fri Aug 12 02:50:01 2005
@@ -1,6 +1,6 @@
external-graphic1.xml
external-graphic2.xml
-inline1.xml
+inline-block2.xml
keep-with-previous2.xml
keep-with-previous3.xml
keep-with-previous4.xml
@@ -14,4 +14,4 @@
table-border-collapse2.xml
table-border-separate1.xml
table-column4.xml
-table-fixed2.xml
+table-fixed2.xml
\ No newline at end of file
Modified: xmlgraphics/fop/trunk/test/layoutengine/testcases/inline1.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/inline1.xml?rev=232250&r1=232249&r2=232250&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/inline1.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/inline1.xml Fri Aug 12 02:50:01 2005
@@ -36,6 +36,13 @@
</fo:root>
</fo>
<checks>
- <!-- currently causes a ClassCastException -->
+ <element-list category="breaker">
+ <box w="14400"/>
+ <penalty w="0" p="0"/>
+ <box w="0" aux="true"/> <!-- this is from the empty block -->
+ <penalty w="0" p="0"/>
+ <box w="14400"/>
+ <skip>3</skip>
+ </element-list>
</checks>
</testcase>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org