Re: Table border missing (#6929)

2003-09-19 Thread Srinivas Nandina
J.Pietschmann,

Thanks for the response.
I want to display a table with only borders around the
table. Rows and cells can be configured to have
differnt colors. 
I tried applying borders on fo:table-header and
fo:table-body and it works. It has some other
problems though but its ok. 
Please find the pdf file attached.
It has some white space between borders and cells.
Bottom border of the table is missing.

Thanks again,

Srinivas.

--- J.Pietschmann [EMAIL PROTECTED] wrote:
 Nandina Srinivas wrote:
 
  Hello all,
  
  fo:table border is missing if background-color
 is
  applied to fo:table-row or an fo:table-cell.
 This
  issue is already mentioned in the bug #6929.
  
  Would like to know if any work arounds are
 avialable
  for this issue.
 
 Use either the border or the background color
 elsewhere,
 like in the block in the table cell. Details depend
 heavily
 on your specific requitrements and data, of course.
 
 J.Pietschmann
 
 


__
Do you Yahoo!?
Yahoo! SiteBuilder - Free, easy-to-use web site design software
http://sitebuilder.yahoo.com

Border-issue.pdf
Description: Border-issue.pdf


cvs commit: xml-fop/src/java/org/apache/fop/mif MIFHandler.java

2003-09-19 Thread pietsch
pietsch 2003/09/19 07:33:16

  Modified:src/java/org/apache/fop/servlet FopPrintServlet.java
   src/java/org/apache/fop/fo FObj.java FOTreeBuilder.java
   src/java/org/apache/fop/fo/extensions/svg
BatikExtensionElementMapping.java
   src/java/org/apache/fop/render/awt AWTRenderer.java
   src/java/org/apache/fop/area CTM.java
   src/java/org/apache/fop/layoutmgr BidiLayoutManager.java
LayoutManagerLS.java
   src/java/org/apache/fop/fo/flow Footnote.java Leader.java
PageNumber.java PageNumberCitation.java
InstreamForeignObject.java ListItem.java
   src/java/org/apache/fop/pdf PDFInfo.java
   src/java/org/apache/fop/fo/pagination RegionBody.java
Region.java
   src/java/org/apache/fop/mif MIFHandler.java
  Log:
  Organize imports.
  A bit of JavaDoc cosmetics.
  
  Revision  ChangesPath
  1.8   +1 -9  xml-fop/src/java/org/apache/fop/servlet/FopPrintServlet.java
  
  Index: FopPrintServlet.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/servlet/FopPrintServlet.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- FopPrintServlet.java  2 Aug 2003 21:26:53 -   1.7
  +++ FopPrintServlet.java  19 Sep 2003 14:33:15 -  1.8
  @@ -51,10 +51,8 @@
   package org.apache.fop.servlet;
   
   import java.io.File;
  -import java.io.IOException;
   import java.io.InputStream;
   import java.io.PrintWriter;
  -import java.util.List;
   
   import javax.servlet.ServletException;
   import javax.servlet.http.HttpServlet;
  @@ -62,18 +60,12 @@
   import javax.servlet.http.HttpServletResponse;
   import javax.xml.transform.TransformerFactory;
   
  -import org.xml.sax.InputSource;
  -
  -// Avalon
   import org.apache.avalon.framework.logger.ConsoleLogger;
   import org.apache.avalon.framework.logger.Logger;
  -
  -// FOP
   import org.apache.fop.apps.Driver;
  -import org.apache.fop.apps.FOPException;
  -import org.apache.fop.area.PageViewport;
   import org.apache.fop.apps.XSLTInputHandler;
   import org.apache.fop.render.awt.AWTPrintRenderer;
  +import org.xml.sax.InputSource;
   
   /**
* Example servlet to generate a fop printout from a servlet.
  
  
  
  1.19  +6 -9  xml-fop/src/java/org/apache/fop/fo/FObj.java
  
  Index: FObj.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObj.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- FObj.java 16 Sep 2003 05:21:04 -  1.18
  +++ FObj.java 19 Sep 2003 14:33:15 -  1.19
  @@ -50,23 +50,20 @@
*/
   package org.apache.fop.fo;
   
  -// Java
  -import java.util.Iterator;
  -import java.util.ListIterator;
   import java.util.ArrayList;
  -import java.util.List;
   import java.util.HashMap;
  -import java.util.Set;
  +import java.util.Iterator;
  +import java.util.ListIterator;
   import java.util.Map;
  -import org.xml.sax.Attributes;
  +import java.util.Set;
   
  -// FOP
   import org.apache.fop.apps.FOPException;
  -import org.apache.fop.fo.properties.FOPropertyMapping;
   import org.apache.fop.fo.flow.Marker;
  +import org.apache.fop.fo.properties.FOPropertyMapping;
  +import org.xml.sax.Attributes;
   
   /**
  - * base class for representation of formatting objects and their processing
  + * Base class for representation of formatting objects and their processing.
*/
   public class FObj extends FONode {
   private static final String FO_URI = http://www.w3.org/1999/XSL/Format;;
  
  
  
  1.19  +10 -25xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java
  
  Index: FOTreeBuilder.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- FOTreeBuilder.java13 Sep 2003 22:55:16 -  1.18
  +++ FOTreeBuilder.java19 Sep 2003 14:33:15 -  1.19
  @@ -50,46 +50,31 @@
*/
   package org.apache.fop.fo;
   
  -// FOP
  -import java.util.HashMap;
  +import java.io.BufferedReader;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.io.InputStreamReader;
  +import java.io.Reader;
  +import java.util.Enumeration;
  +import java.util.Iterator;
  +import java.util.List;
   import java.util.Map;
   import java.util.Set;
  -import org.apache.fop.fo.pagination.Root;
   
  -// SAX
   import org.apache.avalon.framework.logger.Logger;
   import org.apache.fop.apps.FOPException;
  +import org.apache.fop.apps.FOUserAgent;
   import org.apache.fop.fo.ElementMapping.Maker;
  +import org.apache.fop.fo.pagination.Root;
   import 

DO NOT REPLY [Bug 23274] New: - [PATCH]: RTF: added support for xsl-region-before, xsl-region-after and fo:page-number

2003-09-19 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23274.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23274

[PATCH]: RTF: added support for xsl-region-before, xsl-region-after and fo:page-number

   Summary: [PATCH]: RTF: added support for xsl-region-before, xsl-
region-after and fo:page-number
   Product: Fop
   Version: all
  Platform: All
OS/Version: All
Status: NEW
  Severity: Normal
  Priority: Other
 Component: general
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


Hello,

i'd like to contribute attached patch which adds support for xsl-region-
before, xsl-region-after and fo:page-number tag.

Thanks
Peter Herweg


DO NOT REPLY [Bug 23274] - [PATCH]: RTF: added support for xsl-region-before, xsl-region-after and fo:page-number

2003-09-19 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23274.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23274

[PATCH]: RTF: added support for xsl-region-before, xsl-region-after and fo:page-number





--- Additional Comments From [EMAIL PROTECTED]  2003-09-19 15:58 ---
Created an attachment (id=8293)
adds support for xsl-region-before, xsl-region-after and fo:page-number tag


cvs commit: xml-fop/src/java/org/apache/fop/render/pdf PDFRenderer.java

2003-09-19 Thread pietsch
pietsch 2003/09/19 09:46:43

  Modified:src/java/org/apache/fop/render Renderer.java
AbstractRenderer.java
   src/java/org/apache/fop/pdf PDFDocument.java
   src/java/org/apache/fop/render/pdf PDFRenderer.java
  Log:
  Add possibility to set creation date.
  
  Revision  ChangesPath
  1.5   +13 -2 xml-fop/src/java/org/apache/fop/render/Renderer.java
  
  Index: Renderer.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/Renderer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Renderer.java 22 Aug 2003 17:42:42 -  1.4
  +++ Renderer.java 19 Sep 2003 16:46:43 -  1.5
  @@ -53,6 +53,7 @@
   // Java
   import java.io.OutputStream;
   import java.io.IOException;
  +import java.util.Date;
   import java.util.Map;
   
   // FOP
  @@ -142,13 +143,23 @@
   void setProducer(String producer);
   
   /**
  - * Set the creator of the document to be rendered. If this method
  - * isn't called the renderer uses a default.
  + * Set the creator of the document to be rendered.
  + * If this method isn't called the renderer uses a default.
* Note: Not all renderers support this feature.
*
* @param creator  The name of the document creator
*/
   void setCreator(String creator);
  +
  +/**
  + * Set the creator date/timeof the document to be rendered.
  + * If this method isn't called the renderer uses the current date/time
  + * as default.
  + * Note: Not all renderers support this feature.
  + *
  + * @param date The name of the document creator
  + */
  +void setCreationDate(Date date);
   
   /**
* Reports if out of order rendering is supported. p
  
  
  
  1.15  +19 -2 xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java
  
  Index: AbstractRenderer.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- AbstractRenderer.java 14 Sep 2003 19:32:44 -  1.14
  +++ AbstractRenderer.java 19 Sep 2003 16:46:43 -  1.15
  @@ -54,6 +54,7 @@
   import java.awt.geom.Rectangle2D;
   import java.io.IOException;
   import java.io.OutputStream;
  +import java.util.Date;
   import java.util.Map;
   import java.util.List;
   import java.util.Iterator;
  @@ -125,6 +126,11 @@
   protected String creator = null;
   
   /**
  + * creation time
  + */
  +protected Date creationDate = null;
  +
  +/**
* renderer configuration
*/
   protected Map options;
  @@ -172,12 +178,23 @@
   creator = inCreator;
   }
   
  -/** @see org.apache.fop.render.Renderer */
  +/**
  + *  @see org.apache.fop.render.Renderer
  + */
   public abstract void setupFontInfo(FOTreeControl foTreeControl);
   
  -/** @see org.apache.fop.render.Renderer */
  +/**
  + *  @see org.apache.fop.render.Renderer
  + */
   public void setUserAgent(FOUserAgent agent) {
   userAgent = agent;
  +}
  +
  +/**
  + * @param date
  + */
  +public void setCreationDate(Date date) {
  +creationDate = date;
   }
   
   /** @see org.apache.fop.render.Renderer */
  
  
  
  1.6   +76 -47xml-fop/src/java/org/apache/fop/pdf/PDFDocument.java
  
  Index: PDFDocument.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/pdf/PDFDocument.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PDFDocument.java  24 Apr 2003 02:48:08 -  1.5
  +++ PDFDocument.java  19 Sep 2003 16:46:43 -  1.6
  @@ -55,6 +55,7 @@
   import java.io.InputStream;
   import java.io.OutputStream;
   import java.io.UnsupportedEncodingException;
  +import java.util.Date;
   import java.util.List;
   import java.util.Map;
   import java.util.Iterator;
  @@ -159,7 +160,8 @@
   /**
* the colorspace (0=RGB, 1=CMYK)
*/
  -protected PDFColorSpace colorspace = new 
PDFColorSpace(PDFColorSpace.DEVICE_RGB);
  +protected PDFColorSpace colorspace =
  +new PDFColorSpace(PDFColorSpace.DEVICE_RGB);
   
   /**
* the counter for Pattern name numbering (e.g. 'Pattern1')
  @@ -232,7 +234,6 @@
*/
   protected List gotos = new java.util.ArrayList();
   
  -
   private PDFFactory factory;
   
   private boolean encodingOnTheFly = true;
  @@ -325,10 +326,19 @@
   }
   
   /**
  - * set the creator of the document
  - *
  - * @param creator string indicating application creating the document
  - */
  +  * Set the creation date of the document.
  + 

