white-space and line-ending cleanup

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

diff --git a/test/bugtests.xml b/test/bugtests.xml
index a853e78b9d60f8651544d6bce53557fe3cd2eaaf..cb45879e202e39a1598b9a6a37acdc39c1498199 100644 (file)
--- a/test/bugtests.xml
+++ b/test/bugtests.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE testsuite  SYSTEM "testsuite.dtd">
 <testsuite profile="Basic Conformance Tests">
   <testcases profile="Characters">
-    <testcases profile="sizes" > 
+    <testcases profile="sizes" >
       <test id="1" interaction="none" fo="block" xml="xml/bugtests/charwidth.fo" xsl="xsl/copy.xsl" level="basic">
 Checks the width of all the defined characters
       </test>
@@ -50,22 +50,22 @@ Nested lists used to show that the indentation is correct for lists inside lists
       </testresult>
       <test id="bbo1b1" interaction="none" fo="list" xml="xml/bugtests/block.fo" xsl="xsl/copy.xsl" level="basic">
 
-      </test>  
-      <testresult id="bbo1b1" agreement="issues">  
+      </test>
+      <testresult id="bbo1b1" agreement="issues">
       </testresult>
       <test id="bbo1b1" interaction="none" fo="list" xml="xml/bugtests/border.fo" xsl="xsl/copy.xsl" level="basic">
 
-      </test>  
-      <testresult id="bbo1b1" agreement="issues">  
+      </test>
+      <testresult id="bbo1b1" agreement="issues">
       </testresult>
       <test id="bbo1b1" interaction="none" fo="list" xml="xml/bugtests/break-before.fo" xsl="xsl/copy.xsl" level="basic">
 
-      </test>      
-      <testresult id="bbo1b1" agreement="issues">      
+      </test>
+      <testresult id="bbo1b1" agreement="issues">
       </testresult>
       <test id="bbo1b1" interaction="none" fo="list" xml="xml/bugtests/color.fo" xsl="xsl/copy.xsl" level="basic">
 
-      </test>          
+      </test>
       <testresult id="bbo1b1" agreement="issues">
       </testresult>
       <test id="bbo1b1" interaction="none" fo="list" xml="xml/bugtests/external-graphic.fo" xsl="xsl/copy.xsl" level="basic">

diff --git a/test/resources/fop/image/align.fo b/test/resources/fop/image/align.fo
index e431bdc118cd2b0800047d5dd38795818c77072d..121e9f4cc057cfda60a1da328cdc8bea222ff9cc 100644 (file)
--- a/test/resources/fop/image/align.fo
+++ b/test/resources/fop/image/align.fo
@@ -21,9 +21,9 @@
 <fo:page-sequence id="N2528" master-reference="left">
 
 <fo:static-content flow-name="xsl-region-after">
-       <fo:block text-align-last="center" font-size="10pt">
-               <fo:page-number/>
-       </fo:block>
+  <fo:block text-align-last="center" font-size="10pt">
+    <fo:page-number/>
+  </fo:block>
 </fo:static-content>
 
 <fo:flow flow-name="xsl-region-body">

diff --git a/test/resources/fop/image/align2.fo b/test/resources/fop/image/align2.fo
index 12f676181d2894cdbf62b4bfb4f80e090de3a629..4dc7cd242f648231f8af138a7502e36065199210 100644 (file)
--- a/test/resources/fop/image/align2.fo
+++ b/test/resources/fop/image/align2.fo
@@ -21,9 +21,9 @@
 <fo:page-sequence id="N2528" master-reference="left">
 
 <fo:static-content flow-name="xsl-region-after">
-       <fo:block text-align-last="center" font-size="10pt">
-               <fo:page-number/>
-       </fo:block>
+  <fo:block text-align-last="center" font-size="10pt">
+    <fo:page-number/>
+  </fo:block>
 </fo:static-content>
 
 <fo:flow flow-name="xsl-region-body">

