xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From man...@apache.org
Subject svn commit: r489585 [4/4] - in /xmlgraphics/fop/trunk: ./ src/codegen/ src/codegen/fo/ src/codegen/fonts/ src/codegen/unicode/ src/codegen/unicode/data/ src/codegen/unicode/java/ src/codegen/unicode/java/org/ src/codegen/unicode/java/org/apache/ src/co...
Date Fri, 22 Dec 2006 09:16:22 GMT
Added: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml?view=auto&rev=489585
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml
(added)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml
Fri Dec 22 01:16:18 2006
@@ -0,0 +1,188 @@
+<?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 some of the UAX#14 breaking rules.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="2.5in" page-height="10in"
margin="5pt">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body" font-size="10pt">
+          <fo:block background-color="silver" font-size="8pt" margin="3pt 0pt 0pt 0pt">
+            BA -- Break Opportunity After (A)
+          </fo:block>
+          <fo:block background-color="yellow" margin="0pt 0pt 3pt 0pt">
+            VeryLongWordWithAThinSpace&#x2009;PutInTheMiddleOfIt
+          </fo:block>
+          <fo:block background-color="silver" font-size="8pt" margin="3pt 0pt 0pt 0pt">
+            BB -- Break Opportunity Before (B)
+          </fo:block>
+          <fo:block background-color="yellow" margin="0pt 0pt 3pt 0pt">
+            VeryLongWordWithAnAcuteAccent&#x00B4;PutInTheMiddleOfIt
+          </fo:block>
+          <fo:block background-color="silver" font-size="8pt" margin="3pt 0pt 0pt 0pt">
+            B2 -- Break Opportunity Before and After (B/A)
+          </fo:block>
+          <fo:block background-color="yellow" margin="0pt 0pt 3pt 0pt">
+            &#x2014;Very&#x2014;Long&#x2014;Word&#x2014;With&#x2014;LotsOf&#x2014;Em&#x2014;Dashes&#x2014;Put&#x2014;InBetween&#x2014;And&#x2014;Around&#x2014;
+          </fo:block>
+          <fo:block background-color="silver" font-size="8pt" margin="3pt 0pt 0pt 0pt">
+            B2 -- Break Opportunity Before and After (B/A) - as before but don't break between
consecutive Em Dashes
+          </fo:block>
+          <fo:block background-color="yellow" margin="0pt 0pt 3pt 0pt">
+            AVeryLongWordWithSomeDouble&#x2014; &#x2014;Dashes&#x2014; &#x2014;Put&#x2014;
&#x2014;In
+          </fo:block>
+          <fo:block background-color="yellow" margin="0pt 0pt 3pt 0pt">
+            AVeryLongWordWithSomeDouble&#x2014;&#x2014;Dashes&#x2014;&#x2014;Put&#x2014;&#x2014;In
+          </fo:block>
+          <fo:block background-color="silver" font-size="8pt" margin="3pt 0pt 0pt 0pt">
+            CL -- Closing Punctuation (XB)
+          </fo:block>
+          <fo:block background-color="yellow" margin="0pt 0pt 3pt 0pt">
+            Closing )brackets )even )if )preceeded )by )a )space )are )not )a )break )point
+          </fo:block>
+          <fo:block background-color="silver" font-size="8pt" margin="3pt 0pt 0pt 0pt">
+            EX -- Exclamation / interrogation (XB)
+          </fo:block>
+          <fo:block background-color="yellow" margin="0pt 0pt 3pt 0pt">
+            Question ?marks ?and exclamation !marks !even ?if !preceeded ?by !a ?space !are
?not !a ?break !point
+          </fo:block>
+          <fo:block background-color="silver" font-size="8pt" margin="3pt 0pt 0pt 0pt">
+            HY -- Hyphen Minus (XA)
+          </fo:block>
+          <fo:block background-color="yellow" margin="0pt 0pt 3pt 0pt">
+            Very-Long-Word-With-Lots-Of-Hyphens-Put-In-Between
+          </fo:block>
+          <fo:block background-color="yellow" margin="0pt 0pt 3pt 0pt">
+            Hyphens-in-numbers-do-not-123-567-890-break
+          </fo:block>
+          <fo:block background-color="silver" font-size="8pt" margin="3pt 0pt 0pt 0pt">
+            ID -- Ideographic (B/A)
+          </fo:block>
+          <fo:block background-color="yellow" margin="0pt 0pt 0pt 0pt">
+            Need&#x3000;A&#x3000;Proper&#x3000;Test&#x3000;Case&#x3000;For&#x3000;This&#x3000;As&#x3000;Here&#x3000;Only&#x3000;The&#x3000;Ideographic&#x3000;Space&#x3000;Is&#x3000;Used
+          </fo:block>
+          <fo:block background-color="silver" font-size="8pt" margin="3pt 0pt 0pt 0pt">
+            IN -- Inseperable characters (XP)
+          </fo:block>
+          <fo:block background-color="yellow" margin="0pt 0pt 3pt 0pt">
+            There is never a break&#x2026;&#x2026;&#x2026;&#x2026;&#x2026;&#x2026;&#x2026;&#x2026;&#x2026;&#x2026;between
characters of this class
+          </fo:block>
+          <fo:block background-color="silver" font-size="8pt" margin="3pt 0pt 0pt 0pt">
+            IS -- Numeric Separator (Infix) (XB)
+          </fo:block>
+          <fo:block background-color="yellow" margin="0pt 0pt 3pt 0pt">
+            Numbers containing separators 123,345,678.00 08:00:23.15 are not broken
+          </fo:block>
+          <fo:block background-color="silver" font-size="8pt" margin="3pt 0pt 0pt 0pt">
+            OP -- Opening Punctuation (XA)
+          </fo:block>
+          <fo:block background-color="yellow" margin="0pt 0pt 3pt 0pt">
+            Opening( brackets( even( if( followed( by( a( space( are( not( a( break( point
+          </fo:block>
+          <fo:block background-color="silver" font-size="8pt" margin="3pt 0pt 0pt 0pt">
+            SY -- Symbols Allowing Break After (A)
+          </fo:block>
+          <fo:block background-color="yellow" margin="0pt 0pt 3pt 0pt">
+            http://a/very/long/url/can/be/broken/after/the/solidus
+          </fo:block>
+          <fo:block background-color="yellow" margin="0pt 0pt 3pt 0pt">
+            No-break-point-in-normal-dates-12/12/2006-or-fractions-12345678/67890112
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+      <eval expected="2" xpath="count(//flow/block[2]/lineArea)"/>
+      <eval expected="141160" xpath="//flow/block[2]/lineArea[1]/text/@ipd"/>
+      <eval expected="88150" xpath="//flow/block[2]/lineArea[2]/text/@ipd"/>
+
+      <eval expected="2" xpath="count(//flow/block[4]/lineArea)"/>
+      <eval expected="155060" xpath="//flow/block[4]/lineArea[1]/text/@ipd"/>
+      <eval expected="89480" xpath="//flow/block[4]/lineArea[2]/text/@ipd"/>
+
+      <eval expected="3" xpath="count(//flow/block[6]/lineArea)"/>
+      <eval expected="166150" xpath="//flow/block[6]/lineArea[1]/text/@ipd"/>
+      <eval expected="161160" xpath="//flow/block[6]/lineArea[2]/text/@ipd"/>
+      <eval expected="70030" xpath="//flow/block[6]/lineArea[3]/text/@ipd"/>
+
+      <eval expected="2" xpath="count(//flow/block[8]/lineArea)"/>
+      <eval expected="151160" xpath="//flow/block[8]/lineArea[1]/text/@ipd"/>
+      <eval expected="125590" xpath="//flow/block[8]/lineArea[2]/text/@ipd"/>
+
+      <eval expected="2" xpath="count(//flow/block[9]/lineArea)"/>
+      <eval expected="151160" xpath="//flow/block[9]/lineArea[1]/text/@ipd"/>
+      <eval expected="117250" xpath="//flow/block[9]/lineArea[2]/text/@ipd"/>
+
+      <eval expected="3" xpath="count(//flow/block[11]/lineArea)"/>
+      <eval expected="122250" xpath="//flow/block[11]/lineArea[1]/text/@ipd"/>
+      <eval expected="166730" xpath="//flow/block[11]/lineArea[2]/text/@ipd"/>
+      <eval expected="52800" xpath="//flow/block[11]/lineArea[3]/text/@ipd"/>
+
+      <eval expected="3" xpath="count(//flow/block[13]/lineArea)"/>
+      <eval expected="162290" xpath="//flow/block[13]/lineArea[1]/text/@ipd"/>
+      <eval expected="158970" xpath="//flow/block[13]/lineArea[2]/text/@ipd"/>
+      <eval expected="140640" xpath="//flow/block[13]/lineArea[3]/text/@ipd"/>
+
+      <eval expected="2" xpath="count(//flow/block[15]/lineArea)"/>
+      <eval expected="136130" xpath="//flow/block[15]/lineArea[1]/text/@ipd"/>
+      <eval expected="111710" xpath="//flow/block[15]/lineArea[2]/text/@ipd"/>
+
+      <eval expected="2" xpath="count(//flow/block[16]/lineArea)"/>
+      <eval expected="110580" xpath="//flow/block[16]/lineArea[1]/text/@ipd"/>
+      <eval expected="102270" xpath="//flow/block[16]/lineArea[2]/text/@ipd"/>
+
+      <eval expected="3" xpath="count(//flow/block[18]/lineArea)"/>
+      <eval expected="125610" xpath="//flow/block[18]/lineArea[1]/text/@ipd"/>
+      <eval expected="138380" xpath="//flow/block[18]/lineArea[2]/text/@ipd"/>
+      <eval expected="133960" xpath="//flow/block[18]/lineArea[3]/text/@ipd"/>
+
+      <eval expected="3" xpath="count(//flow/block[20]/lineArea)"/>
+      <eval expected="72250" xpath="//flow/block[20]/lineArea[1]/text/@ipd"/>
+      <eval expected="162810" xpath="//flow/block[20]/lineArea[2]/text/@ipd"/>
+      <eval expected="101700" xpath="//flow/block[20]/lineArea[3]/text/@ipd"/>
+
+      <eval expected="3" xpath="count(//flow/block[22]/lineArea)"/>
+      <eval expected="138940" xpath="//flow/block[22]/lineArea[1]/text/@ipd"/>
+      <eval expected="159010" xpath="//flow/block[22]/lineArea[2]/text/@ipd"/>
+      <eval expected="30570" xpath="//flow/block[22]/lineArea[3]/text/@ipd"/>
+
+      <eval expected="3" xpath="count(//flow/block[24]/lineArea)"/>
+      <eval expected="163390" xpath="//flow/block[24]/lineArea[1]/text/@ipd"/>
+      <eval expected="144490" xpath="//flow/block[24]/lineArea[2]/text/@ipd"/>
+      <eval expected="27790" xpath="//flow/block[24]/lineArea[3]/text/@ipd"/>
+
+      <eval expected="2" xpath="count(//flow/block[26]/lineArea)"/>
+      <eval expected="156750" xpath="//flow/block[26]/lineArea[1]/text/@ipd"/>
+      <eval expected="70590" xpath="//flow/block[26]/lineArea[2]/text/@ipd"/>
+
+      <eval expected="3" xpath="count(//flow/block[27]/lineArea)"/>
+      <eval expected="114460" xpath="//flow/block[27]/lineArea[1]/text/@ipd"/>
+      <eval expected="93380" xpath="//flow/block[27]/lineArea[2]/text/@ipd"/>
+      <eval expected="132860" xpath="//flow/block[27]/lineArea[3]/text/@ipd"/>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml
------------------------------------------------------------------------------
    svn:executable = *

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_4.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_4.xml?view=diff&rev=489585&r1=489584&r2=489585
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_4.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_white-space_4.xml Fri
Dec 22 01:16:18 2006
@@ -65,32 +65,6 @@
     </fo:root>
   </fo>
   <checks>
-    <element-list category="line" id="l-sp">
-      <box w="6672"/>
-
-      <!-- first space -->
-      <glue w="0" y="10008" z="0"/>
-      <penalty w="0" p="0"/>
-      <glue w="3336" y="-10008" z="0"/>
-      
-      <box w="19344"/>
-      
-      <!-- second space -->
-      <glue w="0" y="10008" z="0"/>
-      <penalty w="0" p="0"/>
-      <glue w="3336" y="-10008" z="0"/>
-      
-      <box w="19344"/>
-      
-      <!-- third space -->
-      <glue w="0" y="10008" z="0"/>
-      <penalty w="0" p="0"/>
-      <glue w="3336" y="-10008" z="0"/>
-      
-      <box w="6672"/>
-
-      <skip>12</skip>
-    </element-list>
     <eval expected="62040" xpath="//block[@prod-id='l-sp']/lineArea/text/@ipd"/>
     <eval expected="word" xpath="local-name(//block[@prod-id='l-sp']/lineArea/text/*[1])"/>
     <eval expected="space" xpath="local-name(//block[@prod-id='l-sp']/lineArea/text/*[2])"/>
@@ -102,32 +76,6 @@
     <true xpath="not(//block[@prod-id='l-sp']/lineArea/text/*[2]/@adj = 'false')"/>
     <true xpath="not(//block[@prod-id='l-sp']/lineArea/text/*[6]/@adj = 'false')"/>
 
-    <element-list category="line" id="l-thin-space">
-      <box w="6672"/>
-
-      <!-- first space -->
-      <glue w="0" y="10008" z="0"/>
-      <penalty w="0" p="0"/>
-      <glue w="2400" y="-10008" z="0"/>
-      
-      <box w="19344"/>
-      
-      <!-- second space -->
-      <glue w="0" y="10008" z="0"/>
-      <penalty w="0" p="0"/>
-      <glue w="3336" y="-10008" z="0"/>
-      
-      <box w="19344"/>
-      
-      <!-- third space -->
-      <glue w="0" y="10008" z="0"/>
-      <penalty w="0" p="0"/>
-      <glue w="2400" y="-10008" z="0"/>
-      
-      <box w="6672"/>
-
-      <skip>16</skip>
-    </element-list>
     <eval expected="60168" xpath="//block[@prod-id='l-thin-space']/lineArea/text/@ipd"/>
     <eval expected="word" xpath="local-name(//block[@prod-id='l-thin-space']/lineArea/text/*[1])"/>
     <eval expected="space" xpath="local-name(//block[@prod-id='l-thin-space']/lineArea/text/*[2])"/>
@@ -139,116 +87,16 @@
     <true xpath="//block[@prod-id='l-thin-space']/lineArea/text/*[2]/@adj = 'false'"/>
     <true xpath="//block[@prod-id='l-thin-space']/lineArea/text/*[6]/@adj = 'false'"/>
 
-    <element-list category="line" id="l-hair-space">
-      <box w="6672"/>
-
-      <!-- first space -->
-      <glue w="0" y="10008" z="0"/>
-      <penalty w="0" p="0"/>
-      <glue w="1200" y="-10008" z="0"/>
-      
-      <box w="19344"/>
-      
-      <!-- second space -->
-      <glue w="0" y="10008" z="0"/>
-      <penalty w="0" p="0"/>
-      <glue w="3336" y="-10008" z="0"/>
-      
-      <box w="19344"/>
-      
-      <!-- third space -->
-      <glue w="0" y="10008" z="0"/>
-      <penalty w="0" p="0"/>
-      <glue w="1200" y="-10008" z="0"/>
-      
-      <box w="6672"/>
-
-      <skip>16</skip>
-    </element-list>
     <eval expected="57768" xpath="//block[@prod-id='l-hair-space']/lineArea/text/@ipd"/>
     <true xpath="//block[@prod-id='l-hair-space']/lineArea/text/*[2]/@adj = 'false'"/>
     <true xpath="//block[@prod-id='l-hair-space']/lineArea/text/*[6]/@adj = 'false'"/>
 
-    <element-list category="line" id="l-zwsp">
-      <box w="6672"/>
-
-      <!-- first space -->
-      <glue w="0" y="10008" z="0"/>
-      <penalty w="0" p="0"/>
-      <glue w="0" y="-10008" z="0"/>
-      
-      <box w="19344"/>
-      
-      <!-- second space -->
-      <glue w="0" y="10008" z="0"/>
-      <penalty w="0" p="0"/>
-      <glue w="3336" y="-10008" z="0"/>
-      
-      <box w="19344"/>
-      
-      <!-- third space -->
-      <glue w="0" y="10008" z="0"/>
-      <penalty w="0" p="0"/>
-      <glue w="0" y="-10008" z="0"/>
-      
-      <box w="6672"/>
-
-      <skip>20</skip>
-    </element-list>
     <eval expected="55368" xpath="//block[@prod-id='l-zwsp']/lineArea/text/@ipd"/>
     <true xpath="//block[@prod-id='l-zwsp']/lineArea/text/*[2]/@adj = 'false'"/>
     <true xpath="//block[@prod-id='l-zwsp']/lineArea/text/*[6]/@adj = 'false'"/>
 
-    <element-list category="line" id="l-nosp">
-      <box w="26016"/>
-      
-      <glue w="0" y="10008" z="0"/>
-      <penalty w="0" p="0"/>
-      <glue w="3336" y="-10008" z="0"/>
-      
-      <box w="26016"/>
-
-      <skip>12</skip>
-    </element-list>
     <eval expected="55368" xpath="//block[@prod-id='l-nosp']/lineArea/text/@ipd"/>
 
-    <element-list category="line" id="c-thin-space">
-      <glue w="0" y="10008" z="0"/>
-
-      <box w="6672"/>
-
-      <!-- first space -->
-      <glue w="0" y="10008" z="0"/>
-      <penalty w="0" p="0"/>
-      <glue w="2400" y="-20016" z="0"/>
-      <box w="0"/>
-      <penalty w="0" p="INF"/>
-      <glue w="0" y="10008" z="0"/>
-      
-      <box w="19344"/>
-      
-      <!-- second space -->
-      <glue w="0" y="10008" z="0"/>
-      <penalty w="0" p="0"/>
-      <glue w="3336" y="-20016" z="0"/>
-      <box w="0"/>
-      <penalty w="0" p="INF"/>
-      <glue w="0" y="10008" z="0"/>
-      
-      <box w="19344"/>
-      
-      <!-- third space -->
-      <glue w="0" y="10008" z="0"/>
-      <penalty w="0" p="0"/>
-      <glue w="2400" y="-20016" z="0"/>
-      <box w="0"/>
-      <penalty w="0" p="INF"/>
-      <glue w="0" y="10008" z="0"/>
-      
-      <box w="6672"/>
-
-      <skip>24</skip>
-    </element-list>
     <eval expected="60168" xpath="//block[@prod-id='c-thin-space']/lineArea/text/@ipd"/>
     <eval expected="word" xpath="local-name(//block[@prod-id='c-thin-space']/lineArea/text/*[1])"/>
     <eval expected="space" xpath="local-name(//block[@prod-id='c-thin-space']/lineArea/text/*[2])"/>
@@ -260,149 +108,29 @@
     <true xpath="//block[@prod-id='c-thin-space']/lineArea/text/*[2]/@adj = 'false'"/>
     <true xpath="//block[@prod-id='c-thin-space']/lineArea/text/*[6]/@adj = 'false'"/>
 
-    <element-list category="line" id="j-sp">
-      <box w="6672"/>
-
-      <!-- first space -->
-      <glue w="3336" y="1668" z="1112"/>
-      
-      <box w="19344"/>
-      
-      <!-- second space -->
-      <glue w="3336" y="1668" z="1112"/>
-      
-      <box w="19344"/>
-      
-      <!-- third space -->
-      <glue w="3336" y="1668" z="1112"/>
-      
-      <box w="6672"/>
-
-      <skip>6</skip>
-    </element-list>
     <eval expected="190804" xpath="//block[@prod-id='j-sp']/lineArea/text/@ipd"/>
     <eval expected="42921" xpath="//block[@prod-id='j-sp']/lineArea/text/@twsadjust"/>
 
-    <element-list category="line" id="j-thin-space">
-      <box w="6672"/>
-
-      <!-- first space -->
-      <glue w="2400" y="0" z="0"/>
-      
-      <box w="19344"/>
-      
-      <!-- second space -->
-      <glue w="3336" y="1668" z="1112"/>
-      
-      <box w="19344"/>
-      
-      <!-- third space -->
-      <glue w="2400" y="0" z="0"/>
-      
-      <box w="6672"/>
-
-      <skip>8</skip>
-    </element-list>
     <eval expected="104277" xpath="//block[@prod-id='j-thin-space']/lineArea/text/@ipd"/>
     <eval expected="44109" xpath="//block[@prod-id='j-thin-space']/lineArea/text/@twsadjust"/>
     <true xpath="//block[@prod-id='j-thin-space']/lineArea/text/*[2]/@adj = 'false'"/>
     <true xpath="//block[@prod-id='j-thin-space']/lineArea/text/*[6]/@adj = 'false'"/>
 
-    <element-list category="line" id="j-zwsp">
-      <box w="6672"/>
-
-      <!-- first space -->
-      <glue w="0" y="0" z="0"/>
-      
-      <box w="19344"/>
-      
-      <!-- second space -->
-      <glue w="3336" y="1668" z="1112"/>
-      
-      <box w="19344"/>
-      
-      <!-- third space -->
-      <glue w="0" y="0" z="0"/>
-      
-      <box w="6672"/>
-
-      <skip>10</skip>
-    </element-list>
     <eval expected="84280" xpath="//block[@prod-id='j-zwsp']/lineArea/text/@ipd"/>
     <eval expected="28912" xpath="//block[@prod-id='j-zwsp']/lineArea/text/@twsadjust"/>
     <true xpath="//block[@prod-id='j-zwsp']/lineArea/text/*[2]/@adj = 'false'"/>
     <true xpath="//block[@prod-id='j-zwsp']/lineArea/text/*[6]/@adj = 'false'"/>
 
-    <element-list category="line" id="lsj-sp">
-      <box w="6672"/>
-
-      <!-- first space -->
-      <glue w="7336" y="1668" z="1112"/>
-      
-      <box w="25344"/>
-      
-      <!-- second space -->
-      <glue w="7336" y="1668" z="1112"/>
-      
-      <box w="25344"/>
-      
-      <!-- third space -->
-      <glue w="7336" y="1668" z="1112"/>
-      
-      <box w="6672"/>
-
-      <skip>6</skip>
-    </element-list>
     <eval expected="182404" xpath="//block[@prod-id='lsj-sp']/lineArea/text/@ipd"/>
     <eval expected="32121" xpath="//block[@prod-id='lsj-sp']/lineArea/text/@twsadjust"/>
     <eval expected="2000" xpath="//block[@prod-id='lsj-sp']/lineArea/text/@tlsadjust"/>
 
-    <element-list category="line" id="lsj-thin-space">
-      <box w="6672"/>
-
-      <!-- first space -->
-      <glue w="2400" y="0" z="0"/>
-      
-      <box w="25344"/>
-      
-      <!-- second space -->
-      <glue w="7336" y="1668" z="1112"/>
-      
-      <box w="25344"/>
-      
-      <!-- third space -->
-      <glue w="2400" y="0" z="0"/>
-      
-      <box w="6672"/>
-
-      <skip>8</skip>
-    </element-list>
     <eval expected="104777" xpath="//block[@prod-id='lsj-thin-space']/lineArea/text/@ipd"/>
     <eval expected="28609" xpath="//block[@prod-id='lsj-thin-space']/lineArea/text/@twsadjust"/>
     <eval expected="2000" xpath="//block[@prod-id='lsj-thin-space']/lineArea/text/@tlsadjust"/>
     <true xpath="//block[@prod-id='lsj-thin-space']/lineArea/text/*[2]/@adj = 'false'"/>
     <true xpath="//block[@prod-id='lsj-thin-space']/lineArea/text/*[6]/@adj = 'false'"/>
 
-    <element-list category="line" id="lsj-zwsp">
-      <box w="6672"/>
-
-      <!-- first space -->
-      <glue w="0" y="0" z="0"/>
-      
-      <box w="25344"/>
-      
-      <!-- second space -->
-      <glue w="7336" y="1668" z="1112"/>
-      
-      <box w="25344"/>
-      
-      <!-- third space -->
-      <glue w="0" y="0" z="0"/>
-      
-      <box w="6672"/>
-
-      <skip>10</skip>
-    </element-list>
     <eval expected="85480" xpath="//block[@prod-id='lsj-zwsp']/lineArea/text/@ipd"/>
     <eval expected="14112" xpath="//block[@prod-id='lsj-zwsp']/lineArea/text/@twsadjust"/>
     <eval expected="2000" xpath="//block[@prod-id='lsj-zwsp']/lineArea/text/@tlsadjust"/>

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_border_padding_conditionality_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_border_padding_conditionality_2.xml?view=diff&rev=489585&r1=489584&r2=489585
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_border_padding_conditionality_2.xml
(original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_border_padding_conditionality_2.xml
Fri Dec 22 01:16:18 2006
@@ -249,8 +249,8 @@
     <eval expected="3000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-end"/>
     <eval expected="5000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-start"/>
 
-    <eval expected="183960" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/>
-    <eval expected="193960" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="149500" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="159500" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipda"/>
     <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
     <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-after"/>
     <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-before"/>
@@ -260,8 +260,8 @@
     <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-before"/>
     <eval expected="3000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-end"/>
     <eval expected="5000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-start"/>
-    <eval expected="255680" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/>
-    <eval expected="265680" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="237340" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="247340" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipda"/>
     <eval expected="0" xpath="//flow/block[5]/lineArea[2]/inlineparent/@offset"/>
     <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-after"/>
     <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-before"/>
@@ -271,8 +271,8 @@
     <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-before"/>
     <eval expected="3000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-end"/>
     <eval expected="5000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-start"/>
-    <eval expected="186750" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/>
-    <eval expected="196750" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="239550" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="249550" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipda"/>
     <eval expected="0" xpath="//flow/block[5]/lineArea[3]/inlineparent/@offset"/>
     <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-after"/>
     <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-before"/>
@@ -283,8 +283,8 @@
     <eval expected="3000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-end"/>
     <eval expected="5000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-start"/>
 
-    <eval expected="172840" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipd"/>
-    <eval expected="178840" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipda"/>
+    <eval expected="149500" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipd"/>
+    <eval expected="155500" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipda"/>
     <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
     <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-after"/>
     <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-before"/>
@@ -292,15 +292,15 @@
     <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-after"/>
     <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-before"/>
     <eval expected="5000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-start"/>
-    <eval expected="266800" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipd"/>
-    <eval expected="266800" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipda"/>
+    <eval expected="237340" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipd"/>
+    <eval expected="237340" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipda"/>
     <eval expected="0" xpath="//flow/block[6]/lineArea[2]/inlineparent/@offset"/>
     <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-after"/>
     <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-before"/>
     <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-after"/>
     <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-before"/>
-    <eval expected="186750" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipd"/>
-    <eval expected="190750" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipda"/>
+    <eval expected="239550" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipd"/>
+    <eval expected="243550" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipda"/>
     <eval expected="0" xpath="//flow/block[6]/lineArea[3]/inlineparent/@offset"/>
     <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-after"/>
     <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-before"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message