Ver código fonte

remove some global imports


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_20_2-maintain@196932 13f79535-47bb-0310-9956-ffa450edef68
fop-0_20_2-maintain
William Victor Mote 21 anos atrás
pai
commit
44c2d7deb9
63 arquivos alterados com 1166 adições e 820 exclusões
  1. 17
    14
      src/org/apache/fop/fo/FOText.java
  2. 18
    11
      src/org/apache/fop/fo/Property.java
  3. 61
    12
      src/org/apache/fop/fo/StandardElementMapping.java
  4. 19
    12
      src/org/apache/fop/fo/Title.java
  5. 11
    11
      src/org/apache/fop/fo/Unknown.java
  6. 11
    11
      src/org/apache/fop/fo/XMLElement.java
  7. 12
    11
      src/org/apache/fop/fo/XMLObj.java
  8. 14
    11
      src/org/apache/fop/fo/expr/LabelEndFunction.java
  9. 15
    11
      src/org/apache/fop/fo/expr/PropertyParser.java
  10. 15
    12
      src/org/apache/fop/fo/flow/AbstractFlow.java
  11. 28
    19
      src/org/apache/fop/fo/flow/AbstractTableBody.java
  12. 33
    21
      src/org/apache/fop/fo/flow/BasicLink.java
  13. 16
    12
      src/org/apache/fop/fo/flow/BidiOverride.java
  14. 25
    13
      src/org/apache/fop/fo/flow/Block.java
  15. 20
    13
      src/org/apache/fop/fo/flow/BlockContainer.java
  16. 19
    12
      src/org/apache/fop/fo/flow/Character.java
  17. 28
    14
      src/org/apache/fop/fo/flow/ExternalGraphic.java
  18. 14
    12
      src/org/apache/fop/fo/flow/Float.java
  19. 12
    11
      src/org/apache/fop/fo/flow/Flow.java
  20. 19
    12
      src/org/apache/fop/fo/flow/Footnote.java
  21. 15
    12
      src/org/apache/fop/fo/flow/FootnoteBody.java
  22. 19
    12
      src/org/apache/fop/fo/flow/InitialPropertySet.java
  23. 24
    17
      src/org/apache/fop/fo/flow/Inline.java
  24. 17
    12
      src/org/apache/fop/fo/flow/InlineContainer.java
  25. 27
    16
      src/org/apache/fop/fo/flow/InstreamForeignObject.java
  26. 25
    14
      src/org/apache/fop/fo/flow/Leader.java
  27. 21
    13
      src/org/apache/fop/fo/flow/ListBlock.java
  28. 20
    12
      src/org/apache/fop/fo/flow/ListItem.java
  29. 15
    12
      src/org/apache/fop/fo/flow/ListItemBody.java
  30. 15
    13
      src/org/apache/fop/fo/flow/ListItemLabel.java
  31. 19
    14
      src/org/apache/fop/fo/flow/Marker.java
  32. 15
    12
      src/org/apache/fop/fo/flow/MultiCase.java
  33. 15
    12
      src/org/apache/fop/fo/flow/MultiProperties.java
  34. 4
    2
      src/org/apache/fop/fo/flow/MultiPropertySet.java
  35. 15
    12
      src/org/apache/fop/fo/flow/MultiSwitch.java
  36. 15
    12
      src/org/apache/fop/fo/flow/MultiToggle.java
  37. 28
    17
      src/org/apache/fop/fo/flow/PageNumber.java
  38. 47
    34
      src/org/apache/fop/fo/flow/PageNumberCitation.java
  39. 18
    12
      src/org/apache/fop/fo/flow/StaticContent.java
  40. 41
    24
      src/org/apache/fop/fo/flow/Table.java
  41. 20
    12
      src/org/apache/fop/fo/flow/TableAndCaption.java
  42. 13
    12
      src/org/apache/fop/fo/flow/TableBody.java
  43. 19
    12
      src/org/apache/fop/fo/flow/TableCaption.java
  44. 26
    16
      src/org/apache/fop/fo/flow/TableCell.java
  45. 19
    14
      src/org/apache/fop/fo/flow/TableColumn.java
  46. 12
    11
      src/org/apache/fop/fo/flow/TableFooter.java
  47. 12
    11
      src/org/apache/fop/fo/flow/TableHeader.java
  48. 30
    19
      src/org/apache/fop/fo/flow/TableRow.java
  49. 13
    11
      src/org/apache/fop/fo/flow/Wrapper.java
  50. 15
    12
      src/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
  51. 12
    11
      src/org/apache/fop/fo/pagination/LayoutMasterSet.java
  52. 13
    12
      src/org/apache/fop/fo/pagination/PageMasterReference.java
  53. 18
    16
      src/org/apache/fop/fo/pagination/PageSequence.java
  54. 12
    11
      src/org/apache/fop/fo/pagination/PageSequenceMaster.java
  55. 13
    12
      src/org/apache/fop/fo/pagination/RegionAfter.java
  56. 13
    12
      src/org/apache/fop/fo/pagination/RegionBefore.java
  57. 12
    11
      src/org/apache/fop/fo/pagination/RegionEnd.java
  58. 12
    11
      src/org/apache/fop/fo/pagination/RegionStart.java
  59. 12
    11
      src/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
  60. 12
    11
      src/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
  61. 12
    11
      src/org/apache/fop/fo/pagination/Root.java
  62. 12
    11
      src/org/apache/fop/fo/pagination/SimplePageMaster.java
  63. 12
    11
      src/org/apache/fop/fo/pagination/SinglePageMasterReference.java

+ 17
- 14
src/org/apache/fop/fo/FOText.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo; package org.apache.fop.fo;


// FOP // FOP
import org.apache.fop.layout.Area; import org.apache.fop.layout.Area;
import org.apache.fop.layout.BlockArea; import org.apache.fop.layout.BlockArea;
import org.apache.fop.layout.FontState; import org.apache.fop.layout.FontState;
import org.apache.fop.layout.*;
import org.apache.fop.datatypes.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.TextState;
import org.apache.fop.layout.LinkSet;
import org.apache.fop.layout.LineArea;
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.fo.properties.WhiteSpaceCollapse;
import org.apache.fop.fo.properties.FontVariant;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