diff --git a/test/resources/fop/image/errors.fo b/test/resources/fop/image/errors.fo
index 6ee931e90c4948355e7574faf87eabfadc22a637..d9fbb26ffd61ba518dccc73658f089954578fc22 100644 (file)
--- a/test/resources/fop/image/errors.fo
+++ b/test/resources/fop/image/errors.fo
@@ -21,9 +21,9 @@
 <fo:page-sequence id="N2528" master-reference="left">
 
 <fo:static-content flow-name="xsl-region-after">
-       <fo:block text-align-last="center" font-size="10pt">
-               <fo:page-number/>
-       </fo:block>
+  <fo:block text-align-last="center" font-size="10pt">
+    <fo:page-number/>
+  </fo:block>
 </fo:static-content>
 
 <fo:flow flow-name="xsl-region-body">

diff --git a/test/resources/fop/image/logo.svg b/test/resources/fop/image/logo.svg
index 4480deeb8c3c473d6bff5b7997e3a8f05af25f52..51be8a23cae68ea73bbd578501fd1e1167539810 100644 (file)
--- a/test/resources/fop/image/logo.svg
+++ b/test/resources/fop/image/logo.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20001102//EN"
-       "http://www.w3.org/TR/2000/CR-SVG-20001102/DTD/svg-20001102.dtd">
+  "http://www.w3.org/TR/2000/CR-SVG-20001102/DTD/svg-20001102.dtd">
 <svg width="100" height="100">
 <defs>
 

diff --git a/test/resources/fop/image/size.fo b/test/resources/fop/image/size.fo
index 5f28c2b4046190904374a0f3c64320bd9c2e4073..bb3fb024e35222274a34b518c790afa0d57a962a 100644 (file)
--- a/test/resources/fop/image/size.fo
+++ b/test/resources/fop/image/size.fo
@@ -21,9 +21,9 @@
 <fo:page-sequence id="N2528" master-reference="left">
 
 <fo:static-content flow-name="xsl-region-after">
-       <fo:block text-align-last="center" font-size="10pt">
-               <fo:page-number/>
-       </fo:block>
+  <fo:block text-align-last="center" font-size="10pt">
+    <fo:page-number/>
+  </fo:block>
 </fo:static-content>
 
 <fo:flow flow-name="xsl-region-body">

diff --git a/test/resources/fop/image/types.fo b/test/resources/fop/image/types.fo
index 7aad237606bd2393967a1f910dc6c48bc4a5c3ce..1dd96b42fefaa4ac0133fea91951c843e6abfb6e 100644 (file)
--- a/test/resources/fop/image/types.fo
+++ b/test/resources/fop/image/types.fo
@@ -21,9 +21,9 @@
 <fo:page-sequence id="N2528" master-reference="left">
 
 <fo:static-content flow-name="xsl-region-after">
-       <fo:block text-align-last="center" font-size="10pt">
-               <fo:page-number/>
-       </fo:block>
+  <fo:block text-align-last="center" font-size="10pt">
+    <fo:page-number/>
+  </fo:block>
 </fo:static-content>
 
 <fo:flow flow-name="xsl-region-body">

diff --git a/test/resources/fop/svg/embed.fo b/test/resources/fop/svg/embed.fo
index 04ec811610f67e0039fcdda25f5238e39483e399..2993552dae0a742b0917021864e5660c3b57f29b 100644 (file)
--- a/test/resources/fop/svg/embed.fo
+++ b/test/resources/fop/svg/embed.fo
@@ -24,9 +24,9 @@
 <fo:page-sequence id="N2528" master-reference="left">
 
 <fo:static-content flow-name="xsl-region-after">
-       <fo:block text-align-last="center" font-size="10pt">
-               <fo:page-number/>
-       </fo:block>
+  <fo:block text-align-last="center" font-size="10pt">
+    <fo:page-number/>
+  </fo:block>
 </fo:static-content>
 
 <fo:flow flow-name="xsl-region-body">

