arved 01/07/16 20:16:29
Modified: src/org/apache/fop/render/xml XMLRenderer.java
Log:
AHS: improving area information
Revision Changes Path
1.19 +32 -6 xml-fop/src/org/apache/fop/render/xml/XMLRenderer.java
Index: XMLRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/xml/XMLRenderer.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XMLRenderer.java 2001/06/05 12:51:53 1.18
+++ XMLRenderer.java 2001/07/17 03:16:29 1.19
@@ -1,4 +1,4 @@
-/* $Id: XMLRenderer.java,v 1.18 2001/06/05 12:51:53 keiron Exp $
+/* $Id: XMLRenderer.java,v 1.19 2001/07/17 03:16:29 arved Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources."
@@ -149,7 +149,7 @@
* @param area the area container to render
*/
public void renderAreaContainer(AreaContainer area) {
- writeStartTag("<AreaContainer>");
+ writeStartTag("<AreaContainer name=\"" + area.getAreaName() + "\">");
Enumeration e = area.getChildren().elements();
while (e.hasMoreElements()) {
Box b = (Box) e.nextElement();
@@ -194,9 +194,35 @@
* @param area the block area to render
*/
public void renderBlockArea(BlockArea area) {
- writeStartTag("<BlockArea start-indent=\"" +
- area.getStartIndent() + "\" end-indent=\"" +
- area.getEndIndent() + "\">");
+ StringBuffer baText = new StringBuffer();
+ baText.append("<BlockArea start-indent=\"" + area.getStartIndent() +
"\"");
+ baText.append(" end-indent=\"" + area.getEndIndent() + "\"");
+ baText.append("\nis-first=\"" + area.isFirst + "\"");
+ baText.append(" is-last=\"" + area.isLast + "\"");
+ if (null != area.generatedBy)
+ baText.append(" generated-by=\"" + area.generatedBy.getName() +
+ "//" + area.generatedBy + "\"");
+ baText.append(">");
+ writeStartTag(baText.toString());
+
+ // write out marker info
+ java.util.Vector markers = area.getMarkers();
+ if (!markers.isEmpty()) {
+ writeStartTag("<Markers>");
+ for (int m = 0; m < markers.size(); m++) {
+ org.apache.fop.fo.flow.Marker marker =
+
(org.apache.fop.fo.flow.Marker)markers.elementAt(m);
+ StringBuffer maText = new StringBuffer();
+ maText.append("<Marker marker-class-name=\"" +
+ marker.getMarkerClassName() + "\"");
+ maText.append(" RegisteredArea=\"" +
+ marker.getRegistryArea() + "\"");
+ maText.append("/>");
+ writeEmptyElementTag(maText.toString());
+ }
+ writeEndTag("</Markers>");
+ }
+
Enumeration e = area.getChildren().elements();
while (e.hasMoreElements()) {
Box b = (Box) e.nextElement();
@@ -310,7 +336,7 @@
public void renderPage(Page page) {
BodyAreaContainer body;
AreaContainer before, after;
- writeStartTag("<Page number=\"" + page.getNumber() + "\">");
+ writeStartTag("<Page number=\"" + page.getFormattedNumber() + "\">");
body = page.getBody();
before = page.getBefore();
after = page.getAfter();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