cvs commit: xml-fop/test/java/org/apache/fop DigestFilterTestCase.java

2003-09-19 Thread pietsch
pietsch 2003/09/19 09:50:56

  Added:   test/java/org/apache/fop/util DigestFilter.java
   test/java/org/apache/fop DigestFilterTestCase.java
  Log:
  SAX filter providing a MD5 checksum for ensuring XML input integrity.
  
  Revision  ChangesPath
  1.1  xml-fop/test/java/org/apache/fop/util/DigestFilter.java
  
  Index: DigestFilter.java
  ===
  /*
   * $Id: DigestFilter.java,v 1.1 2003/09/19 16:50:56 pietsch Exp $
   * 
   *The Apache Software License, Version 1.1
   * 
   * 
   * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   * 
   * Redistribution and use in source and binary forms, with or without modifica-
   * tion, are permitted provided that the following conditions are met:
   * 
   * 1. Redistributions of source code must retain the above copyright notice,
   *this list of conditions and the following disclaimer.
   * 
   * 2. Redistributions in binary form must reproduce the above copyright notice,
   *this list of conditions and the following disclaimer in the documentation
   *and/or other materials provided with the distribution.
   * 
   * 3. The end-user documentation included with the redistribution, if any, must
   *include the following acknowledgment: This product includes software
   *developed by the Apache Software Foundation (http://www.apache.org/).
   *Alternately, this acknowledgment may appear in the software itself, if
   *and wherever such third-party acknowledgments normally appear.
   * 
   * 4. The names FOP and Apache Software Foundation must not be used to
   *endorse or promote products derived from this software without prior
   *written permission. For written permission, please contact
   *[EMAIL PROTECTED]
   * 
   * 5. Products derived from this software may not be called Apache, nor may
   *Apache appear in their name, without prior written permission of the
   *Apache Software Foundation.
   * 
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
   * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
   * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
   * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
   * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
   * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
   * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
   * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
   * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   * 
   * 
   * This software consists of voluntary contributions made by many individuals
   * on behalf of the Apache Software Foundation and was originally created by
   * James Tauber [EMAIL PROTECTED]. For more information on the Apache
   * Software Foundation, please see http://www.apache.org/.
   */
  package org.apache.fop.util;
  
  import java.security.MessageDigest;
  import java.security.NoSuchAlgorithmException;
  import java.util.Iterator;
  import java.util.Map;
  import java.util.TreeMap;
  
  import org.xml.sax.Attributes;
  import org.xml.sax.SAXException;
  import org.xml.sax.SAXNotRecognizedException;
  import org.xml.sax.SAXNotSupportedException;
  import org.xml.sax.helpers.XMLFilterImpl;
  
  /**
   * SAX filter which produces a digest over the XML elements.
   * Insignificant whitespace as determined by the, comments and
   * processing instructions are not part of the digest.
   * If the filter is namespace aware, the URI and local name for
   * each element is digested, otherwise the QName. Attributes are
   * sorted before the name-value pairs are digested.
   * 
   */
  public class DigestFilter extends XMLFilterImpl {
  
  private MessageDigest digest;
  private byte value[];
  private boolean isNamespaceAware;
  
  public DigestFilter(String algorithm) throws NoSuchAlgorithmException {
  digest = MessageDigest.getInstance(algorithm);
  }
  
  public byte[] getDigestValue() {
  return value;
  }
  
  public String getDigestString() {
  if (value != null) {
  StringBuffer buffer = new StringBuffer(2 * value.length);
  for (int i = 0; i  value.length; i++) {
  int val = value[i];
  int hi = (val  4)  0xF;
  int lo = val  0xF;
  if (hi  10) {
  buffer.append((char) (hi + 0x30));

cvs commit: xml-fop/src/java/org/apache/fop/render/ps PSRenderer.java

2003-09-19 Thread pietsch
pietsch 2003/09/19 09:51:16

  Modified:src/java/org/apache/fop/render/ps PSRenderer.java
  Log:
  
  
  Revision  ChangesPath
  1.16  +1 -0  xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java
  
  Index: PSRenderer.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- PSRenderer.java   1 Sep 2003 14:19:35 -   1.15
  +++ PSRenderer.java   19 Sep 2003 16:51:16 -  1.16
  @@ -264,6 +264,7 @@
   public void setupFontInfo(FOTreeControl foTreeControl) {
   /* use PDF's font setup to get PDF metrics */
   org.apache.fop.render.pdf.FontSetup.setup((Document)foTreeControl, null);
  +// TODO: what's this?
   this.fontInfo = fontInfo;
   }
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: xml-fop/src/java/org/apache/fop/rtf/renderer RTFHandler.java

2003-09-19 Thread vmote
vmote   2003/09/19 11:17:40

  Modified:src/java/org/apache/fop/fo FOInputHandler.java
FOTreeHandler.java
   src/java/org/apache/fop/fo/flow PageNumber.java
   src/java/org/apache/fop/fo/pagination PageSequence.java
   src/java/org/apache/fop/mif MIFHandler.java
   src/java/org/apache/fop/rtf/renderer RTFHandler.java
  Log:
  add support for xsl-region-before, xsl-region-after and fo:page-number tag, 
submitted by Peter Herweg, see http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23274
  
  Revision  ChangesPath
  1.10  +17 -1 xml-fop/src/java/org/apache/fop/fo/FOInputHandler.java
  
  Index: FOInputHandler.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOInputHandler.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- FOInputHandler.java   16 Sep 2003 17:33:06 -  1.9
  +++ FOInputHandler.java   19 Sep 2003 18:17:40 -  1.10
  @@ -61,6 +61,7 @@
   import org.apache.fop.fo.flow.Leader;
   import org.apache.fop.fo.flow.ListBlock;
   import org.apache.fop.fo.flow.ListItem;
  +import org.apache.fop.fo.flow.PageNumber;
   import org.apache.fop.fo.flow.Table;
   import org.apache.fop.fo.flow.TableColumn;
   import org.apache.fop.fo.flow.TableBody;
  @@ -131,6 +132,21 @@
   public abstract void endPageSequence(PageSequence pageSeq) throws FOPException;
   
   /**
  + *
  + * @param pagenum PageNumber that is starting.
  + */
  +public abstract void startPageNumber(PageNumber pagenum);
  +
  +/**
  + *
  + * @param pagenum PageNumber that is ending.
  + */
  +public abstract void endPageNumber(PageNumber pagenum);
  +
  +/**
  + * This method is called to indicate the start of a new fo:flow or 
fo:static-content.
  + * This method also handles fo:static-content tags, because the StaticContent 
class
  + * is derived from the Flow class.
*
* @param fl Flow that is starting.
*/
  
  
  
  1.9   +15 -1 xml-fop/src/java/org/apache/fop/fo/FOTreeHandler.java
  
  Index: FOTreeHandler.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeHandler.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- FOTreeHandler.java16 Sep 2003 17:33:06 -  1.8
  +++ FOTreeHandler.java19 Sep 2003 18:17:40 -  1.9
  @@ -65,6 +65,7 @@
   import org.apache.fop.fo.flow.Leader;
   import org.apache.fop.fo.flow.ListBlock;
   import org.apache.fop.fo.flow.ListItem;
  +import org.apache.fop.fo.flow.PageNumber;
   import org.apache.fop.fo.flow.Table;
   import org.apache.fop.fo.flow.TableColumn;
   import org.apache.fop.fo.flow.TableBody;
  @@ -514,4 +515,17 @@
   }
   }
   
  +/**
  + *
  + * @param pagenum PageNumber that is starting.
  + */
  +public void startPageNumber(PageNumber pagenum) {
  +}
  +
  +/**
  + *
  + * @param pagenum PageNumber that is ending.
  + */
  +public void endPageNumber(PageNumber pagenum) {
  +}
   }
  
  
  
  1.16  +19 -0 xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java
  
  Index: PageNumber.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- PageNumber.java   19 Sep 2003 14:33:15 -  1.15
  +++ PageNumber.java   19 Sep 2003 18:17:40 -  1.16
  @@ -50,6 +50,11 @@
*/
   package org.apache.fop.fo.flow;
   
  +// XML
  +import org.xml.sax.Attributes;
  +
  +// FOP
  +import org.apache.fop.apps.FOPException;
   import org.apache.fop.datatypes.ColorType;
   import org.apache.fop.fo.FONode;
   import org.apache.fop.fo.FOTreeVisitor;
  @@ -146,4 +151,18 @@
   fotv.servePageNumber(this);
   }
   
  +/**
  + * @see org.apache.fop.fo.FObj#handleAttrs
  + */
  +public void handleAttrs(Attributes attlist) throws FOPException {
  +super.handleAttrs(attlist);
  +
  +setup();
  +
  +getFOTreeControl().getFOInputHandler().startPageNumber(this);
  +}
  +
  +protected void end() {
  +getFOTreeControl().getFOInputHandler().endPageNumber(this);
  +}
   }
  
  
  
  1.14  +4 -0  xml-fop/src/java/org/apache/fop/fo/pagination/PageSequence.java
  
  Index: PageSequence.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageSequence.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- PageSequence.java 16 Sep 2003 05:21:06 -  1.13
  +++ PageSequence.java 19 Sep 2003 18:17:40 - 

