Added:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/java/org/apache/fop/pdf/xref/CrossReferenceTableTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/java/org/apache/fop/pdf/xref/CrossReferenceTableTestCase.java?rev=1303431&view=auto
==============================================================================
---
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/java/org/apache/fop/pdf/xref/CrossReferenceTableTestCase.java
(added)
+++
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/java/org/apache/fop/pdf/xref/CrossReferenceTableTestCase.java
Wed Mar 21 15:12:43 2012
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.pdf.xref;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+public class CrossReferenceTableTestCase extends CrossReferenceObjectTest {
+
+ private List<Long> offsets;
+
+ @Test
+ public void testWithNoOffset() throws IOException {
+ List<Long> emptyList = Collections.emptyList();
+ runTest(emptyList);
+ }
+
+ @Test
+ public void testWithOffsets() throws IOException {
+ runTest(Arrays.asList(0L, 1L, 2L, 3L, 4L));
+ }
+
+ @Test
+ public void testWithBigOffsets() throws IOException {
+ runTest(Arrays.asList(0xffL, 0xffffL, 0x7fffffffL));
+ }
+
+ private void runTest(List<Long> offsets) throws IOException {
+ this.offsets = offsets;
+ runTest();
+ }
+
+ @Override
+ protected CrossReferenceObject createCrossReferenceObject() {
+ return new CrossReferenceTable(trailerDictionary, STARTXREF, offsets);
+ }
+
+ @Override
+ protected byte[] createExpectedCrossReferenceData() throws IOException {
+ StringBuilder expected = new StringBuilder(256);
+ expected.append("xref\n0 ")
+ .append(offsets.size() + 1)
+ .append("\n0000000000 65535 f \n");
+ for (Long objectReference : offsets) {
+ final String padding = "0000000000";
+ String s = String.valueOf(objectReference).toString();
+ String loc = padding.substring(s.length()) + s;
+ expected.append(loc).append(" 00000 n \n");
+ }
+ expected.append("trailer\n<<\n")
+ .append(" /Root 1 0 R\n")
+ .append(" /Info 2 0 R\n")
+ .append(" /ID [<0123456789ABCDEF> <0123456789ABCDEF>]\n")
+ .append(" /Size ").append(Integer.toString(offsets.size() +
1)).append('\n')
+ .append(">>\n");
+ return getBytes(expected);
+ }
+
+}
Propchange:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/java/org/apache/fop/pdf/xref/CrossReferenceTableTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/java/org/apache/fop/pdf/xref/CrossReferenceTableTestCase.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Added:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/java/org/apache/fop/pdf/xref/ObjectReferenceTest.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/java/org/apache/fop/pdf/xref/ObjectReferenceTest.java?rev=1303431&view=auto
==============================================================================
---
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/java/org/apache/fop/pdf/xref/ObjectReferenceTest.java
(added)
+++
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/java/org/apache/fop/pdf/xref/ObjectReferenceTest.java
Wed Mar 21 15:12:43 2012
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.pdf.xref;
+
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.List;
+
+abstract class ObjectReferenceTest {
+
+ protected ObjectReference sut;
+
+ protected long computeNumberFromBytes(List<Integer> expectedOffsetBytes) {
+ assert expectedOffsetBytes.size() <= 8;
+ long offset = 0;
+ for (int b : expectedOffsetBytes) {
+ offset = offset << 8 | b;
+ }
+ return offset;
+ }
+
+ protected byte[] createExpectedOutput(byte field1, List<Integer> field2,
int field3) {
+ assert field2.size() == 8;
+ assert (field3 & 0xffff) == field3;
+ byte[] expected = new byte[11];
+ int index = 0;
+ expected[index++] = field1;
+ for (Integer b : field2) {
+ expected[index++] = b.byteValue();
+ }
+ expected[index++] = (byte) ((field3 & 0xff00) >> 8);
+ expected[index++] = (byte) (field3 & 0xff);
+ return expected;
+ }
+
+ protected byte[] getActualOutput() throws IOException {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ DataOutputStream dataOutputStream = new DataOutputStream(out);
+ sut.output(dataOutputStream);
+ dataOutputStream.close();
+ return out.toByteArray();
+ }
+
+}
Propchange:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/java/org/apache/fop/pdf/xref/ObjectReferenceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/java/org/apache/fop/pdf/xref/ObjectReferenceTest.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Added:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/java/org/apache/fop/pdf/xref/UncompressedObjectReferenceTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/java/org/apache/fop/pdf/xref/UncompressedObjectReferenceTestCase.java?rev=1303431&view=auto
==============================================================================
---
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/java/org/apache/fop/pdf/xref/UncompressedObjectReferenceTestCase.java
(added)
+++
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/java/org/apache/fop/pdf/xref/UncompressedObjectReferenceTestCase.java
Wed Mar 21 15:12:43 2012
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.pdf.xref;
+
+import static org.junit.Assert.assertArrayEquals;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+public class UncompressedObjectReferenceTestCase extends ObjectReferenceTest {
+
+ @Test
+ public void test1ByteOffsets() throws IOException {
+ run1ByteOffsetTest(0x0);
+ run1ByteOffsetTest(0xf);
+ run1ByteOffsetTest(0x10);
+ run1ByteOffsetTest(0xff);
+ }
+
+ private void run1ByteOffsetTest(int offset) throws IOException {
+ runIntegerOffsetTest(Arrays.asList(0, 0, 0, offset));
+ }
+
+ @Test
+ public void test2ByteOffsets() throws IOException {
+ runIntegerOffsetTest(Arrays.asList(0, 0, 1, 0xff));
+ runIntegerOffsetTest(Arrays.asList(0, 0, 0xa0, 0xff));
+ }
+
+ @Test
+ public void test3ByteOffsets() throws IOException {
+ runIntegerOffsetTest(Arrays.asList(0, 2, 0x12, 0x34));
+ runIntegerOffsetTest(Arrays.asList(0, 0xee, 0x56, 0x78));
+ }
+
+ @Test
+ public void test4ByteOffsets() throws IOException {
+ runIntegerOffsetTest(Arrays.asList(0x6, 0x12, 0x34, 0x56));
+ runIntegerOffsetTest(Arrays.asList(0xf1, 0x9a, 0xbc, 0xde));
+ }
+
+ @Test
+ public void test5ByteOffsets() throws IOException {
+ runTest(Arrays.asList(0, 0, 0, 0x7, 0x78, 0x9a, 0xbc, 0xde));
+ runTest(Arrays.asList(0, 0, 0, 0xbf, 0xf0, 0, 0x1, 0x2));
+ }
+
+ @Test
+ public void test8ByteOffsets() throws IOException {
+ runTest(Arrays.asList(0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8));
+ runTest(Arrays.asList(0xf9, 0xe8, 0xd7, 0xc6, 0xb5, 0xa4, 0x93, 0x82));
+ }
+
+ private void runIntegerOffsetTest(List<Integer> expectedOffsetBytes)
throws IOException {
+ List<Integer> expectedLongOffset = new ArrayList<Integer>(8);
+ expectedLongOffset.addAll(Arrays.asList(0, 0, 0, 0));
+ expectedLongOffset.addAll(expectedOffsetBytes);
+ runTest(expectedLongOffset);
+ }
+
+ private void runTest(List<Integer> expectedOffsetBytes) throws IOException
{
+ long offset = computeNumberFromBytes(expectedOffsetBytes);
+ sut = new UncompressedObjectReference(offset);
+ byte[] expected = createExpectedOutput((byte) 1, expectedOffsetBytes,
(byte) 0);
+ byte[] actual = getActualOutput();
+ assertArrayEquals(expected, actual);
+ }
+
+}
Propchange:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/java/org/apache/fop/pdf/xref/UncompressedObjectReferenceTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/java/org/apache/fop/pdf/xref/UncompressedObjectReferenceTestCase.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Added: xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/1.5/fop.xconf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/1.5/fop.xconf?rev=1303431&view=auto
==============================================================================
--- xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/1.5/fop.xconf
(added)
+++ xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/1.5/fop.xconf Wed
Mar 21 15:12:43 2012
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fop version="1.0">
+ <accessibility>true</accessibility>
+ <source-resolution>144</source-resolution>
+ <use-cache>false</use-cache>
+ <font-base>../../resources/fonts/ttf/</font-base>
+ <renderers>
+ <renderer mime="application/pdf">
+ <version>1.5</version>
+ <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>
Added: xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/1.5/test.fo
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/1.5/test.fo?rev=1303431&view=auto
==============================================================================
--- xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/1.5/test.fo (added)
+++ xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/1.5/test.fo Wed
Mar 21 15:12:43 2012
@@ -0,0 +1,207 @@
+<?xml version="1.0" standalone="no"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ 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 column-count="2" margin-top="15pt"/>
+ <fo:region-before extent="12pt"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <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>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-footnote-separator">
+ <fo:block><fo:leader leader-length="100pt"
leader-pattern="rule"/></fo:block>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body" hyphenate="true" text-align="justify">
+ <fo:block>(Thereâs another page sequence <fo:wrapper
color="blue"><fo:basic-link
+
internal-destination="second">below</fo:basic-link></fo:wrapper>.)</fo:block>
+ <fo:block font-family="sans-serif" font-weight="bold" space-before="1em"
space-after="0.2em"
+ role="H1"><fo:block>About Apache FOP</fo:block></fo:block>
+ <fo:block>It is a print formatter driven by XSL formatting objects
(XSL-FO) and an output
+ independent formatter<fo:footnote><fo:inline baseline-shift="super"
+ font-size="70%">1</fo:inline><fo:footnote-body><fo:block>See the
<fo:wrapper
+ color="blue"><fo:basic-link
+
external-destination="http://xmlgraphics.apache.org/fop/">FOP
+ website</fo:basic-link></fo:wrapper> for more
+ information</fo:block></fo:footnote-body></fo:footnote>. FOP has
a nice logo:
+ <fo:external-graphic
src="../../resources/images/fop-logo-color-24bit.png"
+ inline-progression-dimension.maximum="100%"
content-width="scale-to-fit"
+ fox:alt-text="FOP Logo"/></fo:block>
+ <fo:table space-before="10pt" space-after="10pt" width="100%"
table-layout="fixed">
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell border="2pt solid black" padding="2pt 2pt 0">
+ <fo:block>Header 1.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="2pt solid black" padding="2pt 2pt 0">
+ <fo:block>Header 1.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid black" padding="2pt 2pt 0">
+ <fo:block>Cell 1.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid black" padding="2pt 2pt 0">
+ <fo:block>Cell 1.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid black" padding="2pt 2pt 0">
+ <fo:block>Cell 2.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid black" padding="2pt 2pt 0">
+ <fo:block>Cell 2.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <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
+ that reads a formatting object (FO) tree and renders the resulting
pages to a specified
+ output.</fo:block>
+ <fo:block span="all" border-top="1pt solid black" border-bottom="1pt
solid black"
+ padding-before="2pt" padding-after="2pt">This fo:block element spans
all the columns of the
+ document. This is intended to test the abilities of the text-to-speech
program.</fo:block>
+ <fo:block>And now we are back to normal content flowing in two columns.
Letâs start a numbered
+ list:</fo:block>
+ <fo:list-block provisional-distance-between-starts="15pt"
provisional-label-separation="0mm"
+ keep-with-previous="auto">
+ <fo:list-item keep-with-previous="always">
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>1.</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>
+ <fo:block>Line 1 of item 1</fo:block>
+ <fo:block>Line 2 of item 1</fo:block>
+ <fo:block>Line 3 of item 1</fo:block>
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item keep-with-previous="always">
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>2.</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>
+ <fo:block>Line 1 of item 2</fo:block>
+ <fo:block>Line 2 of item 2</fo:block>
+ <fo:block>Line 3 of item 2</fo:block>
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ <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">
+ <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>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-footnote-separator">
+ <fo:block><fo:leader leader-length="100pt"
leader-pattern="rule"/></fo:block>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body" hyphenate="true" text-align="justify">
+ <fo:block id="second">Apache FOP (Formatting Objects Processor) is a
print formatter driven by
+ XSL formatting objects (XSL-FO) and an output independent
formatter<fo:footnote><fo:inline
+ baseline-shift="super"
font-size="70%">1</fo:inline><fo:footnote-body><fo:block>See the
+ <fo:wrapper color="blue"><fo:basic-link
+
external-destination="http://xmlgraphics.apache.org/fop/">FOP
+ website</fo:basic-link></fo:wrapper> for more
+ information</fo:block></fo:footnote-body></fo:footnote>. It is a
Java application that
+ reads a formatting object (FO) tree and renders the resulting pages to
a specified
+ output.</fo:block>
+ <fo:table space-before="10pt" space-after="10pt" width="100%"
table-layout="fixed">
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell border="2pt solid black" padding="2pt 2pt 0">
+ <fo:block>Header 1.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="2pt solid black" padding="2pt 2pt 0">
+ <fo:block>Header 1.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid black" padding="2pt 2pt 0">
+ <fo:block>Cell 1.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid black" padding="2pt 2pt 0">
+ <fo:block>Cell 1.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid black" padding="2pt 2pt 0">
+ <fo:block>Cell 2.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid black" padding="2pt 2pt 0">
+ <fo:block>Cell 2.2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block language="fr" country="FR">Apache FOP (Formatting Objects
Processor) est une
+ application de mise en page de documents respectant le standard
XSL-FO. Ã partir dâun
+ document au format XSL-FO, cette application écrite en Java effectue
une mise en page et
+ renvoie un document prêt pour impression.</fo:block>
+ <fo:block span="all" border-top="1pt solid black" border-bottom="1pt
solid black"
+ padding-before="2pt" padding-after="2pt">This fo:block element spans
all the columns of the
+ document. This is intended to test the abilities of the text-to-speech
program.</fo:block>
+ <fo:block>And now we are back to normal content flowing in two columns.
Letâs start a numbered
+ list:</fo:block>
+ <fo:list-block provisional-distance-between-starts="15pt"
provisional-label-separation="0mm"
+ keep-with-previous="auto">
+ <fo:list-item keep-with-previous="always">
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>1.</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>
+ <fo:block>Line 1 of item 1</fo:block>
+ <fo:block>Line 2 of item 1</fo:block>
+ <fo:block>Line 3 of item 1</fo:block>
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item keep-with-previous="always">
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>2.</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>
+ <fo:block>Line 1 of item 2</fo:block>
+ <fo:block>Line 2 of item 2</fo:block>
+ <fo:block>Line 3 of item 2</fo:block>
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ <fo:block>The end of the document has now been reached.</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
Propchange: xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/1.5/test.fo
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/1.5/test.fo
------------------------------------------------------------------------------
svn:keywords = Id
Added: xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/1.5/test.pdf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/1.5/test.pdf?rev=1303431&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/1.5/test.pdf
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_jpg_repeat.fo
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_jpg_repeat.fo?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_jpg_repeat.fo
(original)
+++
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_jpg_repeat.fo
Wed Mar 21 15:12:43 2012
@@ -20,7 +20,7 @@
<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:region-body
background-image="../../resources/images/bgimg72dpi.jpg"/>
</fo:simple-page-master>
</fo:layout-master-set>
<fo:page-sequence master-reference="page">
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_jpg_single.fo
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_jpg_single.fo?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_jpg_single.fo
(original)
+++
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_jpg_single.fo
Wed Mar 21 15:12:43 2012
@@ -20,7 +20,7 @@
<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:region-body background-image="../../resources/images/bgimg72dpi.jpg"
background-repeat="no-repeat" background-position-horizontal="50%"
background-position-vertical="50%"/>
</fo:simple-page-master>
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_png_repeat.fo
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_png_repeat.fo?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_png_repeat.fo
(original)
+++
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_png_repeat.fo
Wed Mar 21 15:12:43 2012
@@ -20,7 +20,7 @@
<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:region-body
background-image="../../resources/images/bgimg72dpi.png"/>
</fo:simple-page-master>
</fo:layout-master-set>
<fo:page-sequence master-reference="page">
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_png_single.fo
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_png_single.fo?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_png_single.fo
(original)
+++
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_png_single.fo
Wed Mar 21 15:12:43 2012
@@ -20,7 +20,7 @@
<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/fop-logo-color-24bit.png"
+ <fo:region-body
background-image="../../resources/images/fop-logo-color-24bit.png"
background-repeat="no-repeat" background-position-horizontal="50%"
background-position-vertical="50%"/>
</fo:simple-page-master>
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_svg_repeat.fo
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_svg_repeat.fo?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_svg_repeat.fo
(original)
+++
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_svg_repeat.fo
Wed Mar 21 15:12:43 2012
@@ -20,7 +20,7 @@
<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:region-body
background-image="../../resources/images/rgb-circles.svg"/>
</fo:simple-page-master>
</fo:layout-master-set>
<fo:page-sequence master-reference="page">
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_svg_single.fo
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_svg_single.fo?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_svg_single.fo
(original)
+++
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/background-image_svg_single.fo
Wed Mar 21 15:12:43 2012
@@ -20,7 +20,7 @@
<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:region-body
background-image="../../resources/images/rgb-circles.svg"
background-repeat="no-repeat" background-position-horizontal="50%"
background-position-vertical="50%"/>
</fo:simple-page-master>
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/complete.fo
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/complete.fo?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/complete.fo
(original)
+++
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/complete.fo
Wed Mar 21 15:12:43 2012
@@ -45,7 +45,7 @@
external-destination="http://xmlgraphics.apache.org/fop/">FOP
website</fo:basic-link></fo:wrapper> for more
information</fo:block></fo:footnote-body></fo:footnote>. FOP has
a nice logo:
- <fo:external-graphic
src="../resources/images/fop-logo-color-24bit.png"
+ <fo:external-graphic
src="../../resources/images/fop-logo-color-24bit.png"
inline-progression-dimension.maximum="100%"
content-width="scale-to-fit"
fox:alt-text="FOP Logo"/></fo:block>
<fo:table space-before="10pt" space-after="10pt" width="100%"
table-layout="fixed">
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/fop.xconf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/fop.xconf?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/fop.xconf
(original)
+++
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/fop.xconf
Wed Mar 21 15:12:43 2012
@@ -3,7 +3,7 @@
<accessibility>true</accessibility>
<source-resolution>144</source-resolution>
<use-cache>false</use-cache>
- <font-base>../resources/fonts/</font-base>
+ <font-base>../../resources/fonts/ttf/</font-base>
<renderers>
<renderer mime="application/pdf">
<filterList>
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/image_jpg.fo
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/image_jpg.fo?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/image_jpg.fo
(original)
+++
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/image_jpg.fo
Wed Mar 21 15:12:43 2012
@@ -27,7 +27,7 @@
<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"
+ src="../../resources/images/cmyk.jpg"
inline-progression-dimension.maximum="100%"
content-width="scale-to-fit"
fox:alt-text="CMYK colours"/>. Here is the end of the
text.</fo:block>
</fo:flow>
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/image_png.fo
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/image_png.fo?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/image_png.fo
(original)
+++
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/image_png.fo
Wed Mar 21 15:12:43 2012
@@ -27,7 +27,7 @@
<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"
+ src="../../resources/images/fop-logo-color-24bit.png"
inline-progression-dimension.maximum="100%"
content-width="scale-to-fit"
fox:alt-text="FOP Logo"/>. Here is the end of the text.</fo:block>
</fo:flow>
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/image_svg.fo
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/image_svg.fo?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/image_svg.fo
(original)
+++
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/image_svg.fo
Wed Mar 21 15:12:43 2012
@@ -27,7 +27,7 @@
<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"
+ src="../../resources/images/circles.svg"
inline-progression-dimension.maximum="75pt"
content-width="scale-to-fit"
fox:alt-text="Nice circles"/>. And here is the same image as an
instream-foreign-object:
<fo:instream-foreign-object
inline-progression-dimension.maximum="75pt"
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/image_wmf.fo
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/image_wmf.fo?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/image_wmf.fo
(original)
+++
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/image_wmf.fo
Wed Mar 21 15:12:43 2012
@@ -27,7 +27,7 @@
<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"
+ src="../../resources/images/testChart.wmf"
inline-progression-dimension.maximum="100%"
content-width="scale-to-fit"
fox:alt-text="Metafile Companion Test Chart"/> Here is the end of
the text.</fo:block>
</fo:flow>
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/leader.fo
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/leader.fo?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/leader.fo
(original)
+++
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/leader.fo
Wed Mar 21 15:12:43 2012
@@ -32,7 +32,7 @@
<fo:block space-before="10pt">This is a text followed by a leader with
leader-pattern=â"use-content", the content being images:<fo:leader
leader-pattern="use-content"><fo:external-graphic
- src="../resources/images/list-item.png"/></fo:leader>1</fo:block>
+
src="../../resources/images/list-item.png"/></fo:leader>1</fo:block>
</fo:flow>
</fo:page-sequence>
</fo:root>
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/background-image_jpg_repeat.pdf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/background-image_jpg_repeat.pdf?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
Binary files - no diff available.
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/background-image_jpg_single.pdf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/background-image_jpg_single.pdf?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
Binary files - no diff available.
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/background-image_png_repeat.pdf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/background-image_png_repeat.pdf?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
Binary files - no diff available.
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/background-image_png_single.pdf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/background-image_png_single.pdf?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
Binary files - no diff available.
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/background-image_svg_repeat.pdf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/background-image_svg_repeat.pdf?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
Binary files - no diff available.
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/background-image_svg_single.pdf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/background-image_svg_single.pdf?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
Binary files - no diff available.
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/complete.pdf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/complete.pdf?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
Binary files - no diff available.
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/image_jpg.pdf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/image_jpg.pdf?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
Binary files - no diff available.
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/image_png.pdf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/image_png.pdf?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
Binary files - no diff available.
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/image_svg.pdf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/image_svg.pdf?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
Binary files - no diff available.
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/image_wmf.pdf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/image_wmf.pdf?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
Binary files - no diff available.
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/leader.pdf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/leader.pdf?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
Binary files - no diff available.
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/links.pdf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/links.pdf?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
Binary files - no diff available.
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/role.pdf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/role.pdf?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
Binary files - no diff available.
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/role_non-standard.pdf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/role_non-standard.pdf?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
Binary files - no diff available.
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/text_1.pdf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/text_1.pdf?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
Binary files - no diff available.
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/text_2.pdf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/text_2.pdf?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
Binary files - no diff available.
Modified:
xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/text_font-embedding.pdf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_PDF_ObjectStreams/test/pdf/accessibility/pdf/text_font-embedding.pdf?rev=1303431&r1=1302529&r2=1303431&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]