diff --git a/test/resources/fop/svg/images.fo b/test/resources/fop/svg/images.fo
index a9f39a10512be27e1f247e8f12a130507e723494..5b739dca8bfdeff42dcb1f34ca1f25822b0aac48 100644 (file)
--- a/test/resources/fop/svg/images.fo
+++ b/test/resources/fop/svg/images.fo
@@ -4,11 +4,11 @@
 
   <fo:layout-master-set>
     <fo:simple-page-master master-name="simple"
-                  page-height="29.7cm" 
+                  page-height="29.7cm"
                   page-width="21cm"
-                  margin-top="1cm" 
-                  margin-bottom="2cm" 
-                  margin-left="2.5cm" 
+                  margin-top="1cm"
+                  margin-bottom="2cm"
+                  margin-left="2.5cm"
                   margin-right="2.5cm">
       <fo:region-body margin-top="3cm"/>
       <fo:region-before extent="3cm"/>
@@ -20,11 +20,11 @@
 
     <fo:flow flow-name="xsl-region-body">
 
-      <fo:block space-after.optimum="40pt">                
+      <fo:block space-after.optimum="40pt">
         Embedded/Image SVG
       </fo:block>
 
-      <fo:block>                
+      <fo:block>
 <fo:external-graphic src="images.svg"/>
       </fo:block>
 

diff --git a/test/resources/fop/svg/link.fo b/test/resources/fop/svg/link.fo
index 4af5d363aa3235879ffd277bb9783858d94cf754..a466ef245899eb157fc1fed28fd894719154ff95 100644 (file)
--- a/test/resources/fop/svg/link.fo
+++ b/test/resources/fop/svg/link.fo
@@ -4,11 +4,11 @@
 
   <fo:layout-master-set>
     <fo:simple-page-master master-name="simple"
-                  page-height="29.7cm" 
+                  page-height="29.7cm"
                   page-width="21cm"
-                  margin-top="1cm" 
-                  margin-bottom="2cm" 
-                  margin-left="2.5cm" 
+                  margin-top="1cm"
+                  margin-bottom="2cm"
+                  margin-left="2.5cm"
                   margin-right="2.5cm">
       <fo:region-body margin-top="3cm"/>
       <fo:region-before extent="3cm"/>
@@ -20,11 +20,11 @@
 
     <fo:flow flow-name="xsl-region-body">
 
-      <fo:block space-after.optimum="40pt">                
+      <fo:block space-after.optimum="40pt">
         Embedded/Image SVG
       </fo:block>
 
-      <fo:block>                
+      <fo:block>
 <fo:external-graphic src="link.svg"/>
       </fo:block>
 

diff --git a/test/resources/fop/svg/text.svg b/test/resources/fop/svg/text.svg
index 08b825e341ad487e9eca60156460d0ab5f85bcfd..971c901269962bb866cf27fcc6494a68c425850d 100644 (file)
--- a/test/resources/fop/svg/text.svg
+++ b/test/resources/fop/svg/text.svg
@@ -90,7 +90,7 @@
 <line x1="30" y1="80" x2="100" y2="80"/>
 <line x1="50" y1="100" x2="80" y2="100"/>
 </g>
-</g> 
+</g>
   </glyph>
 
  <glyph unicode="P" glyph-name="p" horiz-adv-x="210">
@@ -103,7 +103,7 @@
 <line x1="5" y1="85" x2="40" y2="85"/>
 <line x1="5" y1="110" x2="40" y2="110"/>
 </g>
-</g> 
+</g>
   </glyph>
 
     <hkern g1="F"  g2="O"  k="5"/>

diff --git a/test/testsuite.dtd b/test/testsuite.dtd
index bf32ea23bb81dbaa12bf573c418d1eebff703b9f..5e7e36279d6fb5a3cdca2fe832c53b17db3fc451 100644 (file)
--- a/test/testsuite.dtd
+++ b/test/testsuite.dtd
@@ -9,12 +9,12 @@
     Revised 2001 Jan 10 (Paul Grosso) - augmented by XSL FO SG:
        - add to the TEST element an XSL attribute to point to
          the XSL stylesheet and rename the URI attribute to XML