/** /**
} }
return false; return false;
} }
public int layout(Area area) throws FOPException { public int layout(Area area) throws FOPException {
if (!(area instanceof BlockArea)) { if (!(area instanceof BlockArea)) {
log.error("text outside block area" log.error("text outside block area"

+ 18
- 11
src/org/apache/fop/fo/Property.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo; package org.apache.fop.fo;


// FOP // FOP
import org.apache.fop.datatypes.*;
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.datatypes.CondLength;
import org.apache.fop.datatypes.LengthRange;
import org.apache.fop.datatypes.LengthPair;
import org.apache.fop.datatypes.Space;
import org.apache.fop.datatypes.Keep;
import org.apache.fop.datatypes.PercentBase;
import org.apache.fop.fo.expr.Numeric; import org.apache.fop.fo.expr.Numeric;
import org.apache.fop.fo.expr.PropertyParser; import org.apache.fop.fo.expr.PropertyParser;
import org.apache.fop.fo.expr.PropertyInfo; import org.apache.fop.fo.expr.PropertyInfo;

+ 61
- 12
src/org/apache/fop/fo/StandardElementMapping.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo; package org.apache.fop.fo;


import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;


import org.apache.fop.fo.properties.FOPropertyMapping; import org.apache.fop.fo.properties.FOPropertyMapping;
import org.apache.fop.fo.flow.*;
import org.apache.fop.fo.pagination.*;
import org.apache.fop.fo.flow.Flow;
import org.apache.fop.fo.flow.StaticContent;
import org.apache.fop.fo.flow.Block;
import org.apache.fop.fo.flow.BlockContainer;
import org.apache.fop.fo.flow.BidiOverride;
import org.apache.fop.fo.flow.InitialPropertySet;
import org.apache.fop.fo.flow.ExternalGraphic;
import org.apache.fop.fo.flow.InstreamForeignObject;
import org.apache.fop.fo.flow.Inline;
import org.apache.fop.fo.flow.InlineContainer;
import org.apache.fop.fo.flow.Leader;
import org.apache.fop.fo.flow.PageNumber;
import org.apache.fop.fo.flow.PageNumberCitation;
import org.apache.fop.fo.flow.TableAndCaption;
import org.apache.fop.fo.flow.Table;
import org.apache.fop.fo.flow.TableColumn;
import org.apache.fop.fo.flow.TableCaption;
import org.apache.fop.fo.flow.TableHeader;
import org.apache.fop.fo.flow.TableFooter;
import org.apache.fop.fo.flow.TableBody;
import org.apache.fop.fo.flow.TableRow;
import org.apache.fop.fo.flow.TableCell;
import org.apache.fop.fo.flow.ListBlock;
import org.apache.fop.fo.flow.ListItem;
import org.apache.fop.fo.flow.ListItemBody;
import org.apache.fop.fo.flow.ListItemLabel;
import org.apache.fop.fo.flow.BasicLink;
import org.apache.fop.fo.flow.MultiSwitch;
import org.apache.fop.fo.flow.MultiCase;
import org.apache.fop.fo.flow.MultiToggle;
import org.apache.fop.fo.flow.MultiProperties;
import org.apache.fop.fo.flow.MultiPropertySet;
import org.apache.fop.fo.flow.Footnote;
import org.apache.fop.fo.flow.FootnoteBody;
import org.apache.fop.fo.flow.Wrapper;
import org.apache.fop.fo.flow.Marker;
import org.apache.fop.fo.flow.RetrieveMarker;
import org.apache.fop.fo.pagination.Root;
import org.apache.fop.fo.pagination.PageSequence;
import org.apache.fop.fo.pagination.LayoutMasterSet;
import org.apache.fop.fo.pagination.PageSequenceMaster;
import org.apache.fop.fo.pagination.SinglePageMasterReference;
import org.apache.fop.fo.pagination.RepeatablePageMasterReference;
import org.apache.fop.fo.pagination.RepeatablePageMasterAlternatives;
import org.apache.fop.fo.pagination.ConditionalPageMasterReference;
import org.apache.fop.fo.pagination.SimplePageMaster;
import org.apache.fop.fo.pagination.RegionBody;
import org.apache.fop.fo.pagination.RegionBefore;
import org.apache.fop.fo.pagination.RegionAfter;
import org.apache.fop.fo.pagination.RegionStart;
import org.apache.fop.fo.pagination.RegionEnd;


public class StandardElementMapping implements ElementMapping { public class StandardElementMapping implements ElementMapping {
private static HashMap foObjs = null; private static HashMap foObjs = null;

+ 19
- 12
src/org/apache/fop/fo/Title.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo; package org.apache.fop.fo;


// FOP // FOP
import org.apache.fop.datatypes.*;
import org.apache.fop.layout.*;
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.layout.AuralProps;
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps;
import org.apache.fop.layout.FontState;
import org.apache.fop.layout.MarginInlineProps;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


/** /**

+ 11
- 11
src/org/apache/fop/fo/Unknown.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo; package org.apache.fop.fo;


// FOP // FOP
import org.apache.fop.layout.*;
import org.apache.fop.layout.Area;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


/** /**

+ 11
- 11
src/org/apache/fop/fo/XMLElement.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo; package org.apache.fop.fo;


// FOP // FOP
import org.apache.fop.layout.Area; import org.apache.fop.layout.Area;
import org.apache.fop.layout.inline.*;
import org.apache.fop.layout.inline.ForeignObjectArea;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


/** /**

+ 12
- 11
src/org/apache/fop/fo/XMLObj.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo; package org.apache.fop.fo;


// FOP // FOP
import org.apache.fop.layout.LinkSet; import org.apache.fop.layout.LinkSet;
import org.apache.fop.datatypes.IDReferences; import org.apache.fop.datatypes.IDReferences;


import org.w3c.dom.*;
import org.w3c.dom.Element;
import org.w3c.dom.Document;
import org.xml.sax.Attributes; import org.xml.sax.Attributes;


import java.util.ArrayList; import java.util.ArrayList;

+ 14
- 11
src/org/apache/fop/fo/expr/LabelEndFunction.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.expr; package org.apache.fop.fo.expr;


import org.apache.fop.datatypes.*;
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.LinearCombinationLength;
import org.apache.fop.datatypes.LengthBase;
import org.apache.fop.datatypes.PercentLength;
import org.apache.fop.fo.Property; import org.apache.fop.fo.Property;
import org.apache.fop.fo.LengthProperty; import org.apache.fop.fo.LengthProperty;
import org.apache.fop.fo.FObj; import org.apache.fop.fo.FObj;

+ 15
- 11
src/org/apache/fop/fo/expr/PropertyParser.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.expr; package org.apache.fop.fo.expr;


import org.apache.fop.fo.Property; import org.apache.fop.fo.Property;
import org.apache.fop.fo.NumberProperty; import org.apache.fop.fo.NumberProperty;
import org.apache.fop.fo.StringProperty; import org.apache.fop.fo.StringProperty;
import org.apache.fop.fo.ColorTypeProperty; import org.apache.fop.fo.ColorTypeProperty;
import org.apache.fop.datatypes.*;
import org.apache.fop.datatypes.PercentBase;
import org.apache.fop.datatypes.PercentLength;
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.FixedLength;
import org.apache.fop.datatypes.ColorType;


import java.util.HashMap; import java.util.HashMap;



+ 15
- 12
src/org/apache/fop/fo/flow/AbstractFlow.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.pagination.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.Status;
import org.apache.fop.fo.pagination.PageSequence;
import org.apache.fop.fo.pagination.Region;
import org.apache.fop.layout.Area; import org.apache.fop.layout.Area;
import org.apache.fop.layout.BodyAreaContainer; import org.apache.fop.layout.BodyAreaContainer;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;

+ 28
- 19
src/org/apache/fop/fo/flow/AbstractTableBody.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.datatypes.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.Status;
import org.apache.fop.fo.properties.Position;
import org.apache.fop.datatypes.KeepValue;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AreaContainer;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.layout.AuralProps;
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps;
import org.apache.fop.layout.RelativePositionProps;
import org.apache.fop.layout.BlockArea;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


// Java // Java
BorderAndPadding bap = propMgr.getBorderAndPadding(); BorderAndPadding bap = propMgr.getBorderAndPadding();
BackgroundProps bProps = propMgr.getBackgroundProps(); BackgroundProps bProps = propMgr.getBackgroundProps();


// Common Relative Position Properties
// Common Relative Position Properties
RelativePositionProps mRelProps = propMgr.getRelativePositionProps(); RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
// this.properties.get("id"); // this.properties.get("id");


this.spaceBefore = this.spaceBefore =
rowSpanMgr.setIgnoreKeeps(false); rowSpanMgr.setIgnoreKeeps(false);
} }
} }
/* Tell the row whether it is at the top of this area: if so, the row /* Tell the row whether it is at the top of this area: if so, the row
* should not honor keep-together. * should not honor keep-together.
*/ */
this.resetMarker(); this.resetMarker();
this.removeID(area.getIDReferences()); this.removeID(area.getIDReferences());
} }
/** /**
* Return true if the passed area is on the left edge of its nearest * Return true if the passed area is on the left edge of its nearest
* absolute AreaContainer (generally a page column). * absolute AreaContainer (generally a page column).
*/ */
private boolean startsAC(Area area) { private boolean startsAC(Area area) {
Area parent=null; Area parent=null;
while ((parent = area.getParent()) != null && while ((parent = area.getParent()) != null &&
parent.hasNonSpaceChildren() == false) { parent.hasNonSpaceChildren() == false) {
// The area will be the first non-space child in its parent // The area will be the first non-space child in its parent

+ 33
- 21
src/org/apache/fop/fo/flow/BasicLink.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.Status;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.properties.Position;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.layout.AuralProps;
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps;
import org.apache.fop.layout.MarginInlineProps;
import org.apache.fop.layout.RelativePositionProps;
import org.apache.fop.layout.LinkSet;
import org.apache.fop.layout.Page;
import org.apache.fop.layout.AreaContainer;


public class BasicLink extends Inline { public class BasicLink extends Inline {


// this.properties.get("baseline-shift"); // this.properties.get("baseline-shift");
// this.properties.get("destination-place-offset"); // this.properties.get("destination-place-offset");
// this.properties.get("dominant-baseline"); // this.properties.get("dominant-baseline");
// this.properties.get("external-destination");
// this.properties.get("external-destination");
// this.properties.get("id"); // this.properties.get("id");
// this.properties.get("indicate-destination");
// this.properties.get("internal-destination");
// this.properties.get("indicate-destination");
// this.properties.get("internal-destination");
// this.properties.get("keep-together"); // this.properties.get("keep-together");
// this.properties.get("keep-with-next"); // this.properties.get("keep-with-next");
// this.properties.get("keep-with-previous"); // this.properties.get("keep-with-previous");
// this.properties.get("line-height"); // this.properties.get("line-height");
// this.properties.get("line-height-shift-adjustment"); // this.properties.get("line-height-shift-adjustment");
// this.properties.get("show-destination");
// this.properties.get("target-processing-context");
// this.properties.get("target-presentation-context");
// this.properties.get("target-stylesheet");
// this.properties.get("show-destination");
// this.properties.get("target-processing-context");
// this.properties.get("target-presentation-context");
// this.properties.get("target-stylesheet");


if (!(destination = if (!(destination =
this.properties.get("internal-destination").getString()).equals("")) { this.properties.get("internal-destination").getString()).equals("")) {
} else if (destination.startsWith("'") && destination.endsWith("'")) { } else if (destination.startsWith("'") && destination.endsWith("'")) {
destination = destination.substring(1, destination.length() - 1); destination = destination.substring(1, destination.length() - 1);
} }
}
}
} else { } else {
throw new FOPException("internal-destination or external-destination must be specified in basic-link", systemId, line, column); throw new FOPException("internal-destination or external-destination must be specified in basic-link", systemId, line, column);
} }

+ 16
- 12
src/org/apache/fop/fo/flow/BidiOverride.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.ToBeImplementedElement;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AuralProps;
import org.apache.fop.layout.RelativePositionProps;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


/** /**

+ 25
- 13
src/org/apache/fop/fo/flow/Block.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.FObjMixed;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.Status;
import org.apache.fop.fo.FONode;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.BlockArea;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.layout.AuralProps;
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps;
import org.apache.fop.layout.HyphenationProps;
import org.apache.fop.layout.MarginProps;
import org.apache.fop.layout.RelativePositionProps;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


/* /*
the reference to BlockArea was made local, the required information the reference to BlockArea was made local, the required information
is now stored (instead of a reference to the complex BlockArea object) is now stored (instead of a reference to the complex BlockArea object)
and it appears that there are a lot of changes in this file, in fact and it appears that there are a lot of changes in this file, in fact
there are only a few sematic changes; mostly I just got rid of
there are only a few sematic changes; mostly I just got rid of
"this." from blockArea since BlockArea is now local. "this." from blockArea since BlockArea is now local.
*/ */



+ 20
- 13
src/org/apache/fop/fo/flow/BlockContainer.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.Status;
import org.apache.fop.fo.properties.Position;
import org.apache.fop.fo.pagination.PageSequence; import org.apache.fop.fo.pagination.PageSequence;
import org.apache.fop.layout.*;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AreaContainer;
import org.apache.fop.layout.AbsolutePositionProps;
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps;
import org.apache.fop.layout.MarginProps;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


public class BlockContainer extends FObj { public class BlockContainer extends FObj {

+ 19
- 12
src/org/apache/fop/fo/flow/Character.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// fop // fop
import org.apache.fop.fo.*;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.Status;
import org.apache.fop.datatypes.ColorType; import org.apache.fop.datatypes.ColorType;
import org.apache.fop.layout.BlockArea; import org.apache.fop.layout.BlockArea;
import org.apache.fop.layout.*;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AuralProps;
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps;
import org.apache.fop.layout.HyphenationProps;
import org.apache.fop.layout.MarginInlineProps;
import org.apache.fop.layout.RelativePositionProps;
import org.apache.fop.fo.FObj; import org.apache.fop.fo.FObj;
import org.apache.fop.layout.LineArea; import org.apache.fop.layout.LineArea;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;

+ 28
- 14
src/org/apache/fop/fo/flow/ExternalGraphic.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.Status;
import org.apache.fop.fo.properties.BreakBefore;
import org.apache.fop.fo.properties.BreakAfter;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.layout.AuralProps;
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps;
import org.apache.fop.layout.MarginInlineProps;
import org.apache.fop.layout.RelativePositionProps;
import org.apache.fop.layout.BlockArea;
import org.apache.fop.layout.LineArea;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;
import org.apache.fop.image.*;
import org.apache.fop.image.ImageArea;
import org.apache.fop.image.FopImageException;
import org.apache.fop.image.FopImage;
import org.apache.fop.image.FopImageFactory;


// Java // Java
import java.net.MalformedURLException; import java.net.MalformedURLException;

+ 14
- 12
src/org/apache/fop/fo/flow/Float.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.ToBeImplementedElement;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.layout.Area;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


/** /**

+ 12
- 11
src/org/apache/fop/fo/flow/Flow.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


public class Flow extends AbstractFlow { public class Flow extends AbstractFlow {

+ 19
- 12
src/org/apache/fop/fo/flow/Footnote.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.Status;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.Page;
import org.apache.fop.layout.BlockArea;
import org.apache.fop.layout.BodyAreaContainer;
import org.apache.fop.layout.AreaContainer;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


// Java // Java

+ 15
- 12
src/org/apache/fop/fo/flow/FootnoteBody.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.Status;
import org.apache.fop.layout.Area; import org.apache.fop.layout.Area;
import org.apache.fop.layout.AreaClass; import org.apache.fop.layout.AreaClass;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;
import org.apache.fop.layout.*;
import org.apache.fop.layout.BlockArea;


public class FootnoteBody extends FObj { public class FootnoteBody extends FObj {



+ 19
- 12
src/org/apache/fop/fo/flow/InitialPropertySet.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.ToBeImplementedElement;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.layout.AuralProps;
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps;
import org.apache.fop.layout.RelativePositionProps;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


/** /**

+ 24
- 17
src/org/apache/fop/fo/flow/Inline.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.FObjMixed;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.layout.AuralProps;
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps;
import org.apache.fop.layout.MarginInlineProps;
import org.apache.fop.layout.RelativePositionProps;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


public class Inline extends FObjMixed { public class Inline extends FObjMixed {


// Common Accessibility Properties // Common Accessibility Properties
AccessibilityProps mAccProps = propMgr.getAccessibilityProps(); AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
// Common Aural Properties
// Common Aural Properties
AuralProps mAurProps = propMgr.getAuralProps(); AuralProps mAurProps = propMgr.getAuralProps();


// Common Border, Padding, and Background Properties // Common Border, Padding, and Background Properties
BorderAndPadding bap = propMgr.getBorderAndPadding(); BorderAndPadding bap = propMgr.getBorderAndPadding();
BackgroundProps bProps = propMgr.getBackgroundProps(); BackgroundProps bProps = propMgr.getBackgroundProps();
// Common Font Properties // Common Font Properties
//this.fontState = propMgr.getFontState(area.getFontInfo()); //this.fontState = propMgr.getFontState(area.getFontInfo());


// Common Margin Properties-Inline // Common Margin Properties-Inline
MarginInlineProps mProps = propMgr.getMarginInlineProps(); MarginInlineProps mProps = propMgr.getMarginInlineProps();
// Common Relative Position Properties // Common Relative Position Properties
RelativePositionProps mRelProps = propMgr.getRelativePositionProps(); RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
// this.properties.get("alignment-adjust"); // this.properties.get("alignment-adjust");
// this.properties.get("alignment-baseline"); // this.properties.get("alignment-baseline");
// this.properties.get("baseline-shift"); // this.properties.get("baseline-shift");

+ 17
- 12
src/org/apache/fop/fo/flow/InlineContainer.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.ToBeImplementedElement;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps;
import org.apache.fop.layout.MarginInlineProps;
import org.apache.fop.layout.RelativePositionProps;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


/** /**

+ 27
- 16
src/org/apache/fop/fo/flow/InstreamForeignObject.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.*;
import org.apache.fop.layout.inline.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.Status;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.properties.BreakBefore;
import org.apache.fop.fo.properties.BreakAfter;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.layout.AuralProps;
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps;
import org.apache.fop.layout.MarginInlineProps;
import org.apache.fop.layout.RelativePositionProps;
import org.apache.fop.layout.LineArea;
import org.apache.fop.layout.inline.ForeignObjectArea;
import org.apache.fop.layout.BlockArea; import org.apache.fop.layout.BlockArea;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;




// Common Accessibility Properties // Common Accessibility Properties
AccessibilityProps mAccProps = propMgr.getAccessibilityProps(); AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
// Common Aural Properties // Common Aural Properties
AuralProps mAurProps = propMgr.getAuralProps(); AuralProps mAurProps = propMgr.getAuralProps();


// this.properties.get("content-width"); // this.properties.get("content-width");
// this.properties.get("display-align"); // this.properties.get("display-align");
// this.properties.get("dominant-baseline"); // this.properties.get("dominant-baseline");
// this.properties.get("height");
// this.properties.get("height");
// this.properties.get("id"); // this.properties.get("id");
// this.properties.get("inline-progression-dimension"); // this.properties.get("inline-progression-dimension");
// this.properties.get("keep-with-next"); // this.properties.get("keep-with-next");

+ 25
- 14
src/org/apache/fop/fo/flow/Leader.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.datatypes.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.FObjMixed;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.Status;
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.PercentLength;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.layout.AuralProps;
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps;
import org.apache.fop.layout.MarginInlineProps;
import org.apache.fop.layout.RelativePositionProps;
import org.apache.fop.layout.BlockArea; import org.apache.fop.layout.BlockArea;
import org.apache.fop.layout.LineArea; import org.apache.fop.layout.LineArea;
import org.apache.fop.layout.FontState; import org.apache.fop.layout.FontState;
} }
throw e; throw e;
} }
// adds leader to blockarea, there the leaderArea is generated // adds leader to blockarea, there the leaderArea is generated
int succeeded = addLeader(blockArea, int succeeded = addLeader(blockArea,
propMgr.getFontState(area.getFontInfo()), propMgr.getFontState(area.getFontInfo()),

+ 21
- 13
src/org/apache/fop/fo/flow/ListBlock.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.Status;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.layout.AuralProps;
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps;
import org.apache.fop.layout.MarginProps;
import org.apache.fop.layout.RelativePositionProps;
import org.apache.fop.layout.BlockArea; import org.apache.fop.layout.BlockArea;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;




// Common Accessibility Properties // Common Accessibility Properties
AccessibilityProps mAccProps = propMgr.getAccessibilityProps(); AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
// Common Aural Properties // Common Aural Properties
AuralProps mAurProps = propMgr.getAuralProps(); AuralProps mAurProps = propMgr.getAuralProps();



+ 20
- 12
src/org/apache/fop/fo/flow/ListItem.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.Status;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.layout.AuralProps;
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps;
import org.apache.fop.layout.MarginProps;
import org.apache.fop.layout.RelativePositionProps;
import org.apache.fop.layout.BlockArea; import org.apache.fop.layout.BlockArea;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;



+ 15
- 12
src/org/apache/fop/fo/flow/ListItemBody.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.Status;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


public class ListItemBody extends FObj { public class ListItemBody extends FObj {

+ 15
- 13
src/org/apache/fop/fo/flow/ListItemLabel.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


public class ListItemLabel extends FObj { public class ListItemLabel extends FObj {


// Common Accessibility Properties // Common Accessibility Properties
AccessibilityProps mAccProps = propMgr.getAccessibilityProps(); AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
// this.properties.get("id"); // this.properties.get("id");
// this.properties.get("keep-together"); // this.properties.get("keep-together");



+ 19
- 14
src/org/apache/fop/fo/flow/Marker.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.FObjMixed;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.Status;
import org.apache.fop.fo.FONode;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.Page;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


public class Marker extends FObjMixed { public class Marker extends FObjMixed {


public boolean mayPrecedeMarker() { public boolean mayPrecedeMarker() {
return true; return true;
}
}


// The page the marker was registered is put into the renderer // The page the marker was registered is put into the renderer
// queue. The marker is transferred to it's own marker list, // queue. The marker is transferred to it's own marker list,
isLast = registryArea.isLast(); isLast = registryArea.isLast();
registryArea = null; registryArea = null;
} }
// This has actually nothing to do with resseting this marker, // This has actually nothing to do with resseting this marker,
// but the 'marker' from FONode, marking layout status. // but the 'marker' from FONode, marking layout status.
// Called in case layout is to be rolled back. Unregister this // Called in case layout is to be rolled back. Unregister this

+ 15
- 12
src/org/apache/fop/fo/flow/MultiCase.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.ToBeImplementedElement;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


/** /**

+ 15
- 12
src/org/apache/fop/fo/flow/MultiProperties.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.ToBeImplementedElement;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


/** /**

+ 4
- 2
src/org/apache/fop/fo/flow/MultiPropertySet.java Ver arquivo

package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.ToBeImplementedElement;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.layout.Area;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


/** /**

+ 15
- 12
src/org/apache/fop/fo/flow/MultiSwitch.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.ToBeImplementedElement;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


/** /**

+ 15
- 12
src/org/apache/fop/fo/flow/MultiToggle.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.ToBeImplementedElement;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


/** /**

+ 28
- 17
src/org/apache/fop/fo/flow/PageNumber.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.*;
import org.apache.fop.datatypes.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.Status;
import org.apache.fop.fo.FOText;
import org.apache.fop.layout.TextState;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.BlockArea;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.layout.AuralProps;
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps;
import org.apache.fop.layout.MarginInlineProps;
import org.apache.fop.layout.RelativePositionProps;
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.fo.properties.VerticalAlign;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


public class PageNumber extends FObj { public class PageNumber extends FObj {


// Common Accessibility Properties // Common Accessibility Properties
AccessibilityProps mAccProps = propMgr.getAccessibilityProps(); AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
// Common Aural Properties // Common Aural Properties
AuralProps mAurProps = propMgr.getAuralProps(); AuralProps mAurProps = propMgr.getAuralProps();




// Common Font Properties // Common Font Properties
//this.fontState = propMgr.getFontState(area.getFontInfo()); //this.fontState = propMgr.getFontState(area.getFontInfo());
// Common Margin Properties-Inline // Common Margin Properties-Inline
MarginInlineProps mProps = propMgr.getMarginInlineProps(); MarginInlineProps mProps = propMgr.getMarginInlineProps();


// Common Relative Position Properties // Common Relative Position Properties
RelativePositionProps mRelProps = propMgr.getRelativePositionProps(); RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
// this.properties.get("alignment-adjust"); // this.properties.get("alignment-adjust");
// this.properties.get("alignment-baseline"); // this.properties.get("alignment-baseline");
// this.properties.get("baseline-shift"); // this.properties.get("baseline-shift");

+ 47
- 34
src/org/apache/fop/fo/flow/PageNumberCitation.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.datatypes.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.Status;
import org.apache.fop.fo.FOText;
import org.apache.fop.datatypes.IDReferences;
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.fo.properties.VerticalAlign;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.TextState;
import org.apache.fop.layout.BlockArea;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.layout.AuralProps;
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps;
import org.apache.fop.layout.MarginInlineProps;
import org.apache.fop.layout.RelativePositionProps;
import org.apache.fop.layout.LineArea;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;




this.area = area; this.area = area;
if (this.marker == START) { if (this.marker == START) {


// Common Accessibility Properties
// Common Accessibility Properties
AccessibilityProps mAccProps = propMgr.getAccessibilityProps(); AccessibilityProps mAccProps = propMgr.getAccessibilityProps();


// Common Aural Properties
AuralProps mAurProps = propMgr.getAuralProps();
// Common Aural Properties
AuralProps mAurProps = propMgr.getAuralProps();


// Common Border, Padding, and Background Properties
BorderAndPadding bap = propMgr.getBorderAndPadding();
BackgroundProps bProps = propMgr.getBackgroundProps();
// Common Border, Padding, and Background Properties
BorderAndPadding bap = propMgr.getBorderAndPadding();
BackgroundProps bProps = propMgr.getBackgroundProps();


// Common Font Properties
//this.fontState = propMgr.getFontState(area.getFontInfo());
// Common Font Properties
//this.fontState = propMgr.getFontState(area.getFontInfo());


// Common Margin Properties-Inline
MarginInlineProps mProps = propMgr.getMarginInlineProps();
// Common Margin Properties-Inline
MarginInlineProps mProps = propMgr.getMarginInlineProps();


// Common Relative Position Properties
// Common Relative Position Properties
RelativePositionProps mRelProps = propMgr.getRelativePositionProps(); RelativePositionProps mRelProps = propMgr.getRelativePositionProps();


// this.properties.get("alignment-adjust");
// this.properties.get("alignment-baseline");
// this.properties.get("baseline-shift");
// this.properties.get("dominant-baseline");
// this.properties.get("id");
// this.properties.get("keep-with-next");
// this.properties.get("alignment-adjust");
// this.properties.get("alignment-baseline");
// this.properties.get("baseline-shift");
// this.properties.get("dominant-baseline");
// this.properties.get("id");
// this.properties.get("keep-with-next");
// this.properties.get("keep-with-previous"); // this.properties.get("keep-with-previous");
// this.properties.get("letter-spacing"); // this.properties.get("letter-spacing");
// this.properties.get("line-height"); // this.properties.get("line-height");
// this.properties.get("line-height-shift-adjustment");
// this.properties.get("ref-id");
// this.properties.get("score-spaces");
// this.properties.get("line-height-shift-adjustment");
// this.properties.get("ref-id");
// this.properties.get("score-spaces");
// this.properties.get("text-decoration"); // this.properties.get("text-decoration");
// this.properties.get("text-shadow"); // this.properties.get("text-shadow");
// this.properties.get("text-transform"); // this.properties.get("text-transform");

+ 18
- 12
src/org/apache/fop/fo/flow/StaticContent.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.pagination.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.Status;
import org.apache.fop.fo.pagination.Region;
import org.apache.fop.fo.pagination.RegionBefore;
import org.apache.fop.fo.pagination.RegionAfter;
import org.apache.fop.fo.pagination.RegionStart;
import org.apache.fop.fo.pagination.RegionEnd;
import org.apache.fop.layout.Area; import org.apache.fop.layout.Area;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;



+ 41
- 24
src/org/apache/fop/fo/flow/Table.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.*;
import org.apache.fop.datatypes.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.Status;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.properties.TableLayout;
import org.apache.fop.fo.properties.TableOmitHeaderAtBreak;
import org.apache.fop.fo.properties.TableOmitFooterAtBreak;
import org.apache.fop.fo.properties.BreakBefore;
import org.apache.fop.fo.properties.Position;
import org.apache.fop.fo.properties.BreakAfter;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AreaContainer;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.layout.AuralProps;
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps;
import org.apache.fop.layout.MarginProps;
import org.apache.fop.layout.RelativePositionProps;
import org.apache.fop.layout.BlockArea;
import org.apache.fop.datatypes.LengthRange;
import org.apache.fop.datatypes.Length;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


// Java // Java
// Common Margin Properties-Block // Common Margin Properties-Block
MarginProps mProps = propMgr.getMarginProps(); MarginProps mProps = propMgr.getMarginProps();


// Common Relative Position Properties
// Common Relative Position Properties
RelativePositionProps mRelProps = propMgr.getRelativePositionProps(); RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
// this.properties.get("block-progression-dimension"); // this.properties.get("block-progression-dimension");
// this.properties.get("border-after-precendence");
// this.properties.get("border-after-precendence");
// this.properties.get("border-before-precedence"); // this.properties.get("border-before-precedence");
// this.properties.get("border-collapse"); // this.properties.get("border-collapse");
// this.properties.get("border-end-precendence"); // this.properties.get("border-end-precendence");
// this.properties.get("keep-together"); // this.properties.get("keep-together");
// this.properties.get("keep-with-next"); // this.properties.get("keep-with-next");
// this.properties.get("keep-with-previous"); // this.properties.get("keep-with-previous");
// this.properties.get("table-layout");
// this.properties.get("table-omit-footer-at-break");
// this.properties.get("table-layout");
// this.properties.get("table-omit-footer-at-break");
// this.properties.get("table-omit-header-at-break"); // this.properties.get("table-omit-header-at-break");
// this.properties.get("width");
// this.properties.get("writing-mode");
// this.properties.get("width");
// this.properties.get("writing-mode");


this.breakBefore = this.properties.get("break-before").getEnum(); this.breakBefore = this.properties.get("break-before").getEnum();
this.breakAfter = this.properties.get("break-after").getEnum(); this.breakAfter = this.properties.get("break-after").getEnum();
this.properties.get("inline-progression-dimension"). this.properties.get("inline-progression-dimension").
getLengthRange(); getLengthRange();
this.height = this.properties.get("height").getLength().mvalue(); this.height = this.properties.get("height").getLength().mvalue();
this.bAutoLayout = (this.properties.get("table-layout").getEnum() ==
this.bAutoLayout = (this.properties.get("table-layout").getEnum() ==
TableLayout.AUTO); TableLayout.AUTO);


this.id = this.properties.get("id").getString(); this.id = this.properties.get("id").getString();
log.warn("table-layout=auto is not supported, using fixed!"); log.warn("table-layout=auto is not supported, using fixed!");
} }
// Pretend it's fixed... // Pretend it's fixed...
this.contentWidth =
this.contentWidth =
calcFixedColumnWidths(areaContainer.getAllocationWidth()); calcFixedColumnWidths(areaContainer.getAllocationWidth());
} }
areaContainer.setAllocationWidth(this.contentWidth); areaContainer.setAllocationWidth(this.contentWidth);
layoutColumns(areaContainer); layoutColumns(areaContainer);
for (int i = this.marker; i < numChildren; i++) { for (int i = this.marker; i < numChildren; i++) {
FONode fo = (FONode)children.get(i); FONode fo = (FONode)children.get(i);
if (fo instanceof Marker) { if (fo instanceof Marker) {

+ 20
- 12
src/org/apache/fop/fo/flow/TableAndCaption.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.ToBeImplementedElement;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.layout.AuralProps;
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps;
import org.apache.fop.layout.MarginProps;
import org.apache.fop.layout.RelativePositionProps;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


/** /**

+ 13
- 12
src/org/apache/fop/fo/flow/TableBody.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


public class TableBody extends AbstractTableBody { public class TableBody extends AbstractTableBody {
} }


public TableBody(FObj parent, PropertyList propertyList, public TableBody(FObj parent, PropertyList propertyList,
String systemId, int line, int column)
String systemId, int line, int column)
throws FOPException { throws FOPException {
super(parent, propertyList, systemId, line, column); super(parent, propertyList, systemId, line, column);
} }

+ 19
- 12
src/org/apache/fop/fo/flow/TableCaption.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.ToBeImplementedElement;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.layout.AuralProps;
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps;
import org.apache.fop.layout.RelativePositionProps;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


/** /**

+ 26
- 16
src/org/apache/fop/fo/flow/TableCell.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.Status;
import org.apache.fop.fo.properties.BorderCollapse;
import org.apache.fop.fo.properties.DisplayAlign;
import org.apache.fop.fo.properties.Position;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.layout.AuralProps;
import org.apache.fop.layout.BackgroundProps;
import org.apache.fop.layout.RelativePositionProps;
import org.apache.fop.layout.AreaContainer;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


public class TableCell extends FObj { public class TableCell extends FObj {


// boolean setup = false; // boolean setup = false;
boolean bSepBorders = true; boolean bSepBorders = true;
/** /**
* Set to true if all content completely laid out. * Set to true if all content completely laid out.
*/ */
cellArea.setIDReferences(area.getIDReferences()); cellArea.setIDReferences(area.getIDReferences());
// Add adjust for padding and border to fix link alignment! // Add adjust for padding and border to fix link alignment!
cellArea.setTableCellXOffset(startOffset + startAdjust); cellArea.setTableCellXOffset(startOffset + startAdjust);
this.areaContainerRef = new java.lang.ref.WeakReference(cellArea); this.areaContainerRef = new java.lang.ref.WeakReference(cellArea);


int numChildren = this.children.size(); int numChildren = this.children.size();
this.borderHeight = (borderBefore + borderAfter) / 2; this.borderHeight = (borderBefore + borderAfter) / 2;
} }
} }


} }

