diff options
| author | Jeremias Maerki <jeremias@apache.org> | 2005-12-02 14:27:35 +0000 |
|---|---|---|
| committer | Jeremias Maerki <jeremias@apache.org> | 2005-12-02 14:27:35 +0000 |
| commit | f9932f4c138aa324e6e544dc7ddcaa9773dbb2fa (patch) | |
| tree | d78ee074757e7bf60c4cbc76b10bfd69e430bd1b /test | |
| parent | 56cfb0b22dac19a9112c74c6c9a31d5b3ca44437 (diff) | |
| download | xmlgraphics-fop-f9932f4c138aa324e6e544dc7ddcaa9773dbb2fa.tar.gz xmlgraphics-fop-f9932f4c138aa324e6e544dc7ddcaa9773dbb2fa.zip | |
font-family list still not fully supported but a comma-separated list is now properly tokenized. FOP will now go through all fonts in the list to find one that is available, but it doesn't do so per character, yet.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@351734 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test')
| -rw-r--r-- | test/fotree/testcases/demo-test-success.fo | 2 | ||||
| -rw-r--r-- | test/fotree/testcases/no_namespace_prefix.fo | 2 | ||||
| -rw-r--r-- | test/layoutengine/standard-testcases/block_font-family.xml | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/test/fotree/testcases/demo-test-success.fo b/test/fotree/testcases/demo-test-success.fo index 7912c9114..b80ad7807 100644 --- a/test/fotree/testcases/demo-test-success.fo +++ b/test/fotree/testcases/demo-test-success.fo @@ -8,7 +8,7 @@ <fo:page-sequence master-reference="simpleA4">
<fo:flow flow-name="xsl-region-body">
<fo:block>Hello World!
- <test:assert property="font-family" expected="sans-serif"/>
+ <test:assert property="font-family" expected="[sans-serif]"/>
<test:assert property="font-size" expected="12000mpt"/>
</fo:block>
<fo:block font-family="ZapfDingbats">઎</fo:block>
diff --git a/test/fotree/testcases/no_namespace_prefix.fo b/test/fotree/testcases/no_namespace_prefix.fo index 53b53ec98..ed054e3cb 100644 --- a/test/fotree/testcases/no_namespace_prefix.fo +++ b/test/fotree/testcases/no_namespace_prefix.fo @@ -25,7 +25,7 @@ <page-sequence master-reference="A4"> <flow flow-name="xsl-region-body"> <block>Hello World! - <test:assert property="font-family" expected="sans-serif"/> + <test:assert property="font-family" expected="[sans-serif]"/> <test:assert property="font-size" expected="12000mpt"/> </block> </flow> diff --git a/test/layoutengine/standard-testcases/block_font-family.xml b/test/layoutengine/standard-testcases/block_font-family.xml index 2f7bb6a0e..9144048b4 100644 --- a/test/layoutengine/standard-testcases/block_font-family.xml +++ b/test/layoutengine/standard-testcases/block_font-family.xml @@ -36,6 +36,9 @@ <fo:block font-family="cursive">font-family="cursive"</fo:block> <fo:block font-family="fantasy">font-family="fantasy"</fo:block> <fo:block font-family="monospace">font-family="monospace"</fo:block> + <fo:block font-family="Helvetica,sans-serif,Symbol">font-family="Helvetica,sans-serif,Symbol"</fo:block> + <fo:block font-family="Helvetica, sans-serif, Symbol">font-family="Helvetica, sans-serif, Symbol"</fo:block> + <fo:block font-family="fantasy1,fantasy2,monospace,Symbol">font-family="fantasy1,fantasy2,monospace,Symbol"</fo:block> </fo:flow> </fo:page-sequence> </fo:root> @@ -47,5 +50,8 @@ <eval expected="Times-Roman" xpath="//flow/block[4]/lineArea/text/@font-name"/> <eval expected="Times-Roman" xpath="//flow/block[5]/lineArea/text/@font-name"/> <eval expected="Courier" xpath="//flow/block[6]/lineArea/text/@font-name"/> + <eval expected="Helvetica" xpath="//flow/block[7]/lineArea/text/@font-name"/> + <eval expected="Helvetica" xpath="//flow/block[8]/lineArea/text/@font-name"/> + <eval expected="Courier" xpath="//flow/block[9]/lineArea/text/@font-name"/> </checks> </testcase> |