Style only: removed spurious ^M characters at the end of lines

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@629048 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 211 insertions, 211 deletions

diff --git a/test/layoutengine/standard-testcases/external-graphic_content-height_content-width_2.xml b/test/layoutengine/standard-testcases/external-graphic_content-height_content-width_2.xml
index 281da9873..78ff03ecb 100644
--- a/test/layoutengine/standard-testcases/external-graphic_content-height_content-width_2.xml
+++ b/test/layoutengine/standard-testcases/external-graphic_content-height_content-width_2.xml
@@ -1,92 +1,92 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  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$ -->

-<testcase>

-  <info>

-    <p>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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$ -->
+<testcase>
+  <info>
+    <p>
       This test checks external-graphics with content-width
-      (values: scale-to-fit, scale-down-to-fit and scale-up-to-fit)

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal" font-size="0" line-height="1">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:block>

-            <fo:external-graphic id="img1" src="../../resources/images/bgimg72dpi.jpg"/>

-          </fo:block>

-          <fo:block>

+      (values: scale-to-fit, scale-down-to-fit and scale-up-to-fit)
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" font-size="0" line-height="1">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>
+            <fo:external-graphic id="img1" src="../../resources/images/bgimg72dpi.jpg"/>
+          </fo:block>
+          <fo:block>
             <fo:external-graphic id="img2" src="../../resources/images/bgimg72dpi.jpg"
               inline-progression-dimension="250pt" block-progression-dimension="250pt"
-              content-height="scale-to-fit" content-width="scale-to-fit"/>

-          </fo:block>

-          <fo:block>

-            <fo:external-graphic id="img3" src="../../resources/images/bgimg72dpi.jpg"

-              inline-progression-dimension="250pt" block-progression-dimension="250pt"

-              content-height="scale-down-to-fit" content-width="scale-down-to-fit"/>

-          </fo:block>

-          <fo:block>

-            <fo:external-graphic id="img4" src="../../resources/images/bgimg72dpi.jpg"

-              inline-progression-dimension="250pt" block-progression-dimension="250pt"

-              content-height="scale-up-to-fit" content-width="scale-up-to-fit"/>

-          </fo:block>

-          <fo:block>

-            <fo:external-graphic id="img5" src="../../resources/images/bgimg300dpi.jpg"

-              inline-progression-dimension="250pt" block-progression-dimension="250pt"

-              content-height="scale-down-to-fit" content-width="scale-down-to-fit"/>

-          </fo:block>

-          <fo:block>

-            <fo:external-graphic id="img6" src="../../resources/images/bgimg300dpi.jpg"

-              inline-progression-dimension="250pt" block-progression-dimension="250pt"

-              content-height="scale-up-to-fit" content-width="scale-up-to-fit"/>

-          </fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="192000" xpath="//image[@prod-id='img1']/../@ipd"/>

+              content-height="scale-to-fit" content-width="scale-to-fit"/>
+          </fo:block>
+          <fo:block>
+            <fo:external-graphic id="img3" src="../../resources/images/bgimg72dpi.jpg"
+              inline-progression-dimension="250pt" block-progression-dimension="250pt"
+              content-height="scale-down-to-fit" content-width="scale-down-to-fit"/>
+          </fo:block>
+          <fo:block>
+            <fo:external-graphic id="img4" src="../../resources/images/bgimg72dpi.jpg"
+              inline-progression-dimension="250pt" block-progression-dimension="250pt"
+              content-height="scale-up-to-fit" content-width="scale-up-to-fit"/>
+          </fo:block>
+          <fo:block>
+            <fo:external-graphic id="img5" src="../../resources/images/bgimg300dpi.jpg"
+              inline-progression-dimension="250pt" block-progression-dimension="250pt"
+              content-height="scale-down-to-fit" content-width="scale-down-to-fit"/>
+          </fo:block>
+          <fo:block>
+            <fo:external-graphic id="img6" src="../../resources/images/bgimg300dpi.jpg"
+              inline-progression-dimension="250pt" block-progression-dimension="250pt"
+              content-height="scale-up-to-fit" content-width="scale-up-to-fit"/>
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="192000" xpath="//image[@prod-id='img1']/../@ipd"/>
     <eval expected="192000" xpath="//image[@prod-id='img1']/../@bpd"/>
-    <eval expected="0 0 192000 192000" xpath="//image[@prod-id='img1']/../@pos"/>

-    

-    <eval expected="250000" xpath="//image[@prod-id='img2']/../@ipd"/>

