aboutsummaryrefslogtreecommitdiffstats
path: root/test/accessibility
diff options
context:
space:
mode:
Diffstat (limited to 'test/accessibility')
-rw-r--r--test/accessibility/README29
-rw-r--r--test/accessibility/background-image_jpg_repeat.fo4
-rw-r--r--test/accessibility/background-image_jpg_single.fo4
-rw-r--r--test/accessibility/background-image_png_repeat.fo4
-rw-r--r--test/accessibility/background-image_png_single.fo4
-rw-r--r--test/accessibility/background-image_svg_repeat.fo4
-rw-r--r--test/accessibility/background-image_svg_single.fo4
-rw-r--r--test/accessibility/complete.fo6
-rw-r--r--test/accessibility/config-renderer.xconf24
-rw-r--r--test/accessibility/fop.xconf (renamed from test/accessibility/config-painter.xconf)0
-rw-r--r--test/accessibility/image_jpg.fo4
-rw-r--r--test/accessibility/image_png.fo4
-rw-r--r--test/accessibility/image_svg.fo4
-rw-r--r--test/accessibility/image_wmf.fo4
-rw-r--r--test/accessibility/leader.fo4
-rw-r--r--test/accessibility/links.fo4
-rw-r--r--test/accessibility/pdf/background-image_jpg_repeat.pdf (renamed from test/accessibility/pdf/background-image_jpg_repeat_painter_orig.pdf)bin12767 -> 12806 bytes
-rw-r--r--test/accessibility/pdf/background-image_jpg_repeat_renderer_orig.pdfbin12678 -> 0 bytes
-rw-r--r--test/accessibility/pdf/background-image_jpg_single.pdf (renamed from test/accessibility/pdf/background-image_jpg_single_painter_orig.pdf)bin12606 -> 12645 bytes
-rw-r--r--test/accessibility/pdf/background-image_jpg_single_renderer_orig.pdfbin12517 -> 0 bytes
-rw-r--r--test/accessibility/pdf/background-image_png_repeat.pdf (renamed from test/accessibility/pdf/background-image_png_repeat_painter_orig.pdf)bin35390 -> 35429 bytes
-rw-r--r--test/accessibility/pdf/background-image_png_repeat_renderer_orig.pdfbin35301 -> 0 bytes
-rw-r--r--test/accessibility/pdf/background-image_png_single.pdfbin0 -> 58309 bytes
-rw-r--r--test/accessibility/pdf/background-image_png_single_painter_orig.pdfbin58601 -> 0 bytes
-rw-r--r--test/accessibility/pdf/background-image_png_single_renderer_orig.pdfbin58512 -> 0 bytes
-rw-r--r--test/accessibility/pdf/background-image_svg_repeat.pdf (renamed from test/accessibility/pdf/background-image_svg_repeat_painter_orig.pdf)bin17431 -> 17096 bytes
-rw-r--r--test/accessibility/pdf/background-image_svg_repeat_renderer_orig.pdfbin17342 -> 0 bytes
-rw-r--r--test/accessibility/pdf/background-image_svg_single.pdf (renamed from test/accessibility/pdf/background-image_svg_single_painter_orig.pdf)bin9988 -> 9935 bytes
-rw-r--r--test/accessibility/pdf/background-image_svg_single_renderer_orig.pdfbin9899 -> 0 bytes
-rw-r--r--test/accessibility/pdf/complete.pdfbin0 -> 96722 bytes
-rw-r--r--test/accessibility/pdf/complete_painter_orig.pdfbin96966 -> 0 bytes
-rw-r--r--test/accessibility/pdf/complete_renderer_orig.pdfbin96880 -> 0 bytes
-rw-r--r--test/accessibility/pdf/image_jpg.pdf (renamed from test/accessibility/pdf/image_jpg_painter_orig.pdf)bin9031 -> 9070 bytes
-rw-r--r--test/accessibility/pdf/image_jpg_renderer_orig.pdfbin8942 -> 0 bytes
-rw-r--r--test/accessibility/pdf/image_png.pdfbin0 -> 57780 bytes
-rw-r--r--test/accessibility/pdf/image_png_painter_orig.pdfbin58072 -> 0 bytes
-rw-r--r--test/accessibility/pdf/image_png_renderer_orig.pdfbin57983 -> 0 bytes
-rw-r--r--test/accessibility/pdf/image_svg.pdf (renamed from test/accessibility/pdf/image_svg_painter_orig.pdf)bin14045 -> 14284 bytes
-rw-r--r--test/accessibility/pdf/image_svg_renderer_orig.pdfbin13956 -> 0 bytes
-rw-r--r--test/accessibility/pdf/image_wmf.pdfbin0 -> 304960 bytes
-rw-r--r--test/accessibility/pdf/image_wmf_painter_orig.pdfbin177205 -> 0 bytes
-rw-r--r--test/accessibility/pdf/image_wmf_renderer_orig.pdfbin177116 -> 0 bytes
-rw-r--r--test/accessibility/pdf/leader.pdf (renamed from test/accessibility/pdf/leader_painter_orig.pdf)bin9334 -> 9371 bytes
-rw-r--r--test/accessibility/pdf/leader_renderer_orig.pdfbin9257 -> 0 bytes
-rw-r--r--test/accessibility/pdf/links.pdf (renamed from test/accessibility/pdf/links_painter_orig.pdf)bin9666 -> 9704 bytes
-rw-r--r--test/accessibility/pdf/links_renderer_orig.pdfbin9534 -> 0 bytes
-rw-r--r--test/accessibility/pdf/role.pdf (renamed from test/accessibility/pdf/role_painter_orig.pdf)bin18924 -> 18968 bytes
-rw-r--r--test/accessibility/pdf/role_non-standard.pdf (renamed from test/accessibility/pdf/role_non-standard_painter_orig.pdf)bin18938 -> 18982 bytes
-rw-r--r--test/accessibility/pdf/role_non-standard_renderer_orig.pdfbin18849 -> 0 bytes
-rw-r--r--test/accessibility/pdf/role_renderer_orig.pdfbin18835 -> 0 bytes
-rw-r--r--test/accessibility/pdf/text_1.pdf (renamed from test/accessibility/pdf/text_1_painter_orig.pdf)bin7458 -> 7496 bytes
-rw-r--r--test/accessibility/pdf/text_1_renderer_orig.pdfbin7369 -> 0 bytes
-rw-r--r--test/accessibility/pdf/text_2.pdf (renamed from test/accessibility/pdf/text_2_painter_orig.pdf)bin10296 -> 10338 bytes
-rw-r--r--test/accessibility/pdf/text_2_renderer_orig.pdfbin10207 -> 0 bytes
-rw-r--r--test/accessibility/pdf/text_font-embedding.pdf (renamed from test/accessibility/pdf/text_font-embedding_painter_orig.pdf)bin19781 -> 19777 bytes
-rw-r--r--test/accessibility/pdf/text_font-embedding_renderer_orig.pdfbin19692 -> 0 bytes
-rw-r--r--test/accessibility/role.fo4
-rw-r--r--test/accessibility/role_non-standard.fo4
-rw-r--r--test/accessibility/text_1.fo4
-rw-r--r--test/accessibility/text_2.fo4
-rw-r--r--test/accessibility/text_font-embedding.fo4
61 files changed, 46 insertions, 81 deletions
diff --git a/test/accessibility/README b/test/accessibility/README
index 391d39055..1d2e04361 100644
--- a/test/accessibility/README
+++ b/test/accessibility/README
@@ -1,11 +1,8 @@
This directory contains sample FO files for testing the accessibility features
of FOP.
-To every FO file in this directory correspond two PDF files in the pdf/
-sub-directory: one generated by the painter, one by the renderer. For example,
-the text_1.fo file has been rendered into pdf/text_1_painter_orig.pdf and
-pdf/text_1_renderer_orig.pdf. The configuration file config-painter.xconf (resp.
-config-renderer.xconf) was used.
+Every FO file in this directory has a corresponding PDF file in the pdf/
+sub-directory. The fop.xconf configuration file was used.
The PDF files have been checked with Adobe Acrobat Professional 9, using both
the full accessibility checker and the read-aloud feature. The checker reports
@@ -22,7 +19,7 @@ problem yet part or all of the document cannot be read aloud.)
The purpose of this infrastructure is to be able to quickly re-test the
accessibility processing chain when any change has been made to it. The
-configuration files disable the compression of the PDF streams, so it is
+configuration file disables the compression of the PDF streams, so it is
possible to compare a re-generated PDF with the original one by using a simple
diff tool. The files will not be identical because of the different creation
dates (and the ID key in the trailer), but apart from that there should be no
@@ -32,21 +29,13 @@ The rationale is that using a diff tool is much quicker and less tedious than
running Acrobat's accessibility checker and read-aloud feature every time.
-To re-generate the PDF files using the painter:
- ../../fop -c config-painter.xconf text_1.fo pdf/text_1_painter.pdf
- diff pdf/text_1_painter_orig.pdf pdf/text_1_painter.pdf
+To re-generate the PDF files:
+ ../../fop -c fop.xconf text_1.fo pdf/text_1.new.pdf
+ diff pdf/text_1_painter.pdf pdf/text_1.new.pdf
Or, going through the intermediate format:
- ../../fop -c config-painter.xconf text_1.fo -if application/pdf text_1_if.xml
- ../../fop -c config-painter.xconf -ifin text_1_if.xml pdf/text_1_painter.pdf
- diff pdf/text_1_painter_orig.pdf pdf/text_1_painter.pdf
-
-To re-generate the PDF files using the legacy renderer:
- ../../fop -c config-renderer.xconf text_1.fo pdf/text_1_renderer.pdf
- diff pdf/text_1_renderer_orig.pdf pdf/text_1_renderer.pdf
-Or, going through the intermediate format:
- ../../fop -c config-renderer.xconf text_1.fo -at application/pdf text_1_at.xml
- ../../fop -c config-renderer.xconf -atin text_1_at.xml pdf/text_1_renderer.pdf
- diff pdf/text_1_renderer_orig.pdf pdf/text_1_renderer.pdf
+ ../../fop -c fop.xconf text_1.fo -if application/pdf text_1_if.xml
+ ../../fop -c fop.xconf -ifin text_1_if.xml pdf/text_1.new.pdf
+ diff pdf/text_1.pdf pdf/text_1.new.pdf
$Id$
diff --git a/test/accessibility/background-image_jpg_repeat.fo b/test/accessibility/background-image_jpg_repeat.fo
index 2c8f7f66d..727162e49 100644
--- a/test/accessibility/background-image_jpg_repeat.fo
+++ b/test/accessibility/background-image_jpg_repeat.fo
@@ -16,14 +16,14 @@
limitations under the License.
-->
<!-- $Id$ -->
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" language="en" country="GB">
<fo:layout-master-set>
<fo:simple-page-master master-name="page"
page-height="220pt" page-width="320pt" margin="10pt">
<fo:region-body background-image="../resources/images/bgimg72dpi.jpg"/>
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-reference="page" language="en" country="GB">
+ <fo:page-sequence master-reference="page">
<fo:flow flow-name="xsl-region-body" hyphenate="true" text-align="justify">
<fo:block>Apache FOP (Formatting Objects Processor) is a print formatter driven by XSL
formatting objects (XSL-FO) and an output independent formatter. It is a Java application
diff --git a/test/accessibility/background-image_jpg_single.fo b/test/accessibility/background-image_jpg_single.fo
index 2250c24e2..335353e03 100644
--- a/test/accessibility/background-image_jpg_single.fo
+++ b/test/accessibility/background-image_jpg_single.fo
@@ -16,7 +16,7 @@
limitations under the License.
-->
<!-- $Id$ -->
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" language="en" country="GB">
<fo:layout-master-set>
<fo:simple-page-master master-name="page"
page-height="220pt" page-width="320pt" margin="10pt">
@@ -25,7 +25,7 @@
background-position-vertical="50%"/>
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-reference="page" language="en" country="GB">
+ <fo:page-sequence master-reference="page">
<fo:flow flow-name="xsl-region-body" hyphenate="true" text-align="justify">
<fo:block>Apache FOP (Formatting Objects Processor) is a print formatter driven by XSL
formatting objects (XSL-FO) and an output independent formatter. It is a Java application
diff --git a/test/accessibility/background-image_png_repeat.fo b/test/accessibility/background-image_png_repeat.fo
index 7506c0f2b..5e4a8ba0d 100644
--- a/test/accessibility/background-image_png_repeat.fo
+++ b/test/accessibility/background-image_png_repeat.fo
@@ -16,14 +16,14 @@
limitations under the License.
-->
<!-- $Id$ -->
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" language="en" country="GB">
<fo:layout-master-set>
<fo:simple-page-master master-name="page"
page-height="220pt" page-width="320pt" margin="10pt">
<fo:region-body background-image="../resources/images/bgimg72dpi.png"/>
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-reference="page" language="en" country="GB">
+ <fo:page-sequence master-reference="page">
<fo:flow flow-name="xsl-region-body" hyphenate="true" text-align="justify">
<fo:block>Apache FOP (Formatting Objects Processor) is a print formatter driven by XSL
formatting objects (XSL-FO) and an output independent formatter. It is a Java application
diff --git a/test/accessibility/background-image_png_single.fo b/test/accessibility/background-image_png_single.fo
index 1f60e9411..90067ec53 100644
--- a/test/accessibility/background-image_png_single.fo
+++ b/test/accessibility/background-image_png_single.fo
@@ -16,7 +16,7 @@
limitations under the License.
-->
<!-- $Id$ -->
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" language="en" country="GB">
<fo:layout-master-set>
<fo:simple-page-master master-name="page"
page-height="220pt" page-width="320pt" margin="10pt">
@@ -25,7 +25,7 @@
background-position-vertical="50%"/>
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-reference="page" language="en" country="GB">
+ <fo:page-sequence master-reference="page">
<fo:flow flow-name="xsl-region-body" hyphenate="true" text-align="justify">
<fo:block>Apache FOP (Formatting Objects Processor) is a print formatter driven by XSL
formatting objects (XSL-FO) and an output independent formatter. It is a Java application
diff --git a/test/accessibility/background-image_svg_repeat.fo b/test/accessibility/background-image_svg_repeat.fo
index 6e71409d0..02520b6cf 100644
--- a/test/accessibility/background-image_svg_repeat.fo
+++ b/test/accessibility/background-image_svg_repeat.fo
@@ -16,14 +16,14 @@
limitations under the License.
-->
<!-- $Id$ -->
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" language="en" country="GB">
<fo:layout-master-set>
<fo:simple-page-master master-name="page"
page-height="220pt" page-width="320pt" margin="10pt">
<fo:region-body background-image="../resources/images/rgb-circles.svg"/>
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-reference="page" language="en" country="GB">
+ <fo:page-sequence master-reference="page">
<fo:flow flow-name="xsl-region-body" hyphenate="true" text-align="justify">
<fo:block>Apache FOP (Formatting Objects Processor) is a print formatter driven by XSL
formatting objects (XSL-FO) and an output independent formatter. It is a Java application
diff --git a/test/accessibility/background-image_svg_single.fo b/test/accessibility/background-image_svg_single.fo
index 9dc67c86c..3029f32ec 100644
--- a/test/accessibility/background-image_svg_single.fo
+++ b/test/accessibility/background-image_svg_single.fo
@@ -16,7 +16,7 @@
limitations under the License.
-->
<!-- $Id$ -->
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" language="en" country="GB">
<fo:layout-master-set>
<fo:simple-page-master master-name="page"
page-height="220pt" page-width="320pt" margin="10pt">
@@ -25,7 +25,7 @@
background-position-vertical="50%"/>
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-reference="page" language="en" country="GB">
+ <fo:page-sequence master-reference="page">
<fo:flow flow-name="xsl-region-body" hyphenate="true" text-align="justify">
<fo:block>Apache FOP (Formatting Objects Processor) is a print formatter driven by XSL
formatting objects (XSL-FO) and an output independent formatter. It is a Java application
diff --git a/test/accessibility/complete.fo b/test/accessibility/complete.fo
index 81df372b5..75684750c 100644
--- a/test/accessibility/complete.fo
+++ b/test/accessibility/complete.fo
@@ -17,7 +17,7 @@
-->
<!-- $Id$ -->
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
- xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">
+ xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" language="en" country="GB">
<fo:layout-master-set>
<fo:simple-page-master master-name="page"
page-height="220pt" page-width="320pt" margin="10pt">
@@ -25,7 +25,7 @@
<fo:region-before extent="12pt"/>
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-reference="page" language="en" country="GB">
+ <fo:page-sequence master-reference="page">
<fo:static-content flow-name="xsl-region-before">
<fo:block font-size="8pt" text-align-last="justify">This is the page header<fo:leader/>Page
<fo:page-number/></fo:block>
@@ -117,7 +117,7 @@
<fo:block>And now we are going to see how a second page sequence is handled.</fo:block>
</fo:flow>
</fo:page-sequence>
- <fo:page-sequence master-reference="page" language="en" country="GB">
+ <fo:page-sequence master-reference="page">
<fo:static-content flow-name="xsl-region-before">
<fo:block font-size="8pt" text-align-last="justify">This is the page header<fo:leader/>Page
<fo:page-number/></fo:block>
diff --git a/test/accessibility/config-renderer.xconf b/test/accessibility/config-renderer.xconf
deleted file mode 100644
index 4b55e393f..000000000
--- a/test/accessibility/config-renderer.xconf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fop version="1.0">
- <prefer-renderer>true</prefer-renderer>
- <accessibility>true</accessibility>
- <source-resolution>144</source-resolution>
- <use-cache>false</use-cache>
- <font-base>../resources/fonts/</font-base>
- <renderers>
- <renderer mime="application/pdf">
- <filterList>
- <value>null</value>
- </filterList>
- <filterList type="image">
- <value>flate</value>
- <value>ascii-85</value>
- </filterList>
- <fonts>
- <font embed-url="DejaVuLGCSerif.ttf">
- <font-triplet name="DejaVu" style="normal" weight="normal"/>
- </font>
- </fonts>
- </renderer>
- </renderers>
-</fop>
diff --git a/test/accessibility/config-painter.xconf b/test/accessibility/fop.xconf
index 8c5dc2bd5..8c5dc2bd5 100644
--- a/test/accessibility/config-painter.xconf
+++ b/test/accessibility/fop.xconf
diff --git a/test/accessibility/image_jpg.fo b/test/accessibility/image_jpg.fo
index be0e24bee..5fe36f61a 100644
--- a/test/accessibility/image_jpg.fo
+++ b/test/accessibility/image_jpg.fo
@@ -17,14 +17,14 @@
-->
<!-- $Id$ -->
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
- xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">
+ xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" language="en" country="GB">
<fo:layout-master-set>
<fo:simple-page-master master-name="page"
page-height="220pt" page-width="320pt" margin="10pt">
<fo:region-body/>
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-reference="page" language="en" country="GB">
+ <fo:page-sequence master-reference="page">
<fo:flow flow-name="xsl-region-body" hyphenate="true" text-align="justify">
<fo:block>This document contains an image in the JPEG format: <fo:external-graphic
src="../resources/images/cmyk.jpg"
diff --git a/test/accessibility/image_png.fo b/test/accessibility/image_png.fo
index 3bcd12f4f..b529aa8c8 100644
--- a/test/accessibility/image_png.fo
+++ b/test/accessibility/image_png.fo
@@ -17,14 +17,14 @@
-->
<!-- $Id$ -->
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
- xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">
+ xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" language="en" country="GB">
<fo:layout-master-set>
<fo:simple-page-master master-name="page"
page-height="220pt" page-width="320pt" margin="10pt">
<fo:region-body/>
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-reference="page" language="en" country="GB">
+ <fo:page-sequence master-reference="page">
<fo:flow flow-name="xsl-region-body" hyphenate="true" text-align="justify">
<fo:block>This document contains an image in the PNG format: <fo:external-graphic
src="../resources/images/fop-logo-color-24bit.png"
diff --git a/test/accessibility/image_svg.fo b/test/accessibility/image_svg.fo
index 4fac16be5..bbc77fe65 100644
--- a/test/accessibility/image_svg.fo
+++ b/test/accessibility/image_svg.fo
@@ -17,14 +17,14 @@
-->
<!-- $Id$ -->
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
- xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">
+ xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" language="en" country="GB">
<fo:layout-master-set>
<fo:simple-page-master master-name="page"
page-height="220pt" page-width="320pt" margin="10pt">
<fo:region-body/>
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-reference="page" language="en" country="GB">
+ <fo:page-sequence master-reference="page">
<fo:flow flow-name="xsl-region-body" hyphenate="true" text-align="justify">
<fo:block>This document contains an image in the SVG format: <fo:external-graphic
src="../resources/images/circles.svg"
diff --git a/test/accessibility/image_wmf.fo b/test/accessibility/image_wmf.fo
index 729b48586..1a4de777b 100644
--- a/test/accessibility/image_wmf.fo
+++ b/test/accessibility/image_wmf.fo
@@ -17,14 +17,14 @@
-->
<!-- $Id$ -->
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
- xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">
+ xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" language="en" country="GB">
<fo:layout-master-set>
<fo:simple-page-master master-name="page"
page-height="320pt" page-width="320pt" margin="10pt">
<fo:region-body/>
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-reference="page" language="en" country="GB">
+ <fo:page-sequence master-reference="page">
<fo:flow flow-name="xsl-region-body" hyphenate="true" text-align="justify">
<fo:block>This document contains an image in the WMF format: <fo:external-graphic
src="../resources/images/testChart.wmf"
diff --git a/test/accessibility/leader.fo b/test/accessibility/leader.fo
index 91c9243e0..ffd768021 100644
--- a/test/accessibility/leader.fo
+++ b/test/accessibility/leader.fo
@@ -16,14 +16,14 @@
limitations under the License.
-->
<!-- $Id$ -->
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" language="en" country="GB">
<fo:layout-master-set>
<fo:simple-page-master master-name="page"
page-height="220pt" page-width="320pt" margin="10pt">
<fo:region-body/>
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-reference="page" language="en" country="GB">
+ <fo:page-sequence master-reference="page">
<fo:flow flow-name="xsl-region-body" hyphenate="true" text-align="justify"
text-align-last="justify">
<fo:block>This is a text followed by a leader with leader-pattern=​"use-content", the
diff --git a/test/accessibility/links.fo b/test/accessibility/links.fo
index 66f0f66f4..36250e332 100644
--- a/test/accessibility/links.fo
+++ b/test/accessibility/links.fo
@@ -17,14 +17,14 @@
-->
<!-- $Id$ -->
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
- xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">
+ xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" language="en" country="GB">
<fo:layout-master-set>
<fo:simple-page-master master-name="page"
page-height="220pt" page-width="320pt" margin="10pt">
<fo:region-body/>
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-reference="page" language="en" country="GB">
+ <fo:page-sequence master-reference="page">
<fo:flow flow-name="xsl-region-body" hyphenate="true" text-align="justify">
<fo:block>This is a <fo:wrapper color="blue"><fo:basic-link
internal-destination="FOP">link</fo:basic-link></fo:wrapper> to the next
diff --git a/test/accessibility/pdf/background-image_jpg_repeat_painter_orig.pdf b/test/accessibility/pdf/background-image_jpg_repeat.pdf
index c7c27f9d1..221761757 100644
--- a/test/accessibility/pdf/background-image_jpg_repeat_painter_orig.pdf
+++ b/test/accessibility/pdf/background-image_jpg_repeat.pdf
Binary files differ
diff --git a/test/accessibility/pdf/background-image_jpg_repeat_renderer_orig.pdf b/test/accessibility/pdf/background-image_jpg_repeat_renderer_orig.pdf
deleted file mode 100644
index ee5d89d40..000000000
--- a/test/accessibility/pdf/background-image_jpg_repeat_renderer_orig.pdf
+++ /dev/null
Binary files differ
diff --git a/test/accessibility/pdf/background-image_jpg_single_painter_orig.pdf b/test/accessibility/pdf/background-image_jpg_single.pdf
index 080f0b876..232afdd05 100644
--- a/test/accessibility/pdf/background-image_jpg_single_painter_orig.pdf
+++ b/test/accessibility/pdf/background-image_jpg_single.pdf
Binary files differ
diff --git a/test/accessibility/pdf/background-image_jpg_single_renderer_orig.pdf b/test/accessibility/pdf/background-image_jpg_single_renderer_orig.pdf
deleted file mode 100644
index 4d04ca427..000000000
--- a/test/accessibility/pdf/background-image_jpg_single_renderer_orig.pdf
+++ /dev/null
Binary files differ
diff --git a/test/accessibility/pdf/background-image_png_repeat_painter_orig.pdf b/test/accessibility/pdf/background-image_png_repeat.pdf
index a10e1357e..52da4020a 100644
--- a/test/accessibility/pdf/background-image_png_repeat_painter_orig.pdf
+++ b/test/accessibility/pdf/background-image_png_repeat.pdf
Binary files differ
diff --git a/test/accessibility/pdf/background-image_png_repeat_renderer_orig.pdf b/test/accessibility/pdf/background-image_png_repeat_renderer_orig.pdf
deleted file mode 100644
index 982c50cc9..000000000
--- a/test/accessibility/pdf/background-image_png_repeat_renderer_orig.pdf
+++ /dev/null
Binary files differ
diff --git a/test/accessibility/pdf/background-image_png_single.pdf b/test/accessibility/pdf/background-image_png_single.pdf
new file mode 100644
index 000000000..356e4885c
--- /dev/null
+++ b/test/accessibility/pdf/background-image_png_single.pdf
Binary files differ
diff --git a/test/accessibility/pdf/background-image_png_single_painter_orig.pdf b/test/accessibility/pdf/background-image_png_single_painter_orig.pdf
deleted file mode 100644
index 1e9ff00b4..000000000
--- a/test/accessibility/pdf/background-image_png_single_painter_orig.pdf
+++ /dev/null
Binary files differ
diff --git a/test/accessibility/pdf/background-image_png_single_renderer_orig.pdf b/test/accessibility/pdf/background-image_png_single_renderer_orig.pdf
deleted file mode 100644
index 2c7084dd8..000000000
--- a/test/accessibility/pdf/background-image_png_single_renderer_orig.pdf
+++ /dev/null
Binary files differ
diff --git a/test/accessibility/pdf/background-image_svg_repeat_painter_orig.pdf b/test/accessibility/pdf/background-image_svg_repeat.pdf
index c641fbbe5..0bce2404d 100644
--- a/test/accessibility/pdf/background-image_svg_repeat_painter_orig.pdf
+++ b/test/accessibility/pdf/background-image_svg_repeat.pdf
Binary files differ
diff --git a/test/accessibility/pdf/background-image_svg_repeat_renderer_orig.pdf b/test/accessibility/pdf/background-image_svg_repeat_renderer_orig.pdf
deleted file mode 100644
index 65d71109e..000000000
--- a/test/accessibility/pdf/background-image_svg_repeat_renderer_orig.pdf
+++ /dev/null
Binary files differ
diff --git a/test/accessibility/pdf/background-image_svg_single_painter_orig.pdf b/test/accessibility/pdf/background-image_svg_single.pdf
index 09a9ad895..3e4afcdcf 100644
--- a/test/accessibility/pdf/background-image_svg_single_painter_orig.pdf
+++ b/test/accessibility/pdf/background-image_svg_single.pdf
Binary files differ
diff --git a/test/accessibility/pdf/background-image_svg_single_renderer_orig.pdf b/test/accessibility/pdf/background-image_svg_single_renderer_orig.pdf
deleted file mode 100644
index b7c5a71e9..000000000
--- a/test/accessibility/pdf/background-image_svg_single_renderer_orig.pdf
+++ /dev/null
Binary files differ
diff --git a/test/accessibility/pdf/complete.pdf b/test/accessibility/pdf/complete.pdf
new file mode 100644
index 000000000..cffb9e2cb
--- /dev/null
+++ b/test/accessibility/pdf/complete.pdf
Binary files differ
diff --git a/test/accessibility/pdf/complete_painter_orig.pdf b/test/accessibility/pdf/complete_painter_orig.pdf
deleted file mode 100644
index caf7a41f8..000000000
--- a/test/accessibility/pdf/complete_painter_orig.pdf
+++ /dev/null
Binary files differ
diff --git a/test/accessibility/pdf/complete_renderer_orig.pdf b/test/accessibility/pdf/complete_renderer_orig.pdf
deleted file mode 100644
index e7e4ed6c1..000000000
--- a/test/accessibility/pdf/complete_renderer_orig.pdf
+++ /dev/null
Binary files differ
diff --git a/test/accessibility/pdf/image_jpg_painter_orig.pdf b/test/accessibility/pdf/image_jpg.pdf
index 1336f99eb..cb004bbd2 100644
--- a/test/accessibility/pdf/image_jpg_painter_orig.pdf
+++ b/test/accessibility/pdf/image_jpg.pdf
Binary files differ
diff --git a/test/accessibility/pdf/image_jpg_renderer_orig.pdf b/test/accessibility/pdf/image_jpg_renderer_orig.pdf
deleted file mode 100644
index 62be9c16c..000000000
--- a/test/accessibility/pdf/image_jpg_renderer_orig.pdf
+++ /dev/null
Binary files differ
diff --git a/test/accessibility/pdf/image_png.pdf b/test/accessibility/pdf/image_png.pdf
new file mode 100644
index 000000000..c3289374f
--- /dev/null
+++ b/test/accessibility/pdf/image_png.pdf
Binary files differ
diff --git a/test/accessibility/pdf/image_png_painter_orig.pdf b/test/accessibility/pdf/image_png_painter_orig.pdf
deleted file mode 100644
index b22c157b0..000000000
--- a/test/accessibility/pdf/image_png_painter_orig.pdf
+++ /dev/null
Binary files differ
diff --git a/test/accessibility/pdf/image_png_renderer_orig.pdf b/test/accessibility/pdf/image_png_renderer_orig.pdf
deleted file mode 100644
index efd5d2bdd..000000000
--- a/test/accessibility/pdf/image_png_renderer_orig.pdf
+++ /dev/null
Binary files differ
diff --git a/test/accessibility/pdf/image_svg_painter_orig.pdf b/test/accessibility/pdf/image_svg.pdf
index 1f5393c43..c3fce5b0e 100644
--- a/test/accessibility/pdf/image_svg_painter_orig.pdf
+++ b/test/accessibility/pdf/image_svg.pdf
Binary files differ
diff --git a/test/accessibility/pdf/image_svg_renderer_orig.pdf b/test/accessibility/pdf/image_svg_renderer_orig.pdf
deleted file mode 100644
index 9c020706d..000000000
--- a/test/accessibility/pdf/image_svg_renderer_orig.pdf
+++ /dev/null
Binary files differ
diff --git a/test/accessibility/pdf/image_wmf.pdf b/test/accessibility/pdf/image_wmf.pdf
new file mode 100644
index 000000000..b9ec8c55a
--- /dev/null
+++ b/test/accessibility/pdf/image_wmf.pdf
Binary files differ
diff --git a/test/accessibility/pdf/image_wmf_painter_orig.pdf b/test/accessibility/pdf/image_wmf_painter_orig.pdf
deleted file mode 100644
index 599b4c5ff..000000000
--- a/test/accessibility/pdf/image_wmf_painter_orig.pdf
+++ /dev/null
Binary files differ
diff --git a/test/accessibility/pdf/image_wmf_renderer_orig.pdf b/test/accessibility/pdf/image_wmf_renderer_orig.pdf
deleted file mode 100644
index c82134915..000000000
--- a/test/accessibility/pdf/image_wmf_renderer_orig.pdf
+++ /dev/null
Binary files differ
diff --git a/test/accessibility/pdf/leader_painter_orig.pdf b/test/accessibility/pdf/leader.pdf
index cf77a5c96..c7432e751 100644
--- a/test/accessibility/pdf/leader_painter_orig.pdf
+++ b/test/accessibility/pdf/leader.pdf
Binary files differ
diff --git a/test/accessibility/pdf/leader_renderer_orig.pdf b/test/accessibility/pdf/leader_renderer_orig.pdf
deleted file mode 100644
index 27c3afbde..000000000
--- a/test/accessibility/pdf/leader_renderer_orig.pdf
+++ /dev/null
Binary files differ
diff --git a/test/accessibility/pdf/links_painter_orig.pdf b/test/accessibility/pdf/links.pdf
index ee37c72d6..91d7c2592 100644
--- a/test/accessibility/pdf/links_painter_orig.pdf
+++ b/test/accessibility/pdf/links.pdf
Binary files differ
diff --git a/test/accessibility/pdf/links_renderer_orig.pdf b/test/accessibility/pdf/links_renderer_orig.pdf
deleted file mode 100644
index 2bae65033..000000000
--- a/test/accessibility/pdf/links_renderer_orig.pdf
+++ /dev/null
Binary files differ
diff --git a/test/accessibility/pdf/role_painter_orig.pdf b/test/accessibility/pdf/role.pdf
index 1eaaf1a9d..acb435027 100644
--- a/test/accessibility/pdf/role_painter_orig.pdf
+++ b/test/accessibility/pdf/role.pdf
Binary files differ
diff --git a/test/accessibility/pdf/role_non-standard_painter_orig.pdf b/test/accessibility/pdf/role_non-standard.pdf
index f8b1c9d2c..fcf614ed1 100644
--- a/test/accessibility/pdf/role_non-standard_painter_orig.pdf
+++ b/test/accessibility/pdf/role_non-standard.pdf
Binary files differ
diff --git a/test/accessibility/pdf/role_non-standard_renderer_orig.pdf b/test/accessibility/pdf/role_non-standard_renderer_orig.pdf
deleted file mode 100644
index 1700d7c03..000000000
--- a/test/accessibility/pdf/role_non-standard_renderer_orig.pdf
+++ /dev/null
Binary files differ
diff --git a/test/accessibility/pdf/role_renderer_orig.pdf b/test/accessibility/pdf/role_renderer_orig.pdf
deleted file mode 100644
index fc8e002a8..000000000
--- a/test/accessibility/pdf/role_renderer_orig.pdf
+++ /dev/null
Binary files differ
diff --git a/test/accessibility/pdf/text_1_painter_orig.pdf b/test/accessibility/pdf/text_1.pdf
index 2ad8a12f2..596419c9d 100644
--- a/test/accessibility/pdf/text_1_painter_orig.pdf
+++ b/test/accessibility/pdf/text_1.pdf
Binary files differ
diff --git a/test/accessibility/pdf/text_1_renderer_orig.pdf b/test/accessibility/pdf/text_1_renderer_orig.pdf
deleted file mode 100644
index 67d39890c..000000000
--- a/test/accessibility/pdf/text_1_renderer_orig.pdf
+++ /dev/null
Binary files differ
diff --git a/test/accessibility/pdf/text_2_painter_orig.pdf b/test/accessibility/pdf/text_2.pdf
index 21ad6d0d8..19fff21a4 100644
--- a/test/accessibility/pdf/text_2_painter_orig.pdf
+++ b/test/accessibility/pdf/text_2.pdf
Binary files differ
diff --git a/test/accessibility/pdf/text_2_renderer_orig.pdf b/test/accessibility/pdf/text_2_renderer_orig.pdf
deleted file mode 100644
index 6a5956c66..000000000
--- a/test/accessibility/pdf/text_2_renderer_orig.pdf
+++ /dev/null
Binary files differ
diff --git a/test/accessibility/pdf/text_font-embedding_painter_orig.pdf b/test/accessibility/pdf/text_font-embedding.pdf
index d5c61c040..0288449d5 100644
--- a/test/accessibility/pdf/text_font-embedding_painter_orig.pdf
+++ b/test/accessibility/pdf/text_font-embedding.pdf
Binary files differ
diff --git a/test/accessibility/pdf/text_font-embedding_renderer_orig.pdf b/test/accessibility/pdf/text_font-embedding_renderer_orig.pdf
deleted file mode 100644
index f8669cb98..000000000
--- a/test/accessibility/pdf/text_font-embedding_renderer_orig.pdf
+++ /dev/null
Binary files differ
diff --git a/test/accessibility/role.fo b/test/accessibility/role.fo
index e284cde9c..ced8a4d44 100644
--- a/test/accessibility/role.fo
+++ b/test/accessibility/role.fo
@@ -16,14 +16,14 @@
limitations under the License.
-->
<!-- $Id$ -->
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" language="en" country="GB">
<fo:layout-master-set>
<fo:simple-page-master master-name="page"
page-height="220pt" page-width="320pt" margin="10pt">
<fo:region-body/>
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-reference="page" language="en" country="GB">
+ <fo:page-sequence master-reference="page">
<fo:flow flow-name="xsl-region-body" hyphenate="true" font-family="sans-serif">
<fo:block role="H1" font-weight="bold" font-size="150%"
space-before.minimum="1.5em"
diff --git a/test/accessibility/role_non-standard.fo b/test/accessibility/role_non-standard.fo
index b6641aa2b..d3e1a9852 100644
--- a/test/accessibility/role_non-standard.fo
+++ b/test/accessibility/role_non-standard.fo
@@ -16,14 +16,14 @@
limitations under the License.
-->
<!-- $Id$ -->
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" language="en" country="GB">
<fo:layout-master-set>
<fo:simple-page-master master-name="page"
page-height="220pt" page-width="320pt" margin="10pt">
<fo:region-body/>
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-reference="page" language="en" country="GB">
+ <fo:page-sequence master-reference="page">
<fo:flow flow-name="xsl-region-body" hyphenate="true" font-family="sans-serif">
<fo:block role="H1" font-weight="bold" font-size="150%"
space-before.minimum="1.5em"
diff --git a/test/accessibility/text_1.fo b/test/accessibility/text_1.fo
index 2a90f6c14..31ad31514 100644
--- a/test/accessibility/text_1.fo
+++ b/test/accessibility/text_1.fo
@@ -16,14 +16,14 @@
limitations under the License.
-->
<!-- $Id$ -->
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" language="en" country="GB">
<fo:layout-master-set>
<fo:simple-page-master master-name="page"
page-height="220pt" page-width="320pt" margin="10pt">
<fo:region-body/>
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-reference="page" language="en" country="GB">
+ <fo:page-sequence master-reference="page">
<fo:flow flow-name="xsl-region-body" hyphenate="true" text-align="justify">
<fo:block>Apache FOP (Formatting Objects Processor) is a print formatter driven by XSL
formatting objects (XSL-FO) and an output independent formatter. It is a Java application
diff --git a/test/accessibility/text_2.fo b/test/accessibility/text_2.fo
index 5eff059b6..f5693110e 100644
--- a/test/accessibility/text_2.fo
+++ b/test/accessibility/text_2.fo
@@ -16,14 +16,14 @@
limitations under the License.
-->
<!-- $Id$ -->
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" language="en" country="GB">
<fo:layout-master-set>
<fo:simple-page-master master-name="page"
page-height="220pt" page-width="320pt" margin="10pt">
<fo:region-body/>
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-reference="page" language="en" country="GB">
+ <fo:page-sequence master-reference="page">
<fo:flow flow-name="xsl-region-body" hyphenate="true" text-align="justify">
<fo:block>Apache FOP (Formatting Objects Processor) is a print formatter driven by XSL
formatting objects (XSL-FO) and an output independent formatter. It is a Java application
diff --git a/test/accessibility/text_font-embedding.fo b/test/accessibility/text_font-embedding.fo
index 1d3abe027..10c1c99d9 100644
--- a/test/accessibility/text_font-embedding.fo
+++ b/test/accessibility/text_font-embedding.fo
@@ -16,14 +16,14 @@
limitations under the License.
-->
<!-- $Id$ -->
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" language="en" country="GB">
<fo:layout-master-set>
<fo:simple-page-master master-name="page"
page-height="220pt" page-width="320pt" margin="10pt">
<fo:region-body/>
</fo:simple-page-master>
</fo:layout-master-set>
- <fo:page-sequence master-reference="page" language="en" country="GB">
+ <fo:page-sequence master-reference="page">
<fo:flow flow-name="xsl-region-body" hyphenate="true" text-align="justify" font-family="DejaVu">
<fo:block>Apache FOP (Formatting Objects Processor) is a print formatter driven by XSL
formatting objects (XSL-FO) and an output independent formatter. It is a Java application