You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ke...@apache.org on 2002/07/31 12:05:25 UTC
cvs commit: xml-fop/test/xml/bugtests background_color.fo background_transparent.fo block-container.fo block.fo border.fo break-before.fo color.fo font-family.fo font-size.fo font.fo header_footer.fo indent.fo inline.fo keep-with-next.fo leader.fo letter-spacing.fo line-height.fo padding.fo page-number.fo rule.fo space-treatment.fo space.fo text-align.fo text-decoration.fo text-indent.fo word-spacing.fo
keiron 2002/07/31 03:05:25
Modified: src/org/apache/fop/tools TestConverter.java
test/xml/bugtests background_color.fo
background_transparent.fo block-container.fo
block.fo border.fo break-before.fo color.fo
font-family.fo font-size.fo font.fo
header_footer.fo indent.fo inline.fo
keep-with-next.fo leader.fo letter-spacing.fo
line-height.fo padding.fo page-number.fo rule.fo
space-treatment.fo space.fo text-align.fo
text-decoration.fo text-indent.fo word-spacing.fo
Log:
fixed master-name and a test setup problem
as suggested by: Peter Kullmann <p....@arenae.ch>
fixed line endings
Revision Changes Path
1.19 +2 -1 xml-fop/src/org/apache/fop/tools/TestConverter.java
Index: TestConverter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/tools/TestConverter.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- TestConverter.java 11 Apr 2002 09:33:31 -0000 1.18
+++ TestConverter.java 31 Jul 2002 10:05:24 -0000 1.19
@@ -229,6 +229,7 @@
Logger logger = log.getChildLogger("fop");
Driver driver = new Driver();
driver.setLogger(logger);
+ driver.initialize();
if (outputPDF) {
driver.setRenderer(Driver.RENDER_PDF);
} else {
1.2 +26 -26 xml-fop/test/xml/bugtests/background_color.fo
Index: background_color.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/background_color.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- background_color.fo 22 May 2001 13:05:19 -0000 1.1
+++ background_color.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block background-color="#FF0000">
- <fo:block>
- This is a simple fo block with red background.
- </fo:block>
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="#FF0000">
+ <fo:block>
+ This is a simple fo block with red background.
+ </fo:block>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +24 -24 xml-fop/test/xml/bugtests/background_transparent.fo
Index: background_transparent.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/background_transparent.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- background_transparent.fo 22 May 2001 13:05:20 -0000 1.1
+++ background_transparent.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block>
- This is a simple fo block with transparent background.
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ This is a simple fo block with transparent background.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +40 -40 xml-fop/test/xml/bugtests/block-container.fo
Index: block-container.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/block-container.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block-container.fo 22 May 2001 13:05:20 -0000 1.1
+++ block-container.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:static-content flow-name="xsl-region-before">
- <fo:block-container border-color="black" border-style="solid" border-width="1pt" height="2.5cm" width="4cm" padding="8pt" position="absolute">
- <fo:block text-align="start" line-height="2cm" font-family="sans-serif" font-size="12pt">
- SOLD TO
- </fo:block>
- <fo:block text-align="start" line-height="1cm" font-family="sans-serif" font-size="12pt">
- Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO
- Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO
- Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO
- Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO
- Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO
- Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO
- Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO
- </fo:block>
- </fo:block-container>
- </fo:static-content>
- <fo:flow flow-name="xsl-region-body">
- <fo:block text-align="start" line-height="1cm" font-family="sans-serif" font-size="12pt">
- BBBBBBBBBBBBBBB
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:static-content flow-name="xsl-region-before">
+ <fo:block-container border-color="black" border-style="solid" border-width="1pt" height="2.5cm" width="4cm" padding="8pt" position="absolute">
+ <fo:block text-align="start" line-height="2cm" font-family="sans-serif" font-size="12pt">
+ SOLD TO
+ </fo:block>
+ <fo:block text-align="start" line-height="1cm" font-family="sans-serif" font-size="12pt">
+ Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO
+ Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO
+ Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO
+ Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO
+ Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO
+ Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO
+ Akf;lhdsaf;paesifhe;oifhqewf;oiewfhefdf;lhdsfadslhkfhdsafdshSOLDTO
+ </fo:block>
+ </fo:block-container>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block text-align="start" line-height="1cm" font-family="sans-serif" font-size="12pt">
+ BBBBBBBBBBBBBBB
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +24 -24 xml-fop/test/xml/bugtests/block.fo
Index: block.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/block.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.fo 22 May 2001 13:05:20 -0000 1.1
+++ block.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block>
- This is a simple fo block.
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ This is a simple fo block.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +71 -71 xml-fop/test/xml/bugtests/border.fo
Index: border.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/border.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- border.fo 22 May 2001 13:05:20 -0000 1.1
+++ border.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,71 +1,71 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block>
- This is a simple fo block.
- </fo:block>
-
- <fo:block space-before.optimum="1cm" border-color="blue" border-style="solid" border-width="2pt">
- This is a simple fo block with borders.
- </fo:block>
-
- <fo:block space-before.optimum="1cm"
- border-left-color="blue" border-left-style="solid" border-left-width="2pt"
- border-right-color="blue" border-right-style="solid" border-right-width="2pt"
- border-top-color="blue" border-top-style="solid" border-top-width="2pt"
- border-bottom-color="blue" border-bottom-style="solid" border-bottom-width="2pt">
- This is a simple fo block with borders.
- </fo:block>
-
- <fo:block space-before.optimum="1cm" border-left-color="black" border-left-style="solid" border-left-width="2pt"
- border-right-color="black" border-right-style="dotted" border-right-width="1cm"
- border-top-color="black" border-top-style="dashed" border-top-width="5pt"
- border-bottom-color="black" border-bottom-style="double" border-bottom-width="1in">
- This is a simple fo block with different borders viz;
- border-left-color="black"
- border-left-style="solid"
- border-left-width="2pt"
- border-right-color="black"
- border-right-style="dotted"
- border-right-width="1cm"
- border-top-color="black"
- border-top-style="dashed"
- border-top-width="5pt"
- border-bottom-color="black"
- border-bottom-style="double"
- border-bottom-width="1in"
- </fo:block>
-
- <fo:block space-before.optimum="1cm"
- border-top="2pt solid blue"
- border-bottom="2pt solid blue"
- border-left="2pt solid blue"
- border-right="2pt solid blue">
- This is a simple fo block with borders.
- </fo:block>
-
- <fo:block space-before.optimum="1cm"
- border-top="2pt || solid || blue"
- border-bottom="2pt || solid || blue"
- border-left="2pt || solid || blue"
- border-right="2pt || solid || blue">
- This is a simple fo block with borders.
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ This is a simple fo block.
+ </fo:block>
+
+ <fo:block space-before.optimum="1cm" border-color="blue" border-style="solid" border-width="2pt">
+ This is a simple fo block with borders.
+ </fo:block>
+
+ <fo:block space-before.optimum="1cm"
+ border-left-color="blue" border-left-style="solid" border-left-width="2pt"
+ border-right-color="blue" border-right-style="solid" border-right-width="2pt"
+ border-top-color="blue" border-top-style="solid" border-top-width="2pt"
+ border-bottom-color="blue" border-bottom-style="solid" border-bottom-width="2pt">
+ This is a simple fo block with borders.
+ </fo:block>
+
+ <fo:block space-before.optimum="1cm" border-left-color="black" border-left-style="solid" border-left-width="2pt"
+ border-right-color="black" border-right-style="dotted" border-right-width="1cm"
+ border-top-color="black" border-top-style="dashed" border-top-width="5pt"
+ border-bottom-color="black" border-bottom-style="double" border-bottom-width="1in">
+ This is a simple fo block with different borders viz;
+ border-left-color="black"
+ border-left-style="solid"
+ border-left-width="2pt"
+ border-right-color="black"
+ border-right-style="dotted"
+ border-right-width="1cm"
+ border-top-color="black"
+ border-top-style="dashed"
+ border-top-width="5pt"
+ border-bottom-color="black"
+ border-bottom-style="double"
+ border-bottom-width="1in"
+ </fo:block>
+
+ <fo:block space-before.optimum="1cm"
+ border-top="2pt solid blue"
+ border-bottom="2pt solid blue"
+ border-left="2pt solid blue"
+ border-right="2pt solid blue">
+ This is a simple fo block with borders.
+ </fo:block>
+
+ <fo:block space-before.optimum="1cm"
+ border-top="2pt || solid || blue"
+ border-bottom="2pt || solid || blue"
+ border-left="2pt || solid || blue"
+ border-right="2pt || solid || blue">
+ This is a simple fo block with borders.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +27 -27 xml-fop/test/xml/bugtests/break-before.fo
Index: break-before.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/break-before.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- break-before.fo 22 May 2001 13:05:20 -0000 1.1
+++ break-before.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block>
- This is a simple fo block.
- </fo:block>
- <fo:block break-before="page">
- This is a simple fo block on a new page due to page-break using break-before="page".
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ This is a simple fo block.
+ </fo:block>
+ <fo:block break-before="page">
+ This is a simple fo block on a new page due to page-break using break-before="page".
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +38 -38 xml-fop/test/xml/bugtests/color.fo
Index: color.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/color.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- color.fo 22 May 2001 13:05:20 -0000 1.1
+++ color.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block color="#C00000">
- This is a simple fo text in red color.
- <fo:leader leader-pattern="rule" rule-thickness="3.0pt"></fo:leader>
- </fo:block>
-
- <fo:block color="#00C000">
- This is a simple fo text in green color followed by black line.
- <fo:leader color="#000000" leader-pattern="rule" rule-thickness="3.0pt"></fo:leader>
- </fo:block>
-
- <fo:block color="#0000C0">
- This is a simple fo text in blue color.
- <fo:inline color="#C055C0">This is in</fo:inline>
- <fo:inline color="#550055">the same sentence</fo:inline>
- This is text in blue again
- <fo:leader leader-pattern="rule" rule-thickness="3.0pt"></fo:leader>
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block color="#C00000">
+ This is a simple fo text in red color.
+ <fo:leader leader-pattern="rule" rule-thickness="3.0pt"></fo:leader>
+ </fo:block>
+
+ <fo:block color="#00C000">
+ This is a simple fo text in green color followed by black line.
+ <fo:leader color="#000000" leader-pattern="rule" rule-thickness="3.0pt"></fo:leader>
+ </fo:block>
+
+ <fo:block color="#0000C0">
+ This is a simple fo text in blue color.
+ <fo:inline color="#C055C0">This is in</fo:inline>
+ <fo:inline color="#550055">the same sentence</fo:inline>
+ This is text in blue again
+ <fo:leader leader-pattern="rule" rule-thickness="3.0pt"></fo:leader>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +76 -76 xml-fop/test/xml/bugtests/font-family.fo
Index: font-family.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/font-family.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- font-family.fo 22 May 2001 13:05:20 -0000 1.1
+++ font-family.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,76 +1,76 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block>
- default:
- </fo:block>
- <fo:block text-align="center">
- This is a simple fo text in FOP default font.
- </fo:block>
- <fo:block>
- sans-serif:
- </fo:block>
- <fo:block text-align="center" font-family="sans-serif">
- This is a simple fo text in sans-serif font.
- </fo:block>
-
- <fo:block>
- monospace:
- </fo:block>
- <fo:block text-align="center" font-family="monospace">
- This is a simple fo text in monospace font.
- </fo:block>
-
- <fo:block>
- Courier:
- </fo:block>
- <fo:block text-align="center" font-family="Courier">
- This is a simple fo text in Courier font.
- </fo:block>
-
- <fo:block>
- Helvetica:
- </fo:block>
- <fo:block text-align="center" font-family="Helvetica">
- This is a simple fo text in Helvetica font.
- </fo:block>
-
- <fo:block>
- Symbol:
- </fo:block>
- <fo:block text-align="center" font-family="Symbol">
- This is a simple fo text in Symbol font.
- </fo:block>
-
- <fo:block>
- Times Roman:
- </fo:block>
- <fo:block text-align="center" font-family="Times Roman">
- This is a simple fo text in Times Roman font.
- </fo:block>
-
- <fo:block>
- ZapfDingbats:
- </fo:block>
- <fo:block text-align="center" font-family="ZapfDingbats">
- This is a simple fo text in ZapfDingBats font.
- </fo:block>
-
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ default:
+ </fo:block>
+ <fo:block text-align="center">
+ This is a simple fo text in FOP default font.
+ </fo:block>
+ <fo:block>
+ sans-serif:
+ </fo:block>
+ <fo:block text-align="center" font-family="sans-serif">
+ This is a simple fo text in sans-serif font.
+ </fo:block>
+
+ <fo:block>
+ monospace:
+ </fo:block>
+ <fo:block text-align="center" font-family="monospace">
+ This is a simple fo text in monospace font.
+ </fo:block>
+
+ <fo:block>
+ Courier:
+ </fo:block>
+ <fo:block text-align="center" font-family="Courier">
+ This is a simple fo text in Courier font.
+ </fo:block>
+
+ <fo:block>
+ Helvetica:
+ </fo:block>
+ <fo:block text-align="center" font-family="Helvetica">
+ This is a simple fo text in Helvetica font.
+ </fo:block>
+
+ <fo:block>
+ Symbol:
+ </fo:block>
+ <fo:block text-align="center" font-family="Symbol">
+ This is a simple fo text in Symbol font.
+ </fo:block>
+
+ <fo:block>
+ Times Roman:
+ </fo:block>
+ <fo:block text-align="center" font-family="Times Roman">
+ This is a simple fo text in Times Roman font.
+ </fo:block>
+
+ <fo:block>
+ ZapfDingbats:
+ </fo:block>
+ <fo:block text-align="center" font-family="ZapfDingbats">
+ This is a simple fo text in ZapfDingBats font.
+ </fo:block>
+
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +53 -53 xml-fop/test/xml/bugtests/font-size.fo
Index: font-size.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/font-size.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- font-size.fo 22 May 2001 13:05:20 -0000 1.1
+++ font-size.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block>
- This is a simple fo text in FOP default font size and default font.
- </fo:block>
-
- <fo:block font-family="Courier" font-size="8pt">
- This is a simple fo text in 8pt font Courier.
- </fo:block>
- <fo:block font-family="Courier" font-size="10pt">
- This is a simple fo text in 10pt font.
- </fo:block>
- <fo:block font-family="Courier" font-size="12pt">
- This is a simple fo text in 12pt font.
- </fo:block>
- <fo:block font-family="Courier" font-size="14pt">
- This is a simple fo text in 14pt font.
- </fo:block>
- <fo:block font-family="Courier" font-size="16pt">
- This is a simple fo text in 16pt font.
- </fo:block>
- <fo:block font-family="Courier" font-size="18pt">
- This is a simple fo text in 18pt font.
- </fo:block>
- <fo:block font-family="Courier" font-size="20pt">
- This is a simple fo text in 20pt font.
- </fo:block>
- <fo:block font-family="Courier" font-size="24pt">
- This is a simple fo text in 24pt font.
- </fo:block>
- <fo:block font-family="Courier" font-size="32pt">
- This is a simple fo text in 32pt font.
- </fo:block>
-
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ This is a simple fo text in FOP default font size and default font.
+ </fo:block>
+
+ <fo:block font-family="Courier" font-size="8pt">
+ This is a simple fo text in 8pt font Courier.
+ </fo:block>
+ <fo:block font-family="Courier" font-size="10pt">
+ This is a simple fo text in 10pt font.
+ </fo:block>
+ <fo:block font-family="Courier" font-size="12pt">
+ This is a simple fo text in 12pt font.
+ </fo:block>
+ <fo:block font-family="Courier" font-size="14pt">
+ This is a simple fo text in 14pt font.
+ </fo:block>
+ <fo:block font-family="Courier" font-size="16pt">
+ This is a simple fo text in 16pt font.
+ </fo:block>
+ <fo:block font-family="Courier" font-size="18pt">
+ This is a simple fo text in 18pt font.
+ </fo:block>
+ <fo:block font-family="Courier" font-size="20pt">
+ This is a simple fo text in 20pt font.
+ </fo:block>
+ <fo:block font-family="Courier" font-size="24pt">
+ This is a simple fo text in 24pt font.
+ </fo:block>
+ <fo:block font-family="Courier" font-size="32pt">
+ This is a simple fo text in 32pt font.
+ </fo:block>
+
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +85 -85 xml-fop/test/xml/bugtests/font.fo
Index: font.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/font.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- font.fo 22 May 2001 13:05:20 -0000 1.1
+++ font.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,85 +1,85 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block font-family="Courier" font-size="12pt">
- This is a simple fo text in Courier font.
- </fo:block>
- <fo:block font-family="Courier" font-size="12pt"
- font-weight="bold">
- This is a simple fo text in bold.
- </fo:block>
- <fo:block font-family="Courier" font-size="12pt"
- font-style="italic">
- This is a simple fo text in italic.
- </fo:block>
- <fo:block font-family="Courier" font-size="12pt"
- font-style="italic" font-weight="bold">
- This is a simple fo text in italic and bold.
- </fo:block>
- <fo:block font-family="Courier" font-size="12pt"
- font-variant="small-caps">
- This is a simple fo text in small caps.
- </fo:block>
-
- <fo:block space-before.optimum="1cm"></fo:block>
-
- <fo:block font-family="Times" font-size="12pt">
- This is a simple fo text in Times font.
- </fo:block>
- <fo:block font-family="Times" font-size="12pt"
- font-weight="bold">
- This is a simple fo text in bold.
- </fo:block>
- <fo:block font-family="Times" font-size="12pt"
- font-style="italic">
- This is a simple fo text in italic.
- </fo:block>
- <fo:block font-family="Times" font-size="12pt"
- font-style="italic" font-weight="bold">
- This is a simple fo text in italic and bold.
- </fo:block>
- <fo:block font-family="Times" font-size="12pt"
- font-variant="small-caps">
- This is a simple fo text in small caps.
- </fo:block>
-
- <fo:block space-before.optimum="1cm"></fo:block>
-
- <fo:block font-family="Helvetica" font-size="12pt">
- This is a simple fo text in Helvetica font.
- </fo:block>
- <fo:block font-family="Helvetica" font-size="12pt"
- font-weight="bold">
- This is a simple fo text in bold.
- </fo:block>
- <fo:block font-family="Helvetica" font-size="12pt"
- font-style="italic">
- This is a simple fo text in italic.
- </fo:block>
- <fo:block font-family="Helvetica" font-size="12pt"
- font-style="italic" font-weight="bold">
- This is a simple fo text in italic and bold.
- </fo:block>
- <fo:block font-family="Helvetica" font-size="12pt"
- font-variant="small-caps">
- This is a simple fo text in small caps.
- </fo:block>
-
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block font-family="Courier" font-size="12pt">
+ This is a simple fo text in Courier font.
+ </fo:block>
+ <fo:block font-family="Courier" font-size="12pt"
+ font-weight="bold">
+ This is a simple fo text in bold.
+ </fo:block>
+ <fo:block font-family="Courier" font-size="12pt"
+ font-style="italic">
+ This is a simple fo text in italic.
+ </fo:block>
+ <fo:block font-family="Courier" font-size="12pt"
+ font-style="italic" font-weight="bold">
+ This is a simple fo text in italic and bold.
+ </fo:block>
+ <fo:block font-family="Courier" font-size="12pt"
+ font-variant="small-caps">
+ This is a simple fo text in small caps.
+ </fo:block>
+
+ <fo:block space-before.optimum="1cm"></fo:block>
+
+ <fo:block font-family="Times" font-size="12pt">
+ This is a simple fo text in Times font.
+ </fo:block>
+ <fo:block font-family="Times" font-size="12pt"
+ font-weight="bold">
+ This is a simple fo text in bold.
+ </fo:block>
+ <fo:block font-family="Times" font-size="12pt"
+ font-style="italic">
+ This is a simple fo text in italic.
+ </fo:block>
+ <fo:block font-family="Times" font-size="12pt"
+ font-style="italic" font-weight="bold">
+ This is a simple fo text in italic and bold.
+ </fo:block>
+ <fo:block font-family="Times" font-size="12pt"
+ font-variant="small-caps">
+ This is a simple fo text in small caps.
+ </fo:block>
+
+ <fo:block space-before.optimum="1cm"></fo:block>
+
+ <fo:block font-family="Helvetica" font-size="12pt">
+ This is a simple fo text in Helvetica font.
+ </fo:block>
+ <fo:block font-family="Helvetica" font-size="12pt"
+ font-weight="bold">
+ This is a simple fo text in bold.
+ </fo:block>
+ <fo:block font-family="Helvetica" font-size="12pt"
+ font-style="italic">
+ This is a simple fo text in italic.
+ </fo:block>
+ <fo:block font-family="Helvetica" font-size="12pt"
+ font-style="italic" font-weight="bold">
+ This is a simple fo text in italic and bold.
+ </fo:block>
+ <fo:block font-family="Helvetica" font-size="12pt"
+ font-variant="small-caps">
+ This is a simple fo text in small caps.
+ </fo:block>
+
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +137 -137 xml-fop/test/xml/bugtests/header_footer.fo
Index: header_footer.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/header_footer.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- header_footer.fo 22 May 2001 13:05:20 -0000 1.1
+++ header_footer.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,137 +1,137 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="18cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="3cm"/>
- <fo:region-body margin-top="4cm" margin-bottom="3cm"/>
- <fo:region-after extent="3cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <!-- header -->
- <fo:static-content flow-name="xsl-region-before">
- <fo:block-container width="5cm" height="3cm" position="absolute" background-color="#22CC55">
- <fo:block text-align="start">
- Left
- </fo:block>
- </fo:block-container>
- <fo:block-container width="5cm" height="3cm" left="5cm" position="absolute" background-color="#55AA55">
- <fo:block text-align="center">
- Center
- </fo:block>
- </fo:block-container>
- <fo:block-container width="5cm" height="3cm" left="10cm" position="absolute" background-color="#FFCCFF">
- <fo:block text-align="end">
- Right
- </fo:block>
- </fo:block-container>
-
- </fo:static-content>
-
- <!-- footer -->
- <fo:static-content flow-name="xsl-region-after">
- <fo:block-container width="5cm" height="3cm" position="absolute">
- <fo:block text-align="start">
- Left
- </fo:block>
- </fo:block-container>
- <fo:block-container width="5cm" height="3cm" left="5cm" position="absolute">
- <fo:block text-align="center">
- Center
- </fo:block>
- </fo:block-container>
- <fo:block-container width="5cm" height="3cm" left="10cm" position="absolute">
- <fo:block text-align="end">
- Right
- </fo:block>
- </fo:block-container>
-
- </fo:static-content>
-
- <fo:flow flow-name="xsl-region-body">
- <fo:block>
- There is top-margin for body region.This is bcos margin-top for body is greater than extent of region-before.
- </fo:block>
- <fo:block>
- There is NO bottom-margin for body region. Bcos margin-bottom for body = extent for region-after.
- </fo:block>
- <fo:block>
- </fo:block>
- <fo:block>
- The fo:static-content formatting object holds a sequence or a tree of formatting objects that is to be presented in a single region or repeated in like-named regions on one or more pages in the page-sequence. Its common use is for repeating or running headers and footers.
- </fo:block>
- <fo:block>
- This content is repeated, in its entirety, on every page to which it is assigned.
- </fo:block>
- <fo:block>
- This content is repeated, in its entirety, on every page to which it is assigned.
- </fo:block>
- <fo:block>
- This content is repeated, in its entirety, on every page to which it is assigned.
- </fo:block>
- <fo:block>
- This content is repeated, in its entirety, on every page to which it is assigned.
- </fo:block>
- <fo:block>
- This content is repeated, in its entirety, on every page to which it is assigned.
- </fo:block>
- <fo:block>
- This content is repeated, in its entirety, on every page to which it is assigned.
- </fo:block>
- <fo:block>
- This content is repeated, in its entirety, on every page to which it is assigned.
- </fo:block>
- <fo:block>
- This content is repeated, in its entirety, on every page to which it is assigned.
- </fo:block>
- <fo:block>
- This content is repeated, in its entirety, on every page to which it is assigned.
- </fo:block>
- <fo:block>
- This content is repeated, in its entirety, on every page to which it is assigned.
- </fo:block>
- <fo:block>
- This content is repeated, in its entirety, on every page to which it is assigned.
- </fo:block>
- <fo:block>
- This content is repeated, in its entirety, on every page to which it is assigned.
- </fo:block>
- <fo:block>
- This content is repeated, in its entirety, on every page to which it is assigned.
- </fo:block>
- <fo:block>
- This content is repeated, in its entirety, on every page to which it is assigned.
- </fo:block>
- <fo:block>
- This content is repeated, in its entirety, on every page to which it is assigned.
- </fo:block>
- <fo:block>
- This content is repeated, in its entirety, on every page to which it is assigned.
- </fo:block>
- <fo:block>
- This content is repeated, in its entirety, on every page to which it is assigned.
- </fo:block>
- <fo:block>
-The fo:static-content formatting object does not generate any areas. The fo:static-content formatting object returns the sequence of areas created by concatenating the sequences of areas returned by each of the children of the fo:static-content. The order of concatenation is the same order as the children are ordered under the fo:static-content.
- </fo:block>
- <fo:block>
-The fo:static-content formatting object does not generate any areas. The fo:static-content formatting object returns the sequence of areas created by concatenating the sequences of areas returned by each of the children of the fo:static-content. The order of concatenation is the same order as the children are ordered under the fo:static-content.
- </fo:block>
- <fo:block>
-The fo:static-content formatting object does not generate any areas. The fo:static-content formatting object returns the sequence of areas created by concatenating the sequences of areas returned by each of the children of the fo:static-content. The order of concatenation is the same order as the children are ordered under the fo:static-content.
- </fo:block>
- <fo:block>
-The fo:static-content formatting object does not generate any areas. The fo:static-content formatting object returns the sequence of areas created by concatenating the sequences of areas returned by each of the children of the fo:static-content. The order of concatenation is the same order as the children are ordered under the fo:static-content.
- </fo:block>
-
- </fo:flow>
-
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="18cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="3cm"/>
+ <fo:region-body margin-top="4cm" margin-bottom="3cm"/>
+ <fo:region-after extent="3cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <!-- header -->
+ <fo:static-content flow-name="xsl-region-before">
+ <fo:block-container width="5cm" height="3cm" position="absolute" background-color="#22CC55">
+ <fo:block text-align="start">
+ Left
+ </fo:block>
+ </fo:block-container>
+ <fo:block-container width="5cm" height="3cm" left="5cm" position="absolute" background-color="#55AA55">
+ <fo:block text-align="center">
+ Center
+ </fo:block>
+ </fo:block-container>
+ <fo:block-container width="5cm" height="3cm" left="10cm" position="absolute" background-color="#FFCCFF">
+ <fo:block text-align="end">
+ Right
+ </fo:block>
+ </fo:block-container>
+
+ </fo:static-content>
+
+ <!-- footer -->
+ <fo:static-content flow-name="xsl-region-after">
+ <fo:block-container width="5cm" height="3cm" position="absolute">
+ <fo:block text-align="start">
+ Left
+ </fo:block>
+ </fo:block-container>
+ <fo:block-container width="5cm" height="3cm" left="5cm" position="absolute">
+ <fo:block text-align="center">
+ Center
+ </fo:block>
+ </fo:block-container>
+ <fo:block-container width="5cm" height="3cm" left="10cm" position="absolute">
+ <fo:block text-align="end">
+ Right
+ </fo:block>
+ </fo:block-container>
+
+ </fo:static-content>
+
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ There is top-margin for body region.This is bcos margin-top for body is greater than extent of region-before.
+ </fo:block>
+ <fo:block>
+ There is NO bottom-margin for body region. Bcos margin-bottom for body = extent for region-after.
+ </fo:block>
+ <fo:block>
+ </fo:block>
+ <fo:block>
+ The fo:static-content formatting object holds a sequence or a tree of formatting objects that is to be presented in a single region or repeated in like-named regions on one or more pages in the page-sequence. Its common use is for repeating or running headers and footers.
+ </fo:block>
+ <fo:block>
+ This content is repeated, in its entirety, on every page to which it is assigned.
+ </fo:block>
+ <fo:block>
+ This content is repeated, in its entirety, on every page to which it is assigned.
+ </fo:block>
+ <fo:block>
+ This content is repeated, in its entirety, on every page to which it is assigned.
+ </fo:block>
+ <fo:block>
+ This content is repeated, in its entirety, on every page to which it is assigned.
+ </fo:block>
+ <fo:block>
+ This content is repeated, in its entirety, on every page to which it is assigned.
+ </fo:block>
+ <fo:block>
+ This content is repeated, in its entirety, on every page to which it is assigned.
+ </fo:block>
+ <fo:block>
+ This content is repeated, in its entirety, on every page to which it is assigned.
+ </fo:block>
+ <fo:block>
+ This content is repeated, in its entirety, on every page to which it is assigned.
+ </fo:block>
+ <fo:block>
+ This content is repeated, in its entirety, on every page to which it is assigned.
+ </fo:block>
+ <fo:block>
+ This content is repeated, in its entirety, on every page to which it is assigned.
+ </fo:block>
+ <fo:block>
+ This content is repeated, in its entirety, on every page to which it is assigned.
+ </fo:block>
+ <fo:block>
+ This content is repeated, in its entirety, on every page to which it is assigned.
+ </fo:block>
+ <fo:block>
+ This content is repeated, in its entirety, on every page to which it is assigned.
+ </fo:block>
+ <fo:block>
+ This content is repeated, in its entirety, on every page to which it is assigned.
+ </fo:block>
+ <fo:block>
+ This content is repeated, in its entirety, on every page to which it is assigned.
+ </fo:block>
+ <fo:block>
+ This content is repeated, in its entirety, on every page to which it is assigned.
+ </fo:block>
+ <fo:block>
+ This content is repeated, in its entirety, on every page to which it is assigned.
+ </fo:block>
+ <fo:block>
+The fo:static-content formatting object does not generate any areas. The fo:static-content formatting object returns the sequence of areas created by concatenating the sequences of areas returned by each of the children of the fo:static-content. The order of concatenation is the same order as the children are ordered under the fo:static-content.
+ </fo:block>
+ <fo:block>
+The fo:static-content formatting object does not generate any areas. The fo:static-content formatting object returns the sequence of areas created by concatenating the sequences of areas returned by each of the children of the fo:static-content. The order of concatenation is the same order as the children are ordered under the fo:static-content.
+ </fo:block>
+ <fo:block>
+The fo:static-content formatting object does not generate any areas. The fo:static-content formatting object returns the sequence of areas created by concatenating the sequences of areas returned by each of the children of the fo:static-content. The order of concatenation is the same order as the children are ordered under the fo:static-content.
+ </fo:block>
+ <fo:block>
+The fo:static-content formatting object does not generate any areas. The fo:static-content formatting object returns the sequence of areas created by concatenating the sequences of areas returned by each of the children of the fo:static-content. The order of concatenation is the same order as the children are ordered under the fo:static-content.
+ </fo:block>
+
+ </fo:flow>
+
+ </fo:page-sequence>
+</fo:root>
1.2 +55 -55 xml-fop/test/xml/bugtests/indent.fo
Index: indent.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/indent.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- indent.fo 22 May 2001 13:05:20 -0000 1.1
+++ indent.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block text-align="justify" start-indent="1in">
- This is a simple fo block with justify indented in the start.
- This is a simple fo block indented in the start.
- This is a simple fo block indented in the start.
- This is a simple fo block indented in the start.
- This is a simple fo block indented in the start.
- This is a simple fo block indented in the start.
- </fo:block>
- <fo:block text-align="justify" end-indent="1in">
- This is a simple fo block with justify indented in the end.
- This is a simple fo block indented in the end.
- This is a simple fo block indented in the end.
- This is a simple fo block indented in the end.
- This is a simple fo block indented in the end.
- This is a simple fo block indented in the end.
- </fo:block>
- <fo:block start-indent="1in">
- This is a simple fo block indented in the start.
- This is a simple fo block indented in the start.
- This is a simple fo block indented in the start.
- This is a simple fo block indented in the start.
- This is a simple fo block indented in the start.
- This is a simple fo block indented in the start.
- This is a simple fo block indented in the start.
- </fo:block>
- <fo:block end-indent="1in">
- This is a simple fo block indented in the end.
- This is a simple fo block indented in the end.
- This is a simple fo block indented in the end.
- This is a simple fo block indented in the end.
- This is a simple fo block indented in the end.
- This is a simple fo block indented in the end.
- This is a simple fo block indented in the end.
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block text-align="justify" start-indent="1in">
+ This is a simple fo block with justify indented in the start.
+ This is a simple fo block indented in the start.
+ This is a simple fo block indented in the start.
+ This is a simple fo block indented in the start.
+ This is a simple fo block indented in the start.
+ This is a simple fo block indented in the start.
+ </fo:block>
+ <fo:block text-align="justify" end-indent="1in">
+ This is a simple fo block with justify indented in the end.
+ This is a simple fo block indented in the end.
+ This is a simple fo block indented in the end.
+ This is a simple fo block indented in the end.
+ This is a simple fo block indented in the end.
+ This is a simple fo block indented in the end.
+ </fo:block>
+ <fo:block start-indent="1in">
+ This is a simple fo block indented in the start.
+ This is a simple fo block indented in the start.
+ This is a simple fo block indented in the start.
+ This is a simple fo block indented in the start.
+ This is a simple fo block indented in the start.
+ This is a simple fo block indented in the start.
+ This is a simple fo block indented in the start.
+ </fo:block>
+ <fo:block end-indent="1in">
+ This is a simple fo block indented in the end.
+ This is a simple fo block indented in the end.
+ This is a simple fo block indented in the end.
+ This is a simple fo block indented in the end.
+ This is a simple fo block indented in the end.
+ This is a simple fo block indented in the end.
+ This is a simple fo block indented in the end.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +25 -25 xml-fop/test/xml/bugtests/inline.fo
Index: inline.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/inline.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- inline.fo 22 May 2001 13:05:20 -0000 1.1
+++ inline.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block>
- <fo:inline>The sentence is</fo:inline>
- <fo:inline>in the same line.</fo:inline>
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ <fo:inline>The sentence is</fo:inline>
+ <fo:inline>in the same line.</fo:inline>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +88 -88 xml-fop/test/xml/bugtests/keep-with-next.fo
Index: keep-with-next.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/keep-with-next.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- keep-with-next.fo 22 May 2001 13:05:20 -0000 1.1
+++ keep-with-next.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,88 +1,88 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="11in"
- page-width="8.5in"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1in"
- margin-right="0.75in">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block space-before.optimum="1cm" font-family="monospace" font-size="10pt" white-space-treatment="preserve" wrap-option="no-wrap">
- F I N A L C A L C U L A T I O N AUD $ AUD $
- ----------------------------------
- L A B O U R TIME BASIS 10 WU = 1 HR
- TOTAL 33 WU X 20.00AUD $/WU 660.00
- TOTAL LABOUR................................................. 660.00
- P A I N T W O R K
- LABOUR COST 210.00
- MATERIAL COST 163.20
- TOTAL PAINT.................................................. 373.20
- P A R T S 425.00
- SUNDRY PARTS ( 2.0%) 8.50
- TOTAL PARTS.................................................. 433.50
- R E P A I R C O S T S....................................... 1 466.70
- ----------------------
-C O M M E N T S :
-E-PART PRICES = MANUFACTURERS RRP. *-POSITION = USER SUPPLIED DATA
-E-PART NUMBER IS NOT ORDER NUMBER NN = NO MANUFACTURERS CODE EXISTS
-SKEZAX=WORKING UNITS AS PER AUDATEX )=WU PARTIAL INCL IN OTHER POSITIONS
-C O N T R O L - I N F O R M A T I O N NO 666 25.08.2000
-OWNER MRS SARAH
- SCHAER GUNDELDINGERSTRASSE 131
- 4053 BASEL
-REFER. NO. 999
-MAKE AUDI S4 QUATTRO
-REG. NO BS 66961 SHEET NO 00 33 03
-FIRST REG. 08.2000 NAECH HU 08.2000
-INSP DATE 24.08.2000 ACC DATE 24.08.2000
-REPAIRER ZICK ZACK 061/ 361 76 06
- MR. MEIER ZOLLSTRASSE 62
- 8000 ZUERICH
-REP TIME . DAYS
-CU-NO / CUSTOMER-CODE : 004001 ZATEST01 CLASSDIRECT REL 2.9
-QUOTE DATE : 25.08.2000
-MO-CODE
-- MODEL-OPTIONS : E3 F3 I4 I7 J6 K2 M8 P8 Q6 Q7 V3 V6 W4 Z8
-PARTS / PAINTING
-- REP-METHOD/CODE-NO : N 0741 LO
- </fo:block>
-
- <fo:block keep-with-next="true" font-family="Helvetica" font-size="10pt">
- The following is the control page for the Repair Assessment. It includes the
- <fo:inline font-weight="bold">Owner</fo:inline><fo:inline>, Reference No, Make, Reg No, and Options.</fo:inline>
- </fo:block>
-
- <fo:block space-before.optimum="2cm" font-family="monospace" font-size="10pt" white-space-treatment="preserve" wrap-option="no-wrap">
-R E P A I R /-/ A S S E S S M E N T NO 666 25.08.2000
-OWNER MRS SARAH
- SCHAER GUNDELDINGERSTRASSE 131
- 4053 BASEL
-REFER. NO. 999
-
-MAKE AUDI S4 QUATTRO
-REG. NO BS 66961 SHEET NO 00 33 03
-FIRST REG. 08.2000 NAECH HU 08.2000
-INSP DATE 24.08.2000 ACC DATE 24.08.2000
-REPAIRER ZICK ZACK 061/ 361 76 06
- MR. MEIER ZOLLSTRASSE 62
- 8000 ZUERICH
-REP TIME . DAYS
-
-OPTIONS FROM VIN X_200001 LUGGAGE NET ELECTRIC FRONT SEATS
- AUTO HEADLAMP LEVEL SPORT SEATS TRIM-JACQUARD GRAPH
- ALTERNATOR 120 AMP 4-SPEED AUTOMATIC SPORTS SUSPENSION
- ANTI-LOCK BRAKES ELECT STABILITY PROG SUNROOF (ACCESSORY)
- 2.7 LTR V6
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="11in"
+ page-width="8.5in"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1in"
+ margin-right="0.75in">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block space-before.optimum="1cm" font-family="monospace" font-size="10pt" white-space-treatment="preserve" wrap-option="no-wrap">
+ F I N A L C A L C U L A T I O N AUD $ AUD $
+ ----------------------------------
+ L A B O U R TIME BASIS 10 WU = 1 HR
+ TOTAL 33 WU X 20.00AUD $/WU 660.00
+ TOTAL LABOUR................................................. 660.00
+ P A I N T W O R K
+ LABOUR COST 210.00
+ MATERIAL COST 163.20
+ TOTAL PAINT.................................................. 373.20
+ P A R T S 425.00
+ SUNDRY PARTS ( 2.0%) 8.50
+ TOTAL PARTS.................................................. 433.50
+ R E P A I R C O S T S....................................... 1 466.70
+ ----------------------
+C O M M E N T S :
+E-PART PRICES = MANUFACTURERS RRP. *-POSITION = USER SUPPLIED DATA
+E-PART NUMBER IS NOT ORDER NUMBER NN = NO MANUFACTURERS CODE EXISTS
+SKEZAX=WORKING UNITS AS PER AUDATEX )=WU PARTIAL INCL IN OTHER POSITIONS
+C O N T R O L - I N F O R M A T I O N NO 666 25.08.2000
+OWNER MRS SARAH
+ SCHAER GUNDELDINGERSTRASSE 131
+ 4053 BASEL
+REFER. NO. 999
+MAKE AUDI S4 QUATTRO
+REG. NO BS 66961 SHEET NO 00 33 03
+FIRST REG. 08.2000 NAECH HU 08.2000
+INSP DATE 24.08.2000 ACC DATE 24.08.2000
+REPAIRER ZICK ZACK 061/ 361 76 06
+ MR. MEIER ZOLLSTRASSE 62
+ 8000 ZUERICH
+REP TIME . DAYS
+CU-NO / CUSTOMER-CODE : 004001 ZATEST01 CLASSDIRECT REL 2.9
+QUOTE DATE : 25.08.2000
+MO-CODE
+- MODEL-OPTIONS : E3 F3 I4 I7 J6 K2 M8 P8 Q6 Q7 V3 V6 W4 Z8
+PARTS / PAINTING
+- REP-METHOD/CODE-NO : N 0741 LO
+ </fo:block>
+
+ <fo:block keep-with-next="true" font-family="Helvetica" font-size="10pt">
+ The following is the control page for the Repair Assessment. It includes the
+ <fo:inline font-weight="bold">Owner</fo:inline><fo:inline>, Reference No, Make, Reg No, and Options.</fo:inline>
+ </fo:block>
+
+ <fo:block space-before.optimum="2cm" font-family="monospace" font-size="10pt" white-space-treatment="preserve" wrap-option="no-wrap">
+R E P A I R /-/ A S S E S S M E N T NO 666 25.08.2000
+OWNER MRS SARAH
+ SCHAER GUNDELDINGERSTRASSE 131
+ 4053 BASEL
+REFER. NO. 999
+
+MAKE AUDI S4 QUATTRO
+REG. NO BS 66961 SHEET NO 00 33 03
+FIRST REG. 08.2000 NAECH HU 08.2000
+INSP DATE 24.08.2000 ACC DATE 24.08.2000
+REPAIRER ZICK ZACK 061/ 361 76 06
+ MR. MEIER ZOLLSTRASSE 62
+ 8000 ZUERICH
+REP TIME . DAYS
+
+OPTIONS FROM VIN X_200001 LUGGAGE NET ELECTRIC FRONT SEATS
+ AUTO HEADLAMP LEVEL SPORT SEATS TRIM-JACQUARD GRAPH
+ ALTERNATOR 120 AMP 4-SPEED AUTOMATIC SPORTS SUSPENSION
+ ANTI-LOCK BRAKES ELECT STABILITY PROG SUNROOF (ACCESSORY)
+ 2.7 LTR V6
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +24 -24 xml-fop/test/xml/bugtests/leader.fo
Index: leader.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/leader.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- leader.fo 22 May 2001 13:05:20 -0000 1.1
+++ leader.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block>
- <fo:leader leader-pattern="rule" rule-thickness="3.0pt"></fo:leader>
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ <fo:leader leader-pattern="rule" rule-thickness="3.0pt"></fo:leader>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +59 -59 xml-fop/test/xml/bugtests/letter-spacing.fo
Index: letter-spacing.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/letter-spacing.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- letter-spacing.fo 22 May 2001 13:05:20 -0000 1.1
+++ letter-spacing.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block letter-spacing="normal">
- This text is normally spaced.
- This text is normally spaced.
- This text is normally spaced.
- This text is normally spaced.
- This text is normally spaced.
- </fo:block>
-
-
- <fo:block letter-spacing="1pt">
- This text has inter-character intervals increased by 1pt.
- This text has inter-character intervals increased by 1pt.
- This text has inter-character intervals increased by 1pt.
- This text has inter-character intervals increased by 1pt.
- </fo:block>
-
-
- <fo:block letter-spacing="8pt">
- This text has inter-character intervals increased by 8pt.
- This text has inter-character intervals increased by 8pt.
- This text has inter-character intervals increased by 8pt.
- This text has inter-character intervals increased by 8pt.
- </fo:block>
-
- <fo:block letter-spacing="0pt">
- This text has inter-character intervals increased by 0pt (i.e. normally spaced).
- This text has inter-character intervals increased by 0pt (i.e. normally spaced).
- This text has inter-character intervals increased by 0pt (i.e. normally spaced).
- This text has inter-character intervals increased by 0pt (i.e. normally spaced).
- </fo:block>
-
- <fo:block letter-spacing="-1pt">
- This text has inter-character intervals increased by reduced by -1pt.
- This text has inter-character intervals increased by reduced by -1pt.
- This text has inter-character intervals increased by reduced by -1pt.
- This text has inter-character intervals increased by reduced by -1pt.
- </fo:block>
-
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block letter-spacing="normal">
+ This text is normally spaced.
+ This text is normally spaced.
+ This text is normally spaced.
+ This text is normally spaced.
+ This text is normally spaced.
+ </fo:block>
+
+
+ <fo:block letter-spacing="1pt">
+ This text has inter-character intervals increased by 1pt.
+ This text has inter-character intervals increased by 1pt.
+ This text has inter-character intervals increased by 1pt.
+ This text has inter-character intervals increased by 1pt.
+ </fo:block>
+
+
+ <fo:block letter-spacing="8pt">
+ This text has inter-character intervals increased by 8pt.
+ This text has inter-character intervals increased by 8pt.
+ This text has inter-character intervals increased by 8pt.
+ This text has inter-character intervals increased by 8pt.
+ </fo:block>
+
+ <fo:block letter-spacing="0pt">
+ This text has inter-character intervals increased by 0pt (i.e. normally spaced).
+ This text has inter-character intervals increased by 0pt (i.e. normally spaced).
+ This text has inter-character intervals increased by 0pt (i.e. normally spaced).
+ This text has inter-character intervals increased by 0pt (i.e. normally spaced).
+ </fo:block>
+
+ <fo:block letter-spacing="-1pt">
+ This text has inter-character intervals increased by reduced by -1pt.
+ This text has inter-character intervals increased by reduced by -1pt.
+ This text has inter-character intervals increased by reduced by -1pt.
+ This text has inter-character intervals increased by reduced by -1pt.
+ </fo:block>
+
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +108 -108 xml-fop/test/xml/bugtests/line-height.fo
Index: line-height.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/line-height.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- line-height.fo 22 May 2001 13:05:20 -0000 1.1
+++ line-height.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,108 +1,108 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block font-weight="bold" text-align="center">
- <fo:inline text-decoration="underline">
- Absolute Values
- </fo:inline>
- </fo:block>
-
-
- <fo:block line-height="12pt" font-size="8pt">
- This text has a fixed line height of 12pt and its font size is 8pt.
- This text has a fixed line height of 12pt and its font size is 8pt.
- This text has a fixed line height of 12pt and its font size is 8pt.
- This text has a fixed line height of 12pt and its font size is 8pt.
- This text has a fixed line height of 12pt and its font size is 8pt.
- </fo:block>
-
-
- <fo:block text-align="start" space-before.optimum="6pt" line-height="12pt" font-size="12pt">
- This text has a fixed line height of 12pt and its font size is 12pt.
- This text has a fixed line height of 12pt and its font size is 12pt.
- This text has a fixed line height of 12pt and its font size is 12pt.
- This text has a fixed line height of 12pt and its font size is 12pt.
- This text has a fixed line height of 12pt and its font size is 12pt.
- </fo:block>
-
-
- <fo:block text-align="start" space-before.optimum="6pt" line-height="12pt" font-size="16pt">
- This text has a fixed line height of 12pt and its font size is 16pt.
- This text has a fixed line height of 12pt and its font size is 16pt.
- This text has a fixed line height of 12pt and its font size is 16pt.
- This text has a fixed line height of 12pt and its font size is 16pt.
- This text has a fixed line height of 12pt and its font size is 16pt.
- </fo:block>
-
- <fo:block font-weight="bold" text-align="center">
- <fo:inline text-decoration="underline">
- Relative Values
- </fo:inline>
- </fo:block>
-
- <fo:block text-align="start" space-before.optimum="6pt" line-height="normal" font-size="10pt">
- This text has a normal line height at font size of 10pt.
- This text has a normal line height at font size of 10pt.
- This text has a normal line height at font size of 10pt.
- This text has a normal line height at font size of 10pt.
- This text has a normal line height at font size of 10pt.
- </fo:block>
-
- <fo:block text-align="start" space-before.optimum="6pt" line-height="normal" font-size="14pt">
- This text has a normal line height at font size of 14pt.
- This text has a normal line height at font size of 14pt.
- This text has a normal line height at font size of 14pt.
- This text has a normal line height at font size of 14pt.
- This text has a normal line height at font size of 14pt.
- </fo:block>
-
- <fo:block text-align="start" space-before.optimum="6pt" line-height="1.0" font-size="10pt">
- This text is single-spaced at font size of 10pt.
- This text is single-spaced at font size of 10pt.
- This text is single-spaced at font size of 10pt.
- This text is single-spaced at font size of 10pt.
- This text is single-spaced at font size of 10pt.
- </fo:block>
-
- <fo:block text-align="start" space-before.optimum="6pt" line-height="1.0" font-size="14pt">
- This text is single-spaced at font size of 14pt.
- This text is single-spaced at font size of 14pt.
- This text is single-spaced at font size of 14pt.
- This text is single-spaced at font size of 14pt.
- This text is single-spaced at font size of 14pt.
- </fo:block>
-
- <fo:block text-align="start" space-before.optimum="6pt" line-height="2.0" font-size="10pt">
- This text is double-spaced at font size of 10pt.
- This text is double-spaced at font size of 10pt.
- This text is double-spaced at font size of 10pt.
- This text is double-spaced at font size of 10pt.
- This text is double-spaced at font size of 10pt.
- </fo:block>
-
- <fo:block text-align="start" space-before.optimum="6pt" line-height="2.0" font-size="14pt">
- This text is double-spaced at font size of 14pt.
- This text is double-spaced at font size of 14pt.
- This text is double-spaced at font size of 14pt.
- This text is double-spaced at font size of 14pt.
- This text is double-spaced at font size of 14pt.
- </fo:block>
-
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block font-weight="bold" text-align="center">
+ <fo:inline text-decoration="underline">
+ Absolute Values
+ </fo:inline>
+ </fo:block>
+
+
+ <fo:block line-height="12pt" font-size="8pt">
+ This text has a fixed line height of 12pt and its font size is 8pt.
+ This text has a fixed line height of 12pt and its font size is 8pt.
+ This text has a fixed line height of 12pt and its font size is 8pt.
+ This text has a fixed line height of 12pt and its font size is 8pt.
+ This text has a fixed line height of 12pt and its font size is 8pt.
+ </fo:block>
+
+
+ <fo:block text-align="start" space-before.optimum="6pt" line-height="12pt" font-size="12pt">
+ This text has a fixed line height of 12pt and its font size is 12pt.
+ This text has a fixed line height of 12pt and its font size is 12pt.
+ This text has a fixed line height of 12pt and its font size is 12pt.
+ This text has a fixed line height of 12pt and its font size is 12pt.
+ This text has a fixed line height of 12pt and its font size is 12pt.
+ </fo:block>
+
+
+ <fo:block text-align="start" space-before.optimum="6pt" line-height="12pt" font-size="16pt">
+ This text has a fixed line height of 12pt and its font size is 16pt.
+ This text has a fixed line height of 12pt and its font size is 16pt.
+ This text has a fixed line height of 12pt and its font size is 16pt.
+ This text has a fixed line height of 12pt and its font size is 16pt.
+ This text has a fixed line height of 12pt and its font size is 16pt.
+ </fo:block>
+
+ <fo:block font-weight="bold" text-align="center">
+ <fo:inline text-decoration="underline">
+ Relative Values
+ </fo:inline>
+ </fo:block>
+
+ <fo:block text-align="start" space-before.optimum="6pt" line-height="normal" font-size="10pt">
+ This text has a normal line height at font size of 10pt.
+ This text has a normal line height at font size of 10pt.
+ This text has a normal line height at font size of 10pt.
+ This text has a normal line height at font size of 10pt.
+ This text has a normal line height at font size of 10pt.
+ </fo:block>
+
+ <fo:block text-align="start" space-before.optimum="6pt" line-height="normal" font-size="14pt">
+ This text has a normal line height at font size of 14pt.
+ This text has a normal line height at font size of 14pt.
+ This text has a normal line height at font size of 14pt.
+ This text has a normal line height at font size of 14pt.
+ This text has a normal line height at font size of 14pt.
+ </fo:block>
+
+ <fo:block text-align="start" space-before.optimum="6pt" line-height="1.0" font-size="10pt">
+ This text is single-spaced at font size of 10pt.
+ This text is single-spaced at font size of 10pt.
+ This text is single-spaced at font size of 10pt.
+ This text is single-spaced at font size of 10pt.
+ This text is single-spaced at font size of 10pt.
+ </fo:block>
+
+ <fo:block text-align="start" space-before.optimum="6pt" line-height="1.0" font-size="14pt">
+ This text is single-spaced at font size of 14pt.
+ This text is single-spaced at font size of 14pt.
+ This text is single-spaced at font size of 14pt.
+ This text is single-spaced at font size of 14pt.
+ This text is single-spaced at font size of 14pt.
+ </fo:block>
+
+ <fo:block text-align="start" space-before.optimum="6pt" line-height="2.0" font-size="10pt">
+ This text is double-spaced at font size of 10pt.
+ This text is double-spaced at font size of 10pt.
+ This text is double-spaced at font size of 10pt.
+ This text is double-spaced at font size of 10pt.
+ This text is double-spaced at font size of 10pt.
+ </fo:block>
+
+ <fo:block text-align="start" space-before.optimum="6pt" line-height="2.0" font-size="14pt">
+ This text is double-spaced at font size of 14pt.
+ This text is double-spaced at font size of 14pt.
+ This text is double-spaced at font size of 14pt.
+ This text is double-spaced at font size of 14pt.
+ This text is double-spaced at font size of 14pt.
+ </fo:block>
+
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +88 -88 xml-fop/test/xml/bugtests/padding.fo
Index: padding.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/padding.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- padding.fo 22 May 2001 13:05:20 -0000 1.1
+++ padding.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,88 +1,88 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
-
- <fo:block font-size="18pt"
- font-family="sans-serif"
- line-height="24pt"
- space-after.optimum="15pt"
- background-color="blue"
- color="white"
- padding-top="6pt">
- Extensible Markup Language (XML) 1.0 with padding
- </fo:block>
-
- <fo:block font-size="18pt"
- font-family="sans-serif"
- line-height="24pt"
- space-after.optimum="15pt"
- background-color="blue"
- color="white">
- Extensible Markup Language (XML) 1.0 without padding
- </fo:block>
-
- <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-top="1cm">
- <fo:block>
- This block-container has a top padding of 1 cm.
- </fo:block>
- </fo:block-container>
-
- <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-bottom="1cm">
- <fo:block>
- bottom padding of 1 cm.
- </fo:block>
- </fo:block-container>
-
- <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-left="1cm">
- <fo:block>
- left padding of 1 cm.
- </fo:block>
- </fo:block-container>
-
- <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-right="1cm">
- <fo:block>
- right padding of 1 cm.
- </fo:block>
- </fo:block-container>
-
- <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-before="1cm">
- <fo:block>
- This block-container has a before padding of 1 cm.
- </fo:block>
- </fo:block-container>
-
- <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-after="1cm">
- <fo:block>
- after padding of 1 cm.
- </fo:block>
- </fo:block-container>
-
- <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-start="1cm">
- <fo:block>
- start padding of 1 cm.
- </fo:block>
- </fo:block-container>
-
- <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-end="1cm">
- <fo:block>
- end padding of 1 cm.
- </fo:block>
- </fo:block-container>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+
+ <fo:block font-size="18pt"
+ font-family="sans-serif"
+ line-height="24pt"
+ space-after.optimum="15pt"
+ background-color="blue"
+ color="white"
+ padding-top="6pt">
+ Extensible Markup Language (XML) 1.0 with padding
+ </fo:block>
+
+ <fo:block font-size="18pt"
+ font-family="sans-serif"
+ line-height="24pt"
+ space-after.optimum="15pt"
+ background-color="blue"
+ color="white">
+ Extensible Markup Language (XML) 1.0 without padding
+ </fo:block>
+
+ <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-top="1cm">
+ <fo:block>
+ This block-container has a top padding of 1 cm.
+ </fo:block>
+ </fo:block-container>
+
+ <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-bottom="1cm">
+ <fo:block>
+ bottom padding of 1 cm.
+ </fo:block>
+ </fo:block-container>
+
+ <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-left="1cm">
+ <fo:block>
+ left padding of 1 cm.
+ </fo:block>
+ </fo:block-container>
+
+ <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-right="1cm">
+ <fo:block>
+ right padding of 1 cm.
+ </fo:block>
+ </fo:block-container>
+
+ <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-before="1cm">
+ <fo:block>
+ This block-container has a before padding of 1 cm.
+ </fo:block>
+ </fo:block-container>
+
+ <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-after="1cm">
+ <fo:block>
+ after padding of 1 cm.
+ </fo:block>
+ </fo:block-container>
+
+ <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-start="1cm">
+ <fo:block>
+ start padding of 1 cm.
+ </fo:block>
+ </fo:block-container>
+
+ <fo:block-container border-width="1pt" height="5cm" width="5cm" padding-end="1cm">
+ <fo:block>
+ end padding of 1 cm.
+ </fo:block>
+ </fo:block-container>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +24 -24 xml-fop/test/xml/bugtests/page-number.fo
Index: page-number.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/page-number.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- page-number.fo 22 May 2001 13:05:20 -0000 1.1
+++ page-number.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block>
- This is Page Number <fo:page-number/>.
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ This is Page Number <fo:page-number/>.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +85 -85 xml-fop/test/xml/bugtests/rule.fo
Index: rule.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/rule.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rule.fo 22 May 2001 13:05:20 -0000 1.1
+++ rule.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,85 +1,85 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block space-before.optimum="1cm">
- leader-pattern="rule" rule-style="solid" rule-thickness="0.5pt"
- </fo:block>
- <fo:block space-before.optimum="1cm">
- <fo:leader leader-pattern="rule" rule-style="solid" rule-thickness="0.5pt"></fo:leader>
- </fo:block>
- <fo:block space-before.optimum="1cm">
- <fo:leader leader-pattern="rule" rule-style="solid" rule-thickness="1pt"></fo:leader>
- </fo:block>
- <fo:block space-before.optimum="1cm">
- <fo:leader leader-pattern="rule" rule-style="solid" rule-thickness="3pt"></fo:leader>
- </fo:block>
- <fo:block space-before.optimum="1cm">
- <fo:leader leader-pattern="rule" rule-style="solid" rule-thickness="3mm"></fo:leader>
- </fo:block>
-
- <fo:block space-before.optimum="1cm">
- leader-pattern="rule" rule-style="dotted" rule-thickness="0.5pt"
- </fo:block>
- <fo:block space-before.optimum="1cm">
- <fo:leader leader-pattern="rule" rule-style="dotted" rule-thickness="0.5pt"></fo:leader>
- </fo:block>
- <fo:block space-before.optimum="1cm">
- <fo:leader leader-pattern="rule" rule-style="dotted" rule-thickness="1pt"></fo:leader>
- </fo:block>
- <fo:block space-before.optimum="1cm">
- <fo:leader leader-pattern="rule" rule-style="dotted" rule-thickness="3pt"></fo:leader>
- </fo:block>
- <fo:block space-before.optimum="1cm">
- <fo:leader leader-pattern="rule" rule-style="dotted" rule-thickness="5mm"></fo:leader>
- </fo:block>
-
- <fo:block space-before.optimum="1cm">
- leader-pattern="rule" rule-dashed="dotted" rule-thickness="0.5pt"
- </fo:block>
- <fo:block space-before.optimum="1cm">
- <fo:leader leader-pattern="rule" rule-style="dashed" rule-thickness="0.5pt"></fo:leader>
- </fo:block>
- <fo:block space-before.optimum="1cm">
- <fo:leader leader-pattern="rule" rule-style="dashed" rule-thickness="1pt"></fo:leader>
- </fo:block>
- <fo:block space-before.optimum="1cm">
- <fo:leader leader-pattern="rule" rule-style="dashed" rule-thickness="3pt"></fo:leader>
- </fo:block>
- <fo:block space-before.optimum="1cm">
- <fo:leader leader-pattern="rule" rule-style="dashed" rule-thickness="1mm"></fo:leader>
- </fo:block>
-
- <fo:block space-before.optimum="1cm">
- leader-pattern="rule" rule-style="double" rule-thickness="0.5pt"
- </fo:block>
- <fo:block space-before.optimum="1cm">
- <fo:leader leader-pattern="rule" rule-style="double" rule-thickness="0.5pt"></fo:leader>
- </fo:block>
- <fo:block space-before.optimum="1cm">
- <fo:leader leader-pattern="rule" rule-style="double" rule-thickness="1pt"></fo:leader>
- </fo:block>
- <fo:block space-before.optimum="1cm">
- <fo:leader leader-pattern="rule" rule-style="double" rule-thickness="3pt"></fo:leader>
- </fo:block>
- <fo:block space-before.optimum="1cm">
- <fo:leader leader-pattern="rule" rule-style="double" rule-thickness="1mm"></fo:leader>
- </fo:block>
-
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block space-before.optimum="1cm">
+ leader-pattern="rule" rule-style="solid" rule-thickness="0.5pt"
+ </fo:block>
+ <fo:block space-before.optimum="1cm">
+ <fo:leader leader-pattern="rule" rule-style="solid" rule-thickness="0.5pt"></fo:leader>
+ </fo:block>
+ <fo:block space-before.optimum="1cm">
+ <fo:leader leader-pattern="rule" rule-style="solid" rule-thickness="1pt"></fo:leader>
+ </fo:block>
+ <fo:block space-before.optimum="1cm">
+ <fo:leader leader-pattern="rule" rule-style="solid" rule-thickness="3pt"></fo:leader>
+ </fo:block>
+ <fo:block space-before.optimum="1cm">
+ <fo:leader leader-pattern="rule" rule-style="solid" rule-thickness="3mm"></fo:leader>
+ </fo:block>
+
+ <fo:block space-before.optimum="1cm">
+ leader-pattern="rule" rule-style="dotted" rule-thickness="0.5pt"
+ </fo:block>
+ <fo:block space-before.optimum="1cm">
+ <fo:leader leader-pattern="rule" rule-style="dotted" rule-thickness="0.5pt"></fo:leader>
+ </fo:block>
+ <fo:block space-before.optimum="1cm">
+ <fo:leader leader-pattern="rule" rule-style="dotted" rule-thickness="1pt"></fo:leader>
+ </fo:block>
+ <fo:block space-before.optimum="1cm">
+ <fo:leader leader-pattern="rule" rule-style="dotted" rule-thickness="3pt"></fo:leader>
+ </fo:block>
+ <fo:block space-before.optimum="1cm">
+ <fo:leader leader-pattern="rule" rule-style="dotted" rule-thickness="5mm"></fo:leader>
+ </fo:block>
+
+ <fo:block space-before.optimum="1cm">
+ leader-pattern="rule" rule-dashed="dotted" rule-thickness="0.5pt"
+ </fo:block>
+ <fo:block space-before.optimum="1cm">
+ <fo:leader leader-pattern="rule" rule-style="dashed" rule-thickness="0.5pt"></fo:leader>
+ </fo:block>
+ <fo:block space-before.optimum="1cm">
+ <fo:leader leader-pattern="rule" rule-style="dashed" rule-thickness="1pt"></fo:leader>
+ </fo:block>
+ <fo:block space-before.optimum="1cm">
+ <fo:leader leader-pattern="rule" rule-style="dashed" rule-thickness="3pt"></fo:leader>
+ </fo:block>
+ <fo:block space-before.optimum="1cm">
+ <fo:leader leader-pattern="rule" rule-style="dashed" rule-thickness="1mm"></fo:leader>
+ </fo:block>
+
+ <fo:block space-before.optimum="1cm">
+ leader-pattern="rule" rule-style="double" rule-thickness="0.5pt"
+ </fo:block>
+ <fo:block space-before.optimum="1cm">
+ <fo:leader leader-pattern="rule" rule-style="double" rule-thickness="0.5pt"></fo:leader>
+ </fo:block>
+ <fo:block space-before.optimum="1cm">
+ <fo:leader leader-pattern="rule" rule-style="double" rule-thickness="1pt"></fo:leader>
+ </fo:block>
+ <fo:block space-before.optimum="1cm">
+ <fo:leader leader-pattern="rule" rule-style="double" rule-thickness="3pt"></fo:leader>
+ </fo:block>
+ <fo:block space-before.optimum="1cm">
+ <fo:leader leader-pattern="rule" rule-style="double" rule-thickness="1mm"></fo:leader>
+ </fo:block>
+
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +39 -39 xml-fop/test/xml/bugtests/space-treatment.fo
Index: space-treatment.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/space-treatment.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- space-treatment.fo 22 May 2001 13:05:20 -0000 1.1
+++ space-treatment.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="11in"
- page-width="8.5in"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1in"
- margin-right="0.75in">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block space-after.optimum="1cm">
- The text below is in monospace font(useful for displayed formatted text, program code etc.)
- </fo:block>
-
- <fo:block space-before.optimum="1cm" font-family="monospace" font-size="10pt" white-space-treatment="preserve" wrap-option="no-wrap">
-OWNER MR DHARAMVEER
- SALECHA
-
-REFER. NO. 999
-
-MAKE AUDI S4 QUATTRO
-REG. NO BS 66961 SHEET NO 00 33 03
-OPTIONS FROM VIN X_200001 LUGGAGE NET ELECTRIC FRONT SEATS
- AUTO HEADLAMP LEVEL SPORT SEATS TRIM-JACQUARD GRAPH
- ALTERNATOR 120 AMP 4-SPEED AUTOMATIC SPORTS SUSPENSION
- ANTI-LOCK BRAKES ELECT STABILITY PROG SUNROOF (ACCESSORY)
- 2.7 LTR V6
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="11in"
+ page-width="8.5in"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1in"
+ margin-right="0.75in">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block space-after.optimum="1cm">
+ The text below is in monospace font(useful for displayed formatted text, program code etc.)
+ </fo:block>
+
+ <fo:block space-before.optimum="1cm" font-family="monospace" font-size="10pt" white-space-treatment="preserve" wrap-option="no-wrap">
+OWNER MR DHARAMVEER
+ SALECHA
+
+REFER. NO. 999
+
+MAKE AUDI S4 QUATTRO
+REG. NO BS 66961 SHEET NO 00 33 03
+OPTIONS FROM VIN X_200001 LUGGAGE NET ELECTRIC FRONT SEATS
+ AUTO HEADLAMP LEVEL SPORT SEATS TRIM-JACQUARD GRAPH
+ ALTERNATOR 120 AMP 4-SPEED AUTOMATIC SPORTS SUSPENSION
+ ANTI-LOCK BRAKES ELECT STABILITY PROG SUNROOF (ACCESSORY)
+ 2.7 LTR V6
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +67 -67 xml-fop/test/xml/bugtests/space.fo
Index: space.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/space.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- space.fo 22 May 2001 13:05:20 -0000 1.1
+++ space.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block space-after.optimum="1cm">
- space-after.optimum="1cm"
- This is a simple fo block.
- This is a simple fo block.
- This is a simple fo block.
- This is a simple fo block.
- </fo:block>
- <fo:block>
- This is a simple fo block.
- This is a simple fo block.
- This is a simple fo block.
- This is a simple fo block.
- </fo:block>
- <fo:block space-before.optimum="1cm" space-after.optimum="1cm">
- space-before.optimum="1cm" space-after.optimum="1cm"
- This is a simple fo block.
- This is a simple fo block.
- This is a simple fo block.
- This is a simple fo block.
- </fo:block>
- <fo:block space-before.optimum="1cm" space-after.optimum="1cm">
- space-before.optimum="1cm" space-after.optimum="1cm"
- This is a simple fo block.
- This is a simple fo block.
- This is a simple fo block.
- This is a simple fo block.
- </fo:block>
- <fo:block>
- This is a simple fo block.
- This is a simple fo block.
- This is a simple fo block.
- This is a simple fo block.
- </fo:block>
- <fo:block space-before.optimum="1cm">
- space-before.optimum="1cm"
- This is a simple fo block.
- This is a simple fo block.
- This is a simple fo block.
- This is a simple fo block.
- </fo:block>
- <fo:block>
- This is a simple fo block.
- This is a simple fo block.
- This is a simple fo block.
- This is a simple fo block.
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block space-after.optimum="1cm">
+ space-after.optimum="1cm"
+ This is a simple fo block.
+ This is a simple fo block.
+ This is a simple fo block.
+ This is a simple fo block.
+ </fo:block>
+ <fo:block>
+ This is a simple fo block.
+ This is a simple fo block.
+ This is a simple fo block.
+ This is a simple fo block.
+ </fo:block>
+ <fo:block space-before.optimum="1cm" space-after.optimum="1cm">
+ space-before.optimum="1cm" space-after.optimum="1cm"
+ This is a simple fo block.
+ This is a simple fo block.
+ This is a simple fo block.
+ This is a simple fo block.
+ </fo:block>
+ <fo:block space-before.optimum="1cm" space-after.optimum="1cm">
+ space-before.optimum="1cm" space-after.optimum="1cm"
+ This is a simple fo block.
+ This is a simple fo block.
+ This is a simple fo block.
+ This is a simple fo block.
+ </fo:block>
+ <fo:block>
+ This is a simple fo block.
+ This is a simple fo block.
+ This is a simple fo block.
+ This is a simple fo block.
+ </fo:block>
+ <fo:block space-before.optimum="1cm">
+ space-before.optimum="1cm"
+ This is a simple fo block.
+ This is a simple fo block.
+ This is a simple fo block.
+ This is a simple fo block.
+ </fo:block>
+ <fo:block>
+ This is a simple fo block.
+ This is a simple fo block.
+ This is a simple fo block.
+ This is a simple fo block.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +42 -42 xml-fop/test/xml/bugtests/text-align.fo
Index: text-align.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/text-align.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- text-align.fo 22 May 2001 13:05:20 -0000 1.1
+++ text-align.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block>
- This is a simple fo block.
- </fo:block>
- <fo:block space-before.optimum="1cm" text-align="start">
- This is a simple fo block with text aligned to start.
- dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf
- dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf
- dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf
- </fo:block>
- <fo:block space-before.optimum="1cm" text-align="justify">
- This is a simple fo block with text justified.
- dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf
- dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf
- dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf
- </fo:block>
- <fo:block space-before.optimum="1cm" text-align="end">
- This is a simple fo block with text aligned to end.
- dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf
- dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf
- dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ This is a simple fo block.
+ </fo:block>
+ <fo:block space-before.optimum="1cm" text-align="start">
+ This is a simple fo block with text aligned to start.
+ dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf
+ dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf
+ dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf
+ </fo:block>
+ <fo:block space-before.optimum="1cm" text-align="justify">
+ This is a simple fo block with text justified.
+ dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf
+ dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf
+ dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf
+ </fo:block>
+ <fo:block space-before.optimum="1cm" text-align="end">
+ This is a simple fo block with text aligned to end.
+ dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf
+ dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf
+ dfdsfaaaaafdsfasdf fadsfadsssf fadsfdsfadsf dfadsfdfasdsfsd dsfadfdsfadsfadsfdf
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +30 -30 xml-fop/test/xml/bugtests/text-decoration.fo
Index: text-decoration.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/text-decoration.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- text-decoration.fo 22 May 2001 13:05:20 -0000 1.1
+++ text-decoration.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block>
- This is a simple fo text.
- <fo:inline text-decoration="underline">
- This is a simple fo text and underlined.
- </fo:inline>
- <fo:inline text-decoration="line-through">
- This is a simple fo text and line-through.
- </fo:inline>
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ This is a simple fo text.
+ <fo:inline text-decoration="underline">
+ This is a simple fo text and underlined.
+ </fo:inline>
+ <fo:inline text-decoration="line-through">
+ This is a simple fo text and line-through.
+ </fo:inline>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +36 -36 xml-fop/test/xml/bugtests/text-indent.fo
Index: text-indent.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/text-indent.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- text-indent.fo 22 May 2001 13:05:21 -0000 1.1
+++ text-indent.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block text-align="start" space-before.optimum="6pt" text-indent="1in">
- This text is formatted into a left-justified paragraph.
- The first line has an indent of 1 inch from the left.
-
- This text is formatted into a left-justified paragraph.
- The first line has an indent of 1 inch from the left.
- </fo:block>
-
- <fo:block space-before.optimum="6pt" text-indent="40%">
- This text is formatted into a left-justified paragraph.
- The first line has an indent of 30% from the left.
-
- This text is formatted into a left-justified paragraph.
- The first line has an indent of 30% inch from the left.
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block text-align="start" space-before.optimum="6pt" text-indent="1in">
+ This text is formatted into a left-justified paragraph.
+ The first line has an indent of 1 inch from the left.
+
+ This text is formatted into a left-justified paragraph.
+ The first line has an indent of 1 inch from the left.
+ </fo:block>
+
+ <fo:block space-before.optimum="6pt" text-indent="40%">
+ This text is formatted into a left-justified paragraph.
+ The first line has an indent of 30% from the left.
+
+ This text is formatted into a left-justified paragraph.
+ The first line has an indent of 30% inch from the left.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
1.2 +50 -50 xml-fop/test/xml/bugtests/word-spacing.fo
Index: word-spacing.fo
===================================================================
RCS file: /home/cvs/xml-fop/test/xml/bugtests/word-spacing.fo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- word-spacing.fo 22 May 2001 13:05:21 -0000 1.1
+++ word-spacing.fo 31 Jul 2002 10:05:24 -0000 1.2
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simplePM"
- page-height="25cm"
- page-width="20cm"
- margin-top="1cm"
- margin-bottom="1cm"
- margin-left="1.5cm"
- margin-right="1.5cm">
- <fo:region-before extent="2.5cm"/>
- <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
- <fo:region-after extent="2.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
-
- <fo:page-sequence master-name="simplePM">
- <fo:flow flow-name="xsl-region-body">
- <fo:block>
- <fo:inline word-spacing="normal">In this text, spaces between words are normal.</fo:inline>
- <fo:inline word-spacing="normal">In this text, spaces between words are normal.</fo:inline>
- <fo:inline word-spacing="normal">In this text, spaces between words are normal.</fo:inline>
- <fo:inline word-spacing="normal">In this text, spaces between words are normal.</fo:inline>
- <fo:inline word-spacing="normal">In this text, spaces between words are normal.</fo:inline>
- </fo:block>
-
- <fo:block space-before.optimum="1cm">
- <fo:inline word-spacing="2pt">In this text, spaces between words are increased by 2pt.</fo:inline> <fo:inline word-spacing="2pt">In this text, spaces between words are increased by 2pt.</fo:inline> <fo:inline word-spacing="2pt">In this text, spaces between words are increased by 2pt.</fo:inline> <fo:inline word-spacing="2pt">In this text, spaces between words are increased by 2pt.</fo:inline> <fo:inline word-spacing="2pt">In this text, spaces between words are increased by 2pt.</fo:inline> </fo:block>
-
- <fo:block space-before.optimum="1cm">
- <fo:inline word-spacing="6pt">In this text, spaces between words are increased by 6pt.</fo:inline>
- <fo:inline word-spacing="6pt">In this text, spaces between words are increased by 6pt.</fo:inline>
- <fo:inline word-spacing="6pt">In this text, spaces between words are increased by 6pt.</fo:inline>
- <fo:inline word-spacing="6pt">In this text, spaces between words are increased by 6pt.</fo:inline>
- <fo:inline word-spacing="6pt">In this text, spaces between words are increased by 6pt.</fo:inline>
- </fo:block>
-
- <fo:block space-before.optimum="1cm">
- <fo:inline word-spacing="0pt">In this text, spaces between words are increased by 0pt (i.e. normally spaced).</fo:inline>
- <fo:inline word-spacing="0pt">In this text, spaces between words are increased by 0pt (i.e. normally spaced).</fo:inline>
- <fo:inline word-spacing="0pt">In this text, spaces between words are increased by 0pt (i.e. normally spaced).</fo:inline>
- <fo:inline word-spacing="0pt">In this text, spaces between words are increased by 0pt (i.e. normally spaced).</fo:inline>
- <fo:inline word-spacing="0pt">In this text, spaces between words are increased by 0pt (i.e. normally spaced).</fo:inline>
- </fo:block>
-
- <fo:block space-before.optimum="1cm">
- <fo:inline word-spacing="-2pt">In this text, spaces between words are reduced by -2pt</fo:inline> <fo:inline word-spacing="-2pt">In this text, spaces between words are reduced by -2pt</fo:inline> <fo:inline word-spacing="-2pt">In this text, spaces between words are reduced by -2pt</fo:inline> <fo:inline word-spacing="-2pt">In this text, spaces between words are reduced by -2pt</fo:inline> <fo:inline word-spacing="-2pt">In this text, spaces between words are reduced by -2pt</fo:inline> </fo:block>
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simplePM"
+ page-height="25cm"
+ page-width="20cm"
+ margin-top="1cm"
+ margin-bottom="1cm"
+ margin-left="1.5cm"
+ margin-right="1.5cm">
+ <fo:region-before extent="2.5cm"/>
+ <fo:region-body margin-top="3cm" margin-bottom="3cm"/>
+ <fo:region-after extent="2.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+
+ <fo:page-sequence master-reference="simplePM">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ <fo:inline word-spacing="normal">In this text, spaces between words are normal.</fo:inline>
+ <fo:inline word-spacing="normal">In this text, spaces between words are normal.</fo:inline>
+ <fo:inline word-spacing="normal">In this text, spaces between words are normal.</fo:inline>
+ <fo:inline word-spacing="normal">In this text, spaces between words are normal.</fo:inline>
+ <fo:inline word-spacing="normal">In this text, spaces between words are normal.</fo:inline>
+ </fo:block>
+
+ <fo:block space-before.optimum="1cm">
+ <fo:inline word-spacing="2pt">In this text, spaces between words are increased by 2pt.</fo:inline> <fo:inline word-spacing="2pt">In this text, spaces between words are increased by 2pt.</fo:inline> <fo:inline word-spacing="2pt">In this text, spaces between words are increased by 2pt.</fo:inline> <fo:inline word-spacing="2pt">In this text, spaces between words are increased by 2pt.</fo:inline> <fo:inline word-spacing="2pt">In this text, spaces between words are increased by 2pt.</fo:inline> </fo:block>
+
+ <fo:block space-before.optimum="1cm">
+ <fo:inline word-spacing="6pt">In this text, spaces between words are increased by 6pt.</fo:inline>
+ <fo:inline word-spacing="6pt">In this text, spaces between words are increased by 6pt.</fo:inline>
+ <fo:inline word-spacing="6pt">In this text, spaces between words are increased by 6pt.</fo:inline>
+ <fo:inline word-spacing="6pt">In this text, spaces between words are increased by 6pt.</fo:inline>
+ <fo:inline word-spacing="6pt">In this text, spaces between words are increased by 6pt.</fo:inline>
+ </fo:block>
+
+ <fo:block space-before.optimum="1cm">
+ <fo:inline word-spacing="0pt">In this text, spaces between words are increased by 0pt (i.e. normally spaced).</fo:inline>
+ <fo:inline word-spacing="0pt">In this text, spaces between words are increased by 0pt (i.e. normally spaced).</fo:inline>
+ <fo:inline word-spacing="0pt">In this text, spaces between words are increased by 0pt (i.e. normally spaced).</fo:inline>
+ <fo:inline word-spacing="0pt">In this text, spaces between words are increased by 0pt (i.e. normally spaced).</fo:inline>
+ <fo:inline word-spacing="0pt">In this text, spaces between words are increased by 0pt (i.e. normally spaced).</fo:inline>
+ </fo:block>
+
+ <fo:block space-before.optimum="1cm">
+ <fo:inline word-spacing="-2pt">In this text, spaces between words are reduced by -2pt</fo:inline> <fo:inline word-spacing="-2pt">In this text, spaces between words are reduced by -2pt</fo:inline> <fo:inline word-spacing="-2pt">In this text, spaces between words are reduced by -2pt</fo:inline> <fo:inline word-spacing="-2pt">In this text, spaces between words are reduced by -2pt</fo:inline> <fo:inline word-spacing="-2pt">In this text, spaces between words are reduced by -2pt</fo:inline> </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org