cvs commit: xml-fop/src/java/org/apache/fop/rtf/renderer RTFHandler.java

2003-09-19 Thread vmote
vmote   2003/09/19 11:27:59

  Modified:src/java/org/apache/fop/rtf/renderer RTFHandler.java
  Log:
  style changes only
  
  Revision  ChangesPath
  1.23  +72 -61xml-fop/src/java/org/apache/fop/rtf/renderer/RTFHandler.java
  
  Index: RTFHandler.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/renderer/RTFHandler.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- RTFHandler.java   19 Sep 2003 18:17:40 -  1.22
  +++ RTFHandler.java   19 Sep 2003 18:27:59 -  1.23
  @@ -115,15 +115,15 @@
   private RtfDocumentArea docArea;
   private RtfParagraph para;
   private boolean warned = false;
  -private boolean bPrevHeaderSpecified=false;//true, if there has been a
  -   //header in any page-sequence
  -private boolean bPrevFooterSpecified=false;//true, if there has been a
  -   //footer in any page-sequence
  +private boolean bPrevHeaderSpecified = false;//true, if there has been a
  + //header in any page-sequence
  +private boolean bPrevFooterSpecified = false;//true, if there has been a
  + //footer in any page-sequence
   private boolean bHeaderSpecified = false;  //true, if there is a header
  //in current page-sequence
   private boolean bFooterSpecified = false;  //true, if there is a footer
  //in current page-sequence
  -private BuilderContext m_context = new BuilderContext(null);
  +private BuilderContext builderContext = new BuilderContext(null);
   
   private static final String ALPHA_WARNING = WARNING: RTF renderer is 
   + veryveryalpha at this time, see class 