+    <eval expected="0 0 192000 192000" xpath="//image[@prod-id='img1']/../@pos"/>
+    
+    <eval expected="250000" xpath="//image[@prod-id='img2']/../@ipd"/>
     <eval expected="250000" xpath="//image[@prod-id='img2']/../@bpd"/>
-    <eval expected="0 0 250000 250000" xpath="//image[@prod-id='img2']/../@pos"/>

-    

-    <eval expected="250000" xpath="//image[@prod-id='img3']/../@ipd"/>

+    <eval expected="0 0 250000 250000" xpath="//image[@prod-id='img2']/../@pos"/>
+    
+    <eval expected="250000" xpath="//image[@prod-id='img3']/../@ipd"/>
     <eval expected="250000" xpath="//image[@prod-id='img3']/../@bpd"/>
-    <eval expected="0 0 192000 192000" xpath="//image[@prod-id='img3']/../@pos"/>

-    

-    <eval expected="250000" xpath="//image[@prod-id='img4']/../@ipd"/>

-    <eval expected="250000" xpath="//image[@prod-id='img4']/../@bpd"/>

-    <eval expected="0 0 250000 250000" xpath="//image[@prod-id='img4']/../@pos"/>

+    <eval expected="0 0 192000 192000" xpath="//image[@prod-id='img3']/../@pos"/>
+    
+    <eval expected="250000" xpath="//image[@prod-id='img4']/../@ipd"/>
+    <eval expected="250000" xpath="//image[@prod-id='img4']/../@bpd"/>
+    <eval expected="0 0 250000 250000" xpath="//image[@prod-id='img4']/../@pos"/>
 
-    <eval expected="250000" xpath="//image[@prod-id='img5']/../@ipd"/>

-    <eval expected="250000" xpath="//image[@prod-id='img5']/../@bpd"/>

-    <eval expected="0 0 46080 46080" xpath="//image[@prod-id='img5']/../@pos"/>

-    

-    <eval expected="250000" xpath="//image[@prod-id='img6']/../@ipd"/>

-    <eval expected="250000" xpath="//image[@prod-id='img6']/../@bpd"/>

-    <eval expected="0 0 250000 250000" xpath="//image[@prod-id='img6']/../@pos"/>

-  </checks>

-</testcase>

+    <eval expected="250000" xpath="//image[@prod-id='img5']/../@ipd"/>
+    <eval expected="250000" xpath="//image[@prod-id='img5']/../@bpd"/>
+    <eval expected="0 0 46080 46080" xpath="//image[@prod-id='img5']/../@pos"/>
+    
+    <eval expected="250000" xpath="//image[@prod-id='img6']/../@ipd"/>
+    <eval expected="250000" xpath="//image[@prod-id='img6']/../@bpd"/>
+    <eval expected="0 0 250000 250000" xpath="//image[@prod-id='img6']/../@pos"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/fox_destination_1.xml b/test/layoutengine/standard-testcases/fox_destination_1.xml
index a5c6b15f7..54d6f7e72 100644
--- a/test/layoutengine/standard-testcases/fox_destination_1.xml
+++ b/test/layoutengine/standard-testcases/fox_destination_1.xml
@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  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$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks the basics of fox:destination.

-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"

-        xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fox:destination internal-destination="chapter1"/>

-      <fox:destination internal-destination="chapter2"/>

-      <fox:destination internal-destination="chapter2-sec1"/>

-      

-      <fo:page-sequence id="page-sequence" master-reference="normal">

-        <fo:flow flow-name="xsl-region-body">

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks the basics of fox:destination.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+        xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fox:destination internal-destination="chapter1"/>
+      <fox:destination internal-destination="chapter2"/>
+      <fox:destination internal-destination="chapter2-sec1"/>
+      
+      <fo:page-sequence id="page-sequence" master-reference="normal">
+        <fo:flow flow-name="xsl-region-body">
           <fo:block id="chapter1" font-weight="bold" font-size="larger">Chapter 1</fo:block>
-          <fo:block>Blah blah bla.</fo:block>

-          <fo:block id="chapter2" font-weight="bold" font-size="larger" break-before="page">Chapter 2</fo:block>

-          <fo:block>Blah blah bla.</fo:block>

-          <fo:block id="chapter2-sec1" font-weight="bold">Section 1</fo:block>

-          <fo:block>Blah blah bla.</fo:block>

-          <fo:block id="chapter2-sec2" font-weight="bold"><fox:destination internal-destination="chapter2-sec2"/>Section 2</fo:block>

-          <fo:block>Blah blah bla.</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <eval expected="1" xpath="count(/areaTree/pageSequence)"/>

-    <eval expected="2" xpath="count(//pageViewport)"/>

