From e6d53d8a9c84b6447f3db4b2b36576d418df1a4a Mon Sep 17 00:00:00 2001 From: Jeremias Maerki Date: Thu, 16 Mar 2006 13:51:14 +0000 Subject: Added support for fixed-width spaces and kerning. Note: letter-spacing is still implemented as before. Fixing this cannot be done without looking at space resolution as a whole on inline level. The Character area tree object is now deprecated. Normal Text objects should be used to keep renderers simpler. Introduced FontResolver interface to remove the dependency of FOUserAgent into the font package. Added kerning information to the base14 fonts, Helvetica and Times. By default it is not used to keep the status-quo. Enable base14 kerning through the FOUserAgent (FopFactory after the API finalization). Restored the production of EPS images in PDF output as PostScript XObjects. Restored functionality for a more compact format for the area tree renderer to save space. LayoutEngineTester slightly changed to allow for configuration values from the XML file. For now, only enabling base14 kerning is supported. Removed duplicate offset variable in SpaceArea. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@386327 13f79535-47bb-0310-9956-ffa450edef68 --- .../standard-testcases/block_basic_2.xml | 7 +- .../block_white-space-collapse_1.xml | 5 +- .../standard-testcases/block_white-space_4.xml | 412 +++++++++++++++++++++ .../character_background-color.xml | 4 +- .../character_background-image.xml | 6 +- .../character_border_padding.xml | 90 ++--- .../character_vertical-align.xml | 12 +- .../standard-testcases/inline-level_id.xml | 4 +- .../standard-testcases/kerning_1_off.xml | 57 +++ .../standard-testcases/kerning_1_on.xml | 56 +++ .../standard-testcases/text-decoration_1.xml | 8 +- 11 files changed, 594 insertions(+), 67 deletions(-) create mode 100644 test/layoutengine/standard-testcases/block_white-space_4.xml create mode 100644 test/layoutengine/standard-testcases/kerning_1_off.xml create mode 100644 test/layoutengine/standard-testcases/kerning_1_on.xml (limited to 'test/layoutengine') diff --git a/test/layoutengine/standard-testcases/block_basic_2.xml b/test/layoutengine/standard-testcases/block_basic_2.xml index 84e485e24..d43cb0591 100644 --- a/test/layoutengine/standard-testcases/block_basic_2.xml +++ b/test/layoutengine/standard-testcases/block_basic_2.xml @@ -1,6 +1,6 @@ + + + +

+ This test checks element generation for various spaces. +

+ + + + + + + + + + + + + « text text » (normal space) + « text text » (thin space,  ) + « text text » (hair space,  ) + «​text text​» (zero width space, ​) + «text text» (no spaces) + + + « text text » (normal space) + « text text » (thin space,  ) + « text text » (hair space,  ) + «​text text​» (zero width space, ​) + «text text» (no spaces) + + + « text text » (normal space) + « text text » (thin space,  ) + « text text » (hair space,  ) + «​text text​» (zero width space, ​) + «text text» (no spaces) + + + « text text » (normal space) + « text text » (thin space,  ) + « text text » (hair space,  ) + «​text text​» (zero width space, ​) + «text text» (no spaces) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 11 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 15 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 15 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 19 + + + + + + + + + + + + + + + 11 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 23 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + + + + + + + + + + + + + + + + + + + + + + + 7 + + + + + + + + + + + + + + + + + + + + + + + + + 9 + + + + + + + + + + + + + + + + + + + + + + + + + 5 + + + + + + + + + + + + + + + + + + + + + + + + 7 + + + + + + + + + + + + + + + + + + + + + + + + + + 9 + + + + + + + + + diff --git a/test/layoutengine/standard-testcases/character_background-color.xml b/test/layoutengine/standard-testcases/character_background-color.xml index a95d2cf50..7a2dfd29c 100644 --- a/test/layoutengine/standard-testcases/character_background-color.xml +++ b/test/layoutengine/standard-testcases/character_background-color.xml @@ -1,6 +1,6 @@ diff --git a/test/layoutengine/standard-testcases/kerning_1_off.xml b/test/layoutengine/standard-testcases/kerning_1_off.xml new file mode 100644 index 000000000..3002d48d0 --- /dev/null +++ b/test/layoutengine/standard-testcases/kerning_1_off.xml @@ -0,0 +1,57 @@ + + + + + +

+ This test checks kerning. This test has kerning switched off and is only used as a reference. +

+ + + false + + + + + + + + + + + + VAVAV text-text Hello World. + + + VAVAV text-text Hello World. + + + + + + + + + + + + + + + + + diff --git a/test/layoutengine/standard-testcases/kerning_1_on.xml b/test/layoutengine/standard-testcases/kerning_1_on.xml new file mode 100644 index 000000000..308a196df --- /dev/null +++ b/test/layoutengine/standard-testcases/kerning_1_on.xml @@ -0,0 +1,56 @@ + + + + + +

+ This test checks kerning. +

+ + + true + + + + + + + + + + + + VAVAV text-text Hello World. + + + VAVAV text-text Hello World. + + + + + + + + + + + + + + + + diff --git a/test/layoutengine/standard-testcases/text-decoration_1.xml b/test/layoutengine/standard-testcases/text-decoration_1.xml index 74c6240bf..bfa9b8c6c 100644 --- a/test/layoutengine/standard-testcases/text-decoration_1.xml +++ b/test/layoutengine/standard-testcases/text-decoration_1.xml @@ -1,6 +1,6 @@