org.apache.fop.rtf.renderer.RTFHandler;
  @@ -136,6 +136,7 @@
   
   /**
* Creates a new RTF structure handler.
  + * @param doc the Document for which this RTFHandler is processing
* @param os OutputStream to write to
*/
   public RTFHandler(Document doc, OutputStream os) {
  @@ -178,10 +179,10 @@
   public void startPageSequence(PageSequence pageSeq)  {
   try {
   sect = docArea.newSection();
  -m_context.pushContainer(sect);
  +builderContext.pushContainer(sect);
   
  -bHeaderSpecified=false;
  -bFooterSpecified=false;
  +bHeaderSpecified = false;
  +bFooterSpecified = false;
   } catch (IOException ioe) {
   // FIXME could we throw Exception in all FOInputHandler events?
   log.error(startPageSequence:  + ioe.getMessage());
  @@ -193,7 +194,7 @@
* @see org.apache.fop.fo.FOInputHandler#endPageSequence(PageSequence)
*/
   public void endPageSequence(PageSequence pageSeq) throws FOPException {
  -m_context.popContainer();
  +builderContext.popContainer();
   }
   
   /**
  @@ -205,20 +206,24 @@
   // if there is no header in current page-sequence but there has been
   // a header in a previous page-sequence, insert an empty header.
   if (bPrevHeaderSpecified  !bHeaderSpecified) {
  -RtfAttributes attr=new RtfAttributes();
  +RtfAttributes attr = new RtfAttributes();
   attr.set(RtfBefore.HEADER);
   
  -final IRtfBeforeContainer contBefore = 
(IRtfBeforeContainer)m_context.getContainer(IRtfBeforeContainer.class,true,this);
  +final IRtfBeforeContainer contBefore =
  +(IRtfBeforeContainer)builderContext.getContainer
  +(IRtfBeforeContainer.class, true, this);
   contBefore.newBefore(attr);
   }
   
   // if there is no footer in current page-sequence but there has been
   // a footer in a previous page-sequence, insert an empty footer.
   if (bPrevFooterSpecified  !bFooterSpecified) {
  -RtfAttributes attr=new RtfAttributes();
  +RtfAttributes attr = new RtfAttributes();
   attr.set(RtfAfter.FOOTER);
   
  -final IRtfAfterContainer contAfter = 
(IRtfAfterContainer)m_context.getContainer(IRtfAfterContainer.class,true,this);
  +final IRtfAfterContainer contAfter =
  +(IRtfAfterContainer)builderContext.getContainer
  +(IRtfAfterContainer.class, true, this);
   contAfter.newAfter(attr);
   }
   
  @@ -227,40 +232,44 @@
   

DO NOT REPLY [Bug 23274] - [PATCH]: RTF: added support for xsl-region-before, xsl-region-after and fo:page-number

2003-09-19 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23274.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23274

[PATCH]: RTF: added support for xsl-region-before, xsl-region-after and fo:page-number

[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED



--- Additional Comments From [EMAIL PROTECTED]  2003-09-19 18:32 ---
I have committed this change and some subsequent style changes. Thanks Peter!