+          <fo:block>Blah blah bla.</fo:block>
+          <fo:block id="chapter2" font-weight="bold" font-size="larger" break-before="page">Chapter 2</fo:block>
+          <fo:block>Blah blah bla.</fo:block>
+          <fo:block id="chapter2-sec1" font-weight="bold">Section 1</fo:block>
+          <fo:block>Blah blah bla.</fo:block>
+          <fo:block id="chapter2-sec2" font-weight="bold"><fox:destination internal-destination="chapter2-sec2"/>Section 2</fo:block>
+          <fo:block>Blah blah bla.</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="1" xpath="count(/areaTree/pageSequence)"/>
+    <eval expected="2" xpath="count(//pageViewport)"/>
 
-    <eval expected="4" xpath="count(//destination)"/>

-    <eval expected="(P1,chapter1)" xpath="//destination[1]/@internal-link"/>

-    <eval expected="(P2,chapter2)" xpath="//destination[2]/@internal-link"/>

-    <eval expected="(P2,chapter2-sec1)" xpath="//destination[3]/@internal-link"/>

-    <eval expected="(P2,chapter2-sec2)" xpath="//destination[4]/@internal-link"/>

-  </checks>

-</testcase>

+    <eval expected="4" xpath="count(//destination)"/>
+    <eval expected="(P1,chapter1)" xpath="//destination[1]/@internal-link"/>
+    <eval expected="(P2,chapter2)" xpath="//destination[2]/@internal-link"/>
+    <eval expected="(P2,chapter2-sec1)" xpath="//destination[3]/@internal-link"/>
+    <eval expected="(P2,chapter2-sec2)" xpath="//destination[4]/@internal-link"/>
+  </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/table-row_keep-with-next2.xml b/test/layoutengine/standard-testcases/table-row_keep-with-next2.xml
index 55086e577..3b3b89384 100644
--- a/test/layoutengine/standard-testcases/table-row_keep-with-next2.xml
+++ b/test/layoutengine/standard-testcases/table-row_keep-with-next2.xml
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  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$ -->

-<testcase>

-  <info>

-    <p>

-      This test checks keep-with-next behaviour on a table-row.

-    </p>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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$ -->
+<testcase>
+  <info>
     <p>
-      There used to be a bug where the keep-with-next signal wouldn't get cleared and

+      This test checks keep-with-next behaviour on a table-row.
+    </p>
+    <p>
+      There used to be a bug where the keep-with-next signal wouldn't get cleared and
       resulted in too little break possibilities.
-    </p>

-  </info>

-  <fo>

-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" widows="0" orphans="0">

-      <fo:layout-master-set>

-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="4.5 * 14.4pt">

-          <fo:region-body/>

-        </fo:simple-page-master>

-      </fo:layout-master-set>

-      <fo:page-sequence master-reference="normal">

-        <fo:flow flow-name="xsl-region-body">

-          <fo:table table-layout="fixed" width="100%" id="A">

-            <fo:table-column column-width="proportional-column-width(1)"/>

-            <fo:table-body>

-              <fo:table-row keep-with-next="always">

-                <fo:table-cell id="cellA1">

-                  <fo:block>line1</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-              <fo:table-row keep-together="always">

-                <fo:table-cell id="cellA2">

-                  <fo:block>line1</fo:block>

-                  <fo:block>line2</fo:block>

-                </fo:table-cell>

-              </fo:table-row>

-            </fo:table-body>

-          </fo:table>

-          <fo:block>block</fo:block>

-        </fo:flow>

-      </fo:page-sequence>

-    </fo:root>

-  </fo>

-  <checks>

-    <element-list category="breaker">

-      <box w="14400"/>

-      <penalty w="0" p="INF"/>

-      <box w="28800"/>

-      <penalty w="0" p="0"/>

-      <box w="14400"/>

-      <skip>3</skip>

-    </element-list>

-  </checks>

-</testcase>

+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" widows="0" orphans="0">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="4.5 * 14.4pt">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:table table-layout="fixed" width="100%" id="A">
+            <fo:table-column column-width="proportional-column-width(1)"/>
+            <fo:table-body>
+              <fo:table-row keep-with-next="always">
+                <fo:table-cell id="cellA1">
+                  <fo:block>line1</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row keep-together="always">
+                <fo:table-cell id="cellA2">
+                  <fo:block>line1</fo:block>
+                  <fo:block>line2</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+          <fo:block>block</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <element-list category="breaker">
+      <box w="14400"/>
+      <penalty w="0" p="INF"/>
+      <box w="28800"/>
+      <penalty w="0" p="0"/>
+      <box w="14400"/>
+      <skip>3</skip>
+    </element-list>
+  </checks>
+</testcase>