-       - add to the TEST element a PROPERTY attribute to 
+       - add to the TEST element a PROPERTY attribute to
          indicate when a given property is being tested
        - add to the TEST element a LEVEL attribute to indicate
          which conformance level is being tested
        - add to the TEST element a SPECPTR attribute
-         (of URI type) to allow referring to relevant sections 
+         (of URI type) to allow referring to relevant sections
          of the XSL spec.
        - add to the TEST element an ERRATUM attribute
          (of CDATA type) to allow recording of an erratum
@@ -22,7 +22,7 @@
        - add to INTERACTION attribute value list MULTIPLE
          and give it a default of NONE
        - add to FO attribute value list MULTIPLE
-       - make the BASE attribute on TESTCASES #IMPLIED, 
+       - make the BASE attribute on TESTCASES #IMPLIED,
          since it's not unreasonable for all the URI-type
          attributes to be absolute
        - add to the TEST element a RESULTS attribute to point
@@ -31,9 +31,9 @@
    Revised 2001 Jan 24 (Paul Grosso) - lowercased names (though
           not in comments, since that helps highlight them)
 
-               2001-02-19 (AntennaHouse) added repeatable-page-master-alternatives 
+               2001-02-19 (AntennaHouse) added repeatable-page-master-alternatives
                conditional-page-master-reference region-before
-               region-after region-start region-end static-content 
+               region-after region-start region-end static-content
                inline inline-container.
 
 -->
@@ -47,18 +47,18 @@
     improper processing by IE5.
 -->
 <!ELEMENT testsuite ( testcases+ )>
-<!ATTLIST testsuite 
+<!ATTLIST testsuite
     profile    CDATA           #IMPLIED
     >
 
 <!--
-    The root element of a collection should be "TESTCASES".  It serves to 
+    The root element of a collection should be "TESTCASES".  It serves to
     group a set of tests to be collectively identified as follows:
-       
-       * PROFILE - name of test profile 
+
+       * PROFILE - name of test profile
        * BASE - base directory in which tests for this collection reside;
          allows tests to be found in many application instances.
- 
+
 -->
 
 <!ELEMENT testcases (test | testresult | testcases)*>
@@ -69,7 +69,7 @@
 
 <!--
     The body of each TEST element is its description as well as a
-    discussion of the expected results.  The following attributes 
+    discussion of the expected results.  The following attributes
     must be specified for each test as follows:
 
        * ID - unique test identifier
@@ -122,9 +122,9 @@
 <!ELEMENT em (#PCDATA | b)*>
 <!ELEMENT b (#PCDATA | em)*>
 
-<!-- 
+<!--
     We also allow for hyperlinks in text (e.g., to include
-    references to supporting evidence within SPECPROBLEM and 
+    references to supporting evidence within SPECPROBLEM and
     TESTPROBLEM).
 -->
 <!ELEMENT a (#PCDATA | b | em)*>
@@ -148,13 +148,13 @@
 
     The optional FUTURESUPPORT attribute is used to indicate
        expected future support of the feature tested by this
-       test case.  
+       test case.
 
     The optional SPECPROBLEM attribute indicates if there is
        any ambiguity or other problem found in the spec that relates
        to this test.  Especially if the results weren't as expected
        because of a misinterpretation of the spec, this should be
-       documented here.  Details/discussion should appear in the 
+       documented here.  Details/discussion should appear in the
        textual contents of the TESTRESULT element.
 
     The optional TESTPROBLEM attribute indicates if there is
@@ -162,7 +162,7 @@
        suggests.  Especially if the results of the test differ
        from that given as "expected" by the test case but are,
        in fact, believed to be the correct results, this should
-       be documented here.  Details/discussion should appear in the 
+       be documented here.  Details/discussion should appear in the
        textual contents of the TESTRESULT element.
 
 -->