pbwest      2003/03/19 06:36:49

  Modified:    src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
                        FOAttributes.java FONode.java FOPropertySets.java
                        FOTree.java FObjectNames.java FObjectSets.java
                        FObjects.java FoRoot.java PropNames.java
                        PropertyConsts.java PropertySets.java
                        ReferenceAreaFO.java ShorthandPropSets.java
                        WritingModes.java
  Log:
  Full LICENSE text.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.14  +51 -6     xml-fop/src/org/apache/fop/fo/Attic/FOAttributes.java
  
  Index: FOAttributes.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOAttributes.java,v
  retrieving revision 1.1.2.13
  retrieving revision 1.1.2.14
  diff -u -r1.1.2.13 -r1.1.2.14
  --- FOAttributes.java 13 Nov 2002 15:09:26 -0000      1.1.2.13
  +++ FOAttributes.java 19 Mar 2003 14:36:47 -0000      1.1.2.14
  @@ -24,9 +24,54 @@
    * $Id$
    *
    * Created: Wed Nov 14 15:19:51 2001
  - * 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.
  + * 
  + *  ============================================================================
  + *                    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/>.
  + *  
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
    * @version $Revision$ $Name$
  
  
  
  1.19.2.31 +84 -6     xml-fop/src/org/apache/fop/fo/Attic/FONode.java
  
  Index: FONode.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FONode.java,v
  retrieving revision 1.19.2.30
  retrieving revision 1.19.2.31
  diff -u -r1.19.2.30 -r1.19.2.31
  --- FONode.java       3 Dec 2002 07:22:23 -0000       1.19.2.30
  +++ FONode.java       19 Mar 2003 14:36:47 -0000      1.19.2.31
  @@ -39,9 +39,54 @@
    * FONode.java
    * Created: Sat Nov 10 01:39:37 2001
    * $Id$
  - * 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.
  + * 
  + *  ============================================================================
  + *                    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/>.
  + *  
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
    * @version $Revision$ $Name$
  @@ -308,6 +353,19 @@
           return prop.refineParsing(pv.getProperty(), this, pv);
       }
   
  +    /**
  +     * Reduce the properties currently associated with the node to a
  +     * sparse propeties set of only those properties relevant to the node.
  +     * During tree building, a node may have associated with it properties
  +     * which have no direct relevance to the node, but which may be used
  +     * by descendant nodes.  Once the tree building process is finished, these
  +     * properties are no longer required.  The property set for the node can
  +     * be reduced to the minimum required for this formatting object.
  +     * This minimal set is maintained in a sparse array.
  +     * @see sparsePropsSet
  +     * @see sparsePropsMap
  +     * @see sparseIndices
  +     */
       public void makeSparsePropsSet() throws PropertyException {
           sparsePropsSet = new PropertyValue[numProps];
           // Scan the sparseIndices array, and copy the PropertyValue from
  @@ -323,6 +381,26 @@
           foProperties = null;
           foAttributes = null;
       }
  +
  +    /**
  +     * Get the <i>sparsePropsSet</i> for this node.
  +     * @return the <tt>PropertyValue[]</tt>.
  +     */
  +    /*  DEBUG
  +    public PropertyValue[] getSparsePropsSet() {
  +        return sparsePropsSet;
  +    }
  +    */
  +
  +    /**
  +     * Get the <i>sparsePropsMap</i> for this node.
  +     * @return the <tt>int[]</tt>.
  +     */
  +    /*  DEBUG
  +    public int[] getSparsePropsMap() {
  +        return sparsePropsMap;
  +    }
  +    */
   
       /**
        * Get the eclosing <tt>FOTree</tt> instance of this <tt>FONode</tt>.
  
  
  
  1.1.2.11  +51 -6     xml-fop/src/org/apache/fop/fo/Attic/FOPropertySets.java
  
  Index: FOPropertySets.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOPropertySets.java,v
  retrieving revision 1.1.2.10
  retrieving revision 1.1.2.11
  diff -u -r1.1.2.10 -r1.1.2.11
  --- FOPropertySets.java       22 Nov 2002 02:48:34 -0000      1.1.2.10
  +++ FOPropertySets.java       19 Mar 2003 14:36:47 -0000      1.1.2.11
  @@ -1,8 +1,53 @@
   /*
    * $Id$
  - * 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.
  + * 
  + *  ============================================================================
  + *                    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/>.
  + *  
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
    * @version $Id$
  
  
  
  1.1.2.29  +59 -6     xml-fop/src/org/apache/fop/fo/Attic/FOTree.java
  
  Index: FOTree.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOTree.java,v
  retrieving revision 1.1.2.28
  retrieving revision 1.1.2.29
  diff -u -r1.1.2.28 -r1.1.2.29
  --- FOTree.java       3 Dec 2002 07:24:29 -0000       1.1.2.28
  +++ FOTree.java       19 Mar 2003 14:36:47 -0000      1.1.2.29
  @@ -29,9 +29,54 @@
   
   /*
    * $Id$
  - * 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.
  + * 
  + *  ============================================================================
  + *                    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/>.
  + *  
    *
    * Created: Thu Aug  2 20:29:57 2001
    *
  @@ -154,6 +199,14 @@
           while (preorder.hasNext()) {
               nodecount++;
               FONode next = (FONode) preorder.next();
  +            /*
  +            PropertyValue[] pvset = next.getSparsePropsSet();
  +            System.out.println("......Number of properties: " + pvset.length);
  +            for (int i = 0; i < pvset.length; i++ ) {
  +                PropertyValue pv = pvset[i];
  +                System.out.println(pv);
  +            }
  +            */
           }
           System.out.println("# of FONodes: " + nodecount);
       }
  
  
  
  1.1.2.8   +50 -5     xml-fop/src/org/apache/fop/fo/Attic/FObjectNames.java
  
  Index: FObjectNames.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FObjectNames.java,v
  retrieving revision 1.1.2.7
  retrieving revision 1.1.2.8
  diff -u -r1.1.2.7 -r1.1.2.8
  --- FObjectNames.java 8 Nov 2002 15:50:33 -0000       1.1.2.7
  +++ FObjectNames.java 19 Mar 2003 14:36:47 -0000      1.1.2.8
  @@ -1,8 +1,53 @@
   /*
    * $Id$
  - * 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.
  + * 
  + *  ============================================================================
  + *                    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/>.
  + *  
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
    * @version $Rev$ $Name$
  
  
  
  1.1.2.5   +50 -5     xml-fop/src/org/apache/fop/fo/Attic/FObjectSets.java
  
  Index: FObjectSets.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FObjectSets.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- FObjectSets.java  22 Nov 2002 02:48:34 -0000      1.1.2.4
  +++ FObjectSets.java  19 Mar 2003 14:36:47 -0000      1.1.2.5
  @@ -1,8 +1,53 @@
   /*
    * $Id$
  - * 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.
  + * 
  + *  ============================================================================
  + *                    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/>.
  + *  
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
    * @version $Rev$ $Name$
  
  
  
  1.1.2.12  +51 -6     xml-fop/src/org/apache/fop/fo/Attic/FObjects.java
  
  Index: FObjects.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FObjects.java,v
  retrieving revision 1.1.2.11
  retrieving revision 1.1.2.12
  diff -u -r1.1.2.11 -r1.1.2.12
  --- FObjects.java     22 Nov 2002 02:48:34 -0000      1.1.2.11
  +++ FObjects.java     19 Mar 2003 14:36:47 -0000      1.1.2.12
  @@ -1,8 +1,53 @@
   /*
    * $Id$
  - * 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.
  + * 
  + *  ============================================================================
  + *                    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/>.
  + *  
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
    * @version $Id$
  
  
  
  1.1.2.21  +51 -6     xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java
  
  Index: FoRoot.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java,v
  retrieving revision 1.1.2.20
  retrieving revision 1.1.2.21
  diff -u -r1.1.2.20 -r1.1.2.21
  --- FoRoot.java       3 Dec 2002 07:25:20 -0000       1.1.2.20
  +++ FoRoot.java       19 Mar 2003 14:36:48 -0000      1.1.2.21
  @@ -1,8 +1,53 @@
   /**
    * $Id$
  - * <br/>Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
  - * <br/>For details on use and redistribution please refer to the
  - * <br/>LICENSE file included with these sources.
  + * 
  + *  ============================================================================
  + *                    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/>.
  + *  
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
    * @version $Revision$ $Name$
  
  
  
  1.1.2.11  +51 -6     xml-fop/src/org/apache/fop/fo/Attic/PropNames.java
  
  Index: PropNames.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropNames.java,v
  retrieving revision 1.1.2.10
  retrieving revision 1.1.2.11
  diff -u -r1.1.2.10 -r1.1.2.11
  --- PropNames.java    3 Dec 2002 07:26:58 -0000       1.1.2.10
  +++ PropNames.java    19 Mar 2003 14:36:48 -0000      1.1.2.11
  @@ -1,8 +1,53 @@
   /*
    * $Id$
  - * Copyright (C) 2001-2002 The Apache Software Foundation. All rights reserved.
  - * For details on use and redistribution please refer to the
  - * LICENSE file included with these sources.
  + * 
  + *  ============================================================================
  + *                    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/>.
  + *  
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
    * @version $Revision$ $Name$
    */
  
  
  
  1.1.2.19  +51 -6     xml-fop/src/org/apache/fop/fo/Attic/PropertyConsts.java
  
  Index: PropertyConsts.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropertyConsts.java,v
  retrieving revision 1.1.2.18
  retrieving revision 1.1.2.19
  diff -u -r1.1.2.18 -r1.1.2.19
  --- PropertyConsts.java       13 Nov 2002 04:09:53 -0000      1.1.2.18
  +++ PropertyConsts.java       19 Mar 2003 14:36:48 -0000      1.1.2.19
  @@ -1,8 +1,53 @@
   /**
    * $Id$
  - * <br/>Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
  - * <br/>For details on use and redistribution please refer to the
  - * <br/>LICENSE file included with these sources.
  + * 
  + *  ============================================================================
  + *                    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/>.
  + *  
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
    * @version $Revision$ $Name$
  
  
  
  1.1.2.22  +51 -6     xml-fop/src/org/apache/fop/fo/Attic/PropertySets.java
  
  Index: PropertySets.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropertySets.java,v
  retrieving revision 1.1.2.21
  retrieving revision 1.1.2.22
  diff -u -r1.1.2.21 -r1.1.2.22
  --- PropertySets.java 30 Oct 2002 14:29:59 -0000      1.1.2.21
  +++ PropertySets.java 19 Mar 2003 14:36:48 -0000      1.1.2.22
  @@ -1,8 +1,53 @@
   /**
    * $Id$
  - * <br/>Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
  - * <br/>For details on use and redistribution please refer to the
  - * <br/>LICENSE file included with these sources.
  + * 
  + *  ============================================================================
  + *                    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/>.
  + *  
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
    * @version $Revision$ $Name$
  
  
  
  1.1.2.3   +50 -5     xml-fop/src/org/apache/fop/fo/Attic/ReferenceAreaFO.java
  
  Index: ReferenceAreaFO.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/ReferenceAreaFO.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- ReferenceAreaFO.java      19 Oct 2002 03:49:04 -0000      1.1.2.2
  +++ ReferenceAreaFO.java      19 Mar 2003 14:36:48 -0000      1.1.2.3
  @@ -5,9 +5,54 @@
   /*
    * $Id$
    *
  - * 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.
  + * 
  + *  ============================================================================
  + *                    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/>.
  + *  
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
    * @version $Revision$ $Name$
    */
  
  
  
  1.1.2.7   +51 -6     xml-fop/src/org/apache/fop/fo/Attic/ShorthandPropSets.java
  
  Index: ShorthandPropSets.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/ShorthandPropSets.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- ShorthandPropSets.java    22 Nov 2002 02:48:34 -0000      1.1.2.6
  +++ ShorthandPropSets.java    19 Mar 2003 14:36:48 -0000      1.1.2.7
  @@ -1,8 +1,53 @@
   /**
    * $Id$
  - * <br/>Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
  - * <br/>For details on use and redistribution please refer to the
  - * <br/>LICENSE file included with these sources.
  + * 
  + *  ============================================================================
  + *                    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/>.
  + *  
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
    * @version $Revision$ $Name$
  
  
  
  1.1.2.3   +50 -5     xml-fop/src/org/apache/fop/fo/Attic/WritingModes.java
  
  Index: WritingModes.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/WritingModes.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- WritingModes.java 19 Oct 2002 03:49:04 -0000      1.1.2.2
  +++ WritingModes.java 19 Mar 2003 14:36:48 -0000      1.1.2.3
  @@ -3,9 +3,54 @@
   /*
    * $Id$
    *
  - * 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.
  + * 
  + *  ============================================================================
  + *                    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/>.
  + *  
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
    * @version $Revision$ $Name$
    */
  
  
  

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

Reply via email to