+ 19
- 14
src/org/apache/fop/fo/flow/TableColumn.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.Status;
import org.apache.fop.fo.properties.Position;
import org.apache.fop.layout.AreaContainer;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;
import org.apache.fop.datatypes.*;
import org.apache.fop.datatypes.Length;


public class TableColumn extends FObj { public class TableColumn extends FObj {



+ 12
- 11
src/org/apache/fop/fo/flow/TableFooter.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


public class TableFooter extends AbstractTableBody { public class TableFooter extends AbstractTableBody {

+ 12
- 11
src/org/apache/fop/fo/flow/TableHeader.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


public class TableHeader extends AbstractTableBody { public class TableHeader extends AbstractTableBody {

+ 30
- 19
src/org/apache/fop/fo/flow/TableRow.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.datatypes.*;
import org.apache.fop.layout.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.Property;
import org.apache.fop.fo.Status;
import org.apache.fop.fo.properties.Constants;
import org.apache.fop.fo.properties.Position;
import org.apache.fop.fo.properties.BreakAfter;
import org.apache.fop.datatypes.KeepValue;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AccessibilityProps;
import org.apache.fop.layout.AuralProps;
import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps;
import org.apache.fop.layout.RelativePositionProps;
import org.apache.fop.layout.AreaContainer;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


// Java // Java
public java.lang.ref.WeakReference areaContainerRef; public java.lang.ref.WeakReference areaContainerRef;


boolean areaAdded = false; boolean areaAdded = false;
boolean bIgnoreKeepTogether = false; boolean bIgnoreKeepTogether = false;
private RowSpanMgr rowSpanMgr = null; private RowSpanMgr rowSpanMgr = null;
private CellArray cellArray = null; private CellArray cellArray = null;




// Common Accessibility Properties // Common Accessibility Properties
AccessibilityProps mAccProps = propMgr.getAccessibilityProps(); AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
// this.properties.get("block-progression-dimension"); // this.properties.get("block-progression-dimension");


// Common Aural Properties // Common Aural Properties


// Common Relative Position Properties // Common Relative Position Properties
RelativePositionProps mRelProps = propMgr.getRelativePositionProps(); RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
// this.properties.get("break-before"); // this.properties.get("break-before");
// this.properties.get("break-after"); // this.properties.get("break-after");
// this.properties.get("id"); // this.properties.get("id");
} }
return width; return width;
} }
void setIgnoreKeepTogether(boolean bIgnoreKeepTogether) { void setIgnoreKeepTogether(boolean bIgnoreKeepTogether) {
this.bIgnoreKeepTogether = bIgnoreKeepTogether; this.bIgnoreKeepTogether = bIgnoreKeepTogether;
} }

+ 13
- 11
src/org/apache/fop/fo/flow/Wrapper.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.flow; package org.apache.fop.fo.flow;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.FObjMixed;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


/** /**

+ 15
- 12
src/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.pagination; package org.apache.fop.fo.pagination;


import org.apache.fop.fo.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.properties.PagePosition;
import org.apache.fop.fo.properties.OddOrEven;
import org.apache.fop.fo.properties.BlankOrNotBlank;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


/** /**

+ 12
- 11
src/org/apache/fop/fo/pagination/LayoutMasterSet.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.pagination; package org.apache.fop.fo.pagination;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


// Java // Java

+ 13
- 12
src/org/apache/fop/fo/pagination/PageMasterReference.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.pagination; package org.apache.fop.fo.pagination;


import org.apache.fop.fo.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


/** /**
public String getMasterName() { public String getMasterName() {
return masterName; return masterName;
} }
public abstract String getNextPageMasterName(boolean isOddPage, public abstract String getNextPageMasterName(boolean isOddPage,
boolean isFirstPage, boolean isFirstPage,
boolean isEmptyPage) boolean isEmptyPage)

+ 18
- 16
src/org/apache/fop/fo/pagination/PageSequence.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.pagination; package org.apache.fop.fo.pagination;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.Status;
import org.apache.fop.fo.properties.ForcePageCount;
import org.apache.fop.fo.flow.Flow; import org.apache.fop.fo.flow.Flow;
import org.apache.fop.fo.flow.StaticContent; import org.apache.fop.fo.flow.StaticContent;
import org.apache.fop.layout.AreaContainer; import org.apache.fop.layout.AreaContainer;
if (status == Status.FORCE_PAGE_BREAK_EVEN) { if (status == Status.FORCE_PAGE_BREAK_EVEN) {
if ((currentPageNumber % 2) == 1) { if ((currentPageNumber % 2) == 1) {
isBlankPage = true; isBlankPage = true;
}
}
} else if (status == Status.FORCE_PAGE_BREAK_ODD) { } else if (status == Status.FORCE_PAGE_BREAK_ODD) {
if ((currentPageNumber % 2) == 0) { if ((currentPageNumber % 2) == 0) {
isBlankPage = true; isBlankPage = true;
}
}
} }
currentPage = makePage(areaTree, isBlankPage, currentPage); currentPage = makePage(areaTree, isBlankPage, currentPage);
status = flow.getStatus(); status = flow.getStatus();
public StaticContent getStaticContent(String regionName) { public StaticContent getStaticContent(String regionName) {
return (StaticContent)flowMap.get(regionName); return (StaticContent)flowMap.get(regionName);
} }
public int getCurrentPageNumber() { public int getCurrentPageNumber() {
return currentPageNumber;
return currentPageNumber;
} }


public int getPageCount() { public int getPageCount() {

+ 12
- 11
src/org/apache/fop/fo/pagination/PageSequenceMaster.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.pagination; package org.apache.fop.fo.pagination;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


// Java // Java

+ 13
- 12
src/org/apache/fop/fo/pagination/RegionAfter.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.pagination; package org.apache.fop.fo.pagination;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.properties.Precedence;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;
import org.apache.fop.layout.RegionArea; import org.apache.fop.layout.RegionArea;
import org.apache.fop.layout.BorderAndPadding; import org.apache.fop.layout.BorderAndPadding;

+ 13
- 12
src/org/apache/fop/fo/pagination/RegionBefore.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.pagination; package org.apache.fop.fo.pagination;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.properties.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.properties.Precedence;
import org.apache.fop.layout.RegionArea; import org.apache.fop.layout.RegionArea;
import org.apache.fop.layout.BorderAndPadding; import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps; import org.apache.fop.layout.BackgroundProps;

+ 12
- 11
src/org/apache/fop/fo/pagination/RegionEnd.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.pagination; package org.apache.fop.fo.pagination;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.layout.RegionArea; import org.apache.fop.layout.RegionArea;
import org.apache.fop.layout.BorderAndPadding; import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps; import org.apache.fop.layout.BackgroundProps;

+ 12
- 11
src/org/apache/fop/fo/pagination/RegionStart.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.pagination; package org.apache.fop.fo.pagination;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.layout.RegionArea; import org.apache.fop.layout.RegionArea;
import org.apache.fop.layout.BorderAndPadding; import org.apache.fop.layout.BorderAndPadding;
import org.apache.fop.layout.BackgroundProps; import org.apache.fop.layout.BackgroundProps;

+ 12
- 11
src/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.pagination; package org.apache.fop.fo.pagination;


import org.apache.fop.fo.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


// Java // Java

+ 12
- 11
src/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.pagination; package org.apache.fop.fo.pagination;


import org.apache.fop.fo.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


/** /**

+ 12
- 11
src/org/apache/fop/fo/pagination/Root.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.pagination; package org.apache.fop.fo.pagination;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


/** /**

+ 12
- 11
src/org/apache/fop/fo/pagination/SimplePageMaster.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.pagination; package org.apache.fop.fo.pagination;


// FOP // FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.layout.PageMaster; import org.apache.fop.layout.PageMaster;
import org.apache.fop.layout.BodyRegionArea; import org.apache.fop.layout.BodyRegionArea;
import org.apache.fop.layout.MarginProps; import org.apache.fop.layout.MarginProps;

+ 12
- 11
src/org/apache/fop/fo/pagination/SinglePageMasterReference.java Ver arquivo

* ============================================================================ * ============================================================================
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* ============================================================================ * ============================================================================
*
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
*
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
*
*
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
*
*
* 2. Redistributions in binary form must reproduce the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation * this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution. * and/or other materials provided with the distribution.
*
*
* 3. The end-user documentation included with the redistribution, if any, must * 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software * include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)." * developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if * Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear. * and wherever such third-party acknowledgments normally appear.
*
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to * 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior * endorse or promote products derived from this software without prior
* written permission. For written permission, please contact * written permission. For written permission, please contact
* apache@apache.org. * apache@apache.org.
*
*
* 5. Products derived from this software may not be called "Apache", nor may * 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" appear in their name, without prior written permission of the
* Apache Software Foundation. * Apache Software Foundation.
*
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================ * ============================================================================
*
*
* This software consists of voluntary contributions made by many individuals * This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by * on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jtauber@jtauber.com>. For more information on the Apache * James Tauber <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>. * Software Foundation, please see <http://www.apache.org/>.
*/
*/
package org.apache.fop.fo.pagination; package org.apache.fop.fo.pagination;


import org.apache.fop.fo.*;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;


/** /**

Carregando…
Cancelar
Salvar