From c6e425d2f6ab4dca220b6bd4621ccfb34fc3998c Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Sat, 10 Mar 2018 21:09:59 +0100 Subject: Finish implementing reading/writing 'font-variation-settings' CSS property. Fix some bugs in previously implemented code. Add tests. --- testfiles/src/style-test.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'testfiles') diff --git a/testfiles/src/style-test.cpp b/testfiles/src/style-test.cpp index 8c0f4dd5f..f92bc2aa7 100644 --- a/testfiles/src/style-test.cpp +++ b/testfiles/src/style-test.cpp @@ -157,6 +157,10 @@ std::vector getStyleData() StyleRead("font-variant-numeric:tabular-nums slashed-zero"), StyleRead("font-variant-numeric:tabular-nums proportional-nums", "font-variant-numeric:proportional-nums"), + StyleRead("font-variation-settings:'wght' 400"), + StyleRead("font-variation-settings:'wght' 400", "font-variation-settings:'wght' 400"), + StyleRead("font-variation-settings:'wght' 400 'slnt' 0.5", "font-variation-settings:'slnt' 0.5 'wght' 400" ), + // Should be moved down StyleRead("text-indent:12em"), // SPILength? StyleRead("text-align:center"), // SPIEnum @@ -503,6 +507,11 @@ std::vector getStyleCascadeData() // SPIString and SPIFontString + StyleCascade("font-variation-settings:'wght' 400", "", "font-variation-settings:'wght' 400"), + StyleCascade("font-variation-settings:'wght' 100", + "font-variation-settings:'wght' 400", + "font-variation-settings:'wght' 400"), + // SPIPaint // SPIPaintOrder @@ -550,8 +559,8 @@ TEST(StyleTest, Cascade) { // << " Child: " << i.child // << " Result: " << i.result << std::endl; // std::cout << " Write: "; - // std::cout << " Parent: " << style_parent.write( SP_STYLE_FLAG_IFSET ) - // << " Child: " << style_child.write( SP_STYLE_FLAG_IFSET ) + // std::cout << " Parent: " << style_parent.write( SP_STYLE_FLAG_IFSET ) + // << " Child: " << style_child.write( SP_STYLE_FLAG_IFSET ) // << " Result: " << style_result.write( SP_STYLE_FLAG_IFSET ) << std::endl; style_child.cascade( &style_parent ); -- cgit v1.2.3