aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAndreas L. Delmelle <adelmelle@apache.org>2007-07-06 23:30:14 +0000
committerAndreas L. Delmelle <adelmelle@apache.org>2007-07-06 23:30:14 +0000
commit4e974a863decbcfbfa2007676e27062136b5a5b9 (patch)
treeb0dc41740267a1b62d81e5c54904b35f335a327f /test
parent2a0465e86c763968013341d03fb6549ae7ca32d4 (diff)
downloadxmlgraphics-fop-4e974a863decbcfbfa2007676e27062136b5a5b9.tar.gz
xmlgraphics-fop-4e974a863decbcfbfa2007676e27062136b5a5b9.zip
Improvement in handling relative font-weights
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@554088 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test')
-rw-r--r--test/fotree/testcases/font-weight_relative2.fo90
-rw-r--r--test/layoutengine/standard-testcases/block_font-weight.xml30
2 files changed, 105 insertions, 15 deletions
diff --git a/test/fotree/testcases/font-weight_relative2.fo b/test/fotree/testcases/font-weight_relative2.fo
new file mode 100644
index 000000000..530c9afe7
--- /dev/null
+++ b/test/fotree/testcases/font-weight_relative2.fo
@@ -0,0 +1,90 @@
+<?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$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="210mm" page-height="297mm">
+ <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">
+ <fo:block font-weight="900">font-weight="900"
+ <test:assert property="font-weight" expected="900" />
+ <fo:block font-weight="lighter">font-weight="lighter"
+ <test:assert property="font-weight" expected="800" />
+ <fo:block font-weight="lighter">font-weight="lighter"
+ <test:assert property="font-weight" expected="700" />
+ <fo:block font-weight="lighter">font-weight="lighter"
+ <test:assert property="font-weight" expected="600" />
+ <fo:block font-weight="lighter">font-weight="lighter"
+ <test:assert property="font-weight" expected="500" />
+ <fo:block font-weight="lighter">font-weight="lighter"
+ <test:assert property="font-weight" expected="400" />
+ <fo:block font-weight="lighter">font-weight="lighter"
+ <test:assert property="font-weight" expected="300" />
+ <fo:block font-weight="lighter">font-weight="lighter"
+ <test:assert property="font-weight" expected="200" />
+ <fo:block font-weight="lighter">font-weight="lighter"
+ <test:assert property="font-weight" expected="100" />
+ <fo:block font-weight="lighter">font-weight="lighter"
+ <test:assert property="font-weight" expected="100" />
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ <fo:block font-weight="100">font-weight="100"
+ <test:assert property="font-weight" expected="100" />
+ <fo:block font-weight="bolder">font-weight="bolder"
+ <test:assert property="font-weight" expected="200" />
+ <fo:block font-weight="bolder">font-weight="bolder"
+ <test:assert property="font-weight" expected="300" />
+ <fo:block font-weight="bolder">font-weight="bolder"
+ <test:assert property="font-weight" expected="400" />
+ <fo:block font-weight="bolder">font-weight="bolder"
+ <test:assert property="font-weight" expected="500" />
+ <fo:block font-weight="bolder">font-weight="bolder"
+ <test:assert property="font-weight" expected="600" />
+ <fo:block font-weight="bolder">font-weight="bolder"
+ <test:assert property="font-weight" expected="700" />
+ <fo:block font-weight="bolder">font-weight="bolder"
+ <test:assert property="font-weight" expected="800" />
+ <fo:block font-weight="bolder">font-weight="bolder"
+ <test:assert property="font-weight" expected="900" />
+ <fo:block font-weight="bolder">font-weight="bolder"
+ <test:assert property="font-weight" expected="900" />
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
+
diff --git a/test/layoutengine/standard-testcases/block_font-weight.xml b/test/layoutengine/standard-testcases/block_font-weight.xml
index b9907ebc2..743aa69e7 100644
--- a/test/layoutengine/standard-testcases/block_font-weight.xml
+++ b/test/layoutengine/standard-testcases/block_font-weight.xml
@@ -86,7 +86,7 @@
</fo:page-sequence>
</fo:root>
</fo>
- <checks><!-- feature not properly implemented, checks are against current implementation -->
+ <checks>
<eval expected="400" xpath="//flow/block[1]/lineArea/text/@font-weight"/>
<eval expected="400" xpath="//flow/block[2]/lineArea/text/@font-weight"/>
<eval expected="700" xpath="//flow/block[3]/lineArea/text/@font-weight"/>
@@ -99,24 +99,24 @@
<eval expected="700" xpath="//flow/block[10]/lineArea/text/@font-weight"/>
<eval expected="700" xpath="//flow/block[11]/lineArea/text/@font-weight"/>
<eval expected="700" xpath="//flow/block[12]/lineArea/text/@font-weight"/>
- <eval expected="400" xpath="//flow/block[13]/block/lineArea/text/@font-weight"/>
- <eval expected="400" xpath="//flow/block[13]/block/block/lineArea/text/@font-weight"/>
- <eval expected="400" xpath="//flow/block[13]/block/block/block/lineArea/text/@font-weight"/>
- <eval expected="400" xpath="//flow/block[13]/block/block/block/block/lineArea/text/@font-weight"/>
- <eval expected="400" xpath="//flow/block[13]/block/block/block/block/block/lineArea/text/@font-weight"/>
- <eval expected="400" xpath="//flow/block[13]/block/block/block/block/block/block/lineArea/text/@font-weight"/>
- <eval expected="400" xpath="//flow/block[13]/block/block/block/block/block/block/block/lineArea/text/@font-weight"/>
- <eval expected="400" xpath="//flow/block[13]/block/block/block/block/block/block/block/block/lineArea/text/@font-weight"/>
- <eval expected="400" xpath="//flow/block[13]/block/block/block/block/block/block/block/block/block/lineArea/text/@font-weight"/>
+ <eval expected="700" xpath="//flow/block[12]/block/lineArea/text/@font-weight"/>
+ <eval expected="700" xpath="//flow/block[12]/block/block/lineArea/text/@font-weight"/>
+ <eval expected="700" xpath="//flow/block[12]/block/block/block/lineArea/text/@font-weight"/>
+ <eval expected="400" xpath="//flow/block[12]/block/block/block/block/lineArea/text/@font-weight"/>
+ <eval expected="400" xpath="//flow/block[12]/block/block/block/block/block/lineArea/text/@font-weight"/>
+ <eval expected="400" xpath="//flow/block[12]/block/block/block/block/block/block/lineArea/text/@font-weight"/>
+ <eval expected="400" xpath="//flow/block[12]/block/block/block/block/block/block/block/lineArea/text/@font-weight"/>
+ <eval expected="400" xpath="//flow/block[12]/block/block/block/block/block/block/block/block/lineArea/text/@font-weight"/>
+ <eval expected="400" xpath="//flow/block[12]/block/block/block/block/block/block/block/block/block/lineArea/text/@font-weight"/>
<eval expected="400" xpath="//flow/block[13]/lineArea/text/@font-weight"/>
<eval expected="400" xpath="//flow/block[13]/block/lineArea/text/@font-weight"/>
<eval expected="400" xpath="//flow/block[13]/block/block/lineArea/text/@font-weight"/>
<eval expected="400" xpath="//flow/block[13]/block/block/block/lineArea/text/@font-weight"/>
<eval expected="400" xpath="//flow/block[13]/block/block/block/block/lineArea/text/@font-weight"/>
- <eval expected="400" xpath="//flow/block[13]/block/block/block/block/block/lineArea/text/@font-weight"/>
- <eval expected="400" xpath="//flow/block[13]/block/block/block/block/block/block/lineArea/text/@font-weight"/>
- <eval expected="400" xpath="//flow/block[13]/block/block/block/block/block/block/block/lineArea/text/@font-weight"/>
- <eval expected="400" xpath="//flow/block[13]/block/block/block/block/block/block/block/block/lineArea/text/@font-weight"/>
- <eval expected="400" xpath="//flow/block[13]/block/block/block/block/block/block/block/block/block/lineArea/text/@font-weight"/>
+ <eval expected="700" xpath="//flow/block[13]/block/block/block/block/block/lineArea/text/@font-weight"/>
+ <eval expected="700" xpath="//flow/block[13]/block/block/block/block/block/block/lineArea/text/@font-weight"/>
+ <eval expected="700" xpath="//flow/block[13]/block/block/block/block/block/block/block/lineArea/text/@font-weight"/>
+ <eval expected="700" xpath="//flow/block[13]/block/block/block/block/block/block/block/block/lineArea/text/@font-weight"/>
+ <eval expected="700" xpath="//flow/block[13]/block/block/block/block/block/block/block/block/block/lineArea/text/@font-weight"/>
</checks>
</testcase>