tdf#123304: Allow the full feature syntax as pre 6.2

Fix regression from:

commit dc9ee533dc707cc10b99d537eaccc3ee5aa555fe
Author: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>
Date:   Fri Jun 15 19:32:15 2018 +0200

vcl: parser of font features included in the font name

Where hb_feature_from_string() was replaced by a simple parser that supports
avery limited subset of the syntax it supports (as documented in
https://harfbuzz.github.io/harfbuzz-hb-common.html#hb-feature-from-string)

Change-Id: I613190a677d24183e8c718fcfcaf9cf9b37a1e8f
Reviewed-on: https://gerrit.libreoffice.org/69062
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Tested-by: Khaled Hosny <khaledhosny@eglug.org>

1 files changed, 161 insertions, 21 deletions

diff --git a/vcl/qa/cppunit/FontFeatureTest.cxx b/vcl/qa/cppunit/FontFeatureTest.cxx
index 6a66eb1c70b5..47e610f50018 100644
--- a/vcl/qa/cppunit/FontFeatureTest.cxx
+++ b/vcl/qa/cppunit/FontFeatureTest.cxx
@@ -119,17 +119,17 @@ void FontFeatureTest::testGetFontFeatures()
 
         vcl::font::FeatureParameter const& rParameter1
             = rFracFeatureDefinition.getEnumParameters()[0];
-        CPPUNIT_ASSERT_EQUAL(sal_uInt32(0), rParameter1.getCode());
+        CPPUNIT_ASSERT_EQUAL(uint32_t(0), rParameter1.getCode());
         CPPUNIT_ASSERT(!rParameter1.getDescription().isEmpty());
 
         vcl::font::FeatureParameter const& rParameter2
             = rFracFeatureDefinition.getEnumParameters()[1];
-        CPPUNIT_ASSERT_EQUAL(sal_uInt32(1), rParameter2.getCode());
+        CPPUNIT_ASSERT_EQUAL(uint32_t(1), rParameter2.getCode());
         CPPUNIT_ASSERT(!rParameter2.getDescription().isEmpty());
 
         vcl::font::FeatureParameter const& rParameter3
             = rFracFeatureDefinition.getEnumParameters()[2];
-        CPPUNIT_ASSERT_EQUAL(sal_uInt32(2), rParameter3.getCode());
+        CPPUNIT_ASSERT_EQUAL(uint32_t(2), rParameter3.getCode());
         CPPUNIT_ASSERT(!rParameter2.getDescription().isEmpty());
     }
 #endif // HAVE_MORE_FONTS
@@ -146,44 +146,184 @@ void FontFeatureTest::testParseFeature()
         CPPUNIT_ASSERT_EQUAL(size_t(1), aParser.getFeatures().size());
         auto aFeatures = aParser.getFeatures();
 
-        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].first);
-        CPPUNIT_ASSERT_EQUAL(sal_uInt32(1), aFeatures[0].second);
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(1), aFeatures[0].m_nValue);
     }
     { // One feature specified, explicit value
         vcl::font::FeatureParser aParser("Font name:abcd=5");
         CPPUNIT_ASSERT_EQUAL(size_t(1), aParser.getFeatures().size());
         auto aFeatures = aParser.getFeatures();
 
-        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].first);
-        CPPUNIT_ASSERT_EQUAL(sal_uInt32(5), aFeatures[0].second);
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(5), aFeatures[0].m_nValue);
+    }
+    { // One feature specified, explicit zero value
+        vcl::font::FeatureParser aParser("Font name:abcd=0");
+        CPPUNIT_ASSERT_EQUAL(size_t(1), aParser.getFeatures().size());
+        auto aFeatures = aParser.getFeatures();
+
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(0), aFeatures[0].m_nValue);
+    }
+    { // One feature specified, using plus prefix
+        vcl::font::FeatureParser aParser("Font name:+abcd");
+        CPPUNIT_ASSERT_EQUAL(size_t(1), aParser.getFeatures().size());
+        auto aFeatures = aParser.getFeatures();
+
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(1), aFeatures[0].m_nValue);
+    }
+    { // One feature specified, using minus prefix
+        vcl::font::FeatureParser aParser("Font name:-abcd");
+        CPPUNIT_ASSERT_EQUAL(size_t(1), aParser.getFeatures().size());
+        auto aFeatures = aParser.getFeatures();
+
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(0), aFeatures[0].m_nValue);
+    }
+    { // One feature specified, with empty character range
+        vcl::font::FeatureParser aParser("Font name:abcd[]");
+        CPPUNIT_ASSERT_EQUAL(size_t(1), aParser.getFeatures().size());
+        auto aFeatures = aParser.getFeatures();
+
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(1), aFeatures[0].m_nValue);
+        CPPUNIT_ASSERT_EQUAL(static_cast<unsigned int>(0), aFeatures[0].m_nStart);
+        CPPUNIT_ASSERT_EQUAL(static_cast<unsigned int>(-1), aFeatures[0].m_nEnd);
+    }
+    { // One feature specified, with empty character range
+        vcl::font::FeatureParser aParser("Font name:abcd[:]");
+        CPPUNIT_ASSERT_EQUAL(size_t(1), aParser.getFeatures().size());
+        auto aFeatures = aParser.getFeatures();
+
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(1), aFeatures[0].m_nValue);
+        CPPUNIT_ASSERT_EQUAL(static_cast<unsigned int>(0), aFeatures[0].m_nStart);
+        CPPUNIT_ASSERT_EQUAL(static_cast<unsigned int>(-1), aFeatures[0].m_nEnd);
+    }
+    { // One feature specified, with start character range
+        vcl::font::FeatureParser aParser("Font name:abcd[3:]");
+        CPPUNIT_ASSERT_EQUAL(size_t(1), aParser.getFeatures().size());
+        auto aFeatures = aParser.getFeatures();
+
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(1), aFeatures[0].m_nValue);
+        CPPUNIT_ASSERT_EQUAL(static_cast<unsigned int>(3), aFeatures[0].m_nStart);
+        CPPUNIT_ASSERT_EQUAL(static_cast<unsigned int>(-1), aFeatures[0].m_nEnd);
+    }
+    { // One feature specified, with end character range
+        vcl::font::FeatureParser aParser("Font name:abcd[:3]");
+        CPPUNIT_ASSERT_EQUAL(size_t(1), aParser.getFeatures().size());
+        auto aFeatures = aParser.getFeatures();
+
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(1), aFeatures[0].m_nValue);
+        CPPUNIT_ASSERT_EQUAL(static_cast<unsigned int>(0), aFeatures[0].m_nStart);
+        CPPUNIT_ASSERT_EQUAL(static_cast<unsigned int>(3), aFeatures[0].m_nEnd);
+    }
+    { // One feature specified, with character range
+        vcl::font::FeatureParser aParser("Font name:abcd[3:6]");
+        CPPUNIT_ASSERT_EQUAL(size_t(1), aParser.getFeatures().size());
+        auto aFeatures = aParser.getFeatures();
+
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(1), aFeatures[0].m_nValue);
+        CPPUNIT_ASSERT_EQUAL(static_cast<unsigned int>(3), aFeatures[0].m_nStart);
+        CPPUNIT_ASSERT_EQUAL(static_cast<unsigned int>(6), aFeatures[0].m_nEnd);
+    }
+    { // One feature specified, with character range
+        vcl::font::FeatureParser aParser("Font name:abcd[3]");
+        CPPUNIT_ASSERT_EQUAL(size_t(1), aParser.getFeatures().size());
+        auto aFeatures = aParser.getFeatures();
+
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(1), aFeatures[0].m_nValue);
+        CPPUNIT_ASSERT_EQUAL(static_cast<unsigned int>(3), aFeatures[0].m_nStart);
+        CPPUNIT_ASSERT_EQUAL(static_cast<unsigned int>(4), aFeatures[0].m_nEnd);
+    }
+    { // One feature specified, with character range and value
+        vcl::font::FeatureParser aParser("Font name:abcd[3:6]=2");
+        CPPUNIT_ASSERT_EQUAL(size_t(1), aParser.getFeatures().size());
+        auto aFeatures = aParser.getFeatures();
+
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(2), aFeatures[0].m_nValue);
+        CPPUNIT_ASSERT_EQUAL(static_cast<unsigned int>(3), aFeatures[0].m_nStart);
+        CPPUNIT_ASSERT_EQUAL(static_cast<unsigned int>(6), aFeatures[0].m_nEnd);
+    }
+    { // One feature specified, with character range and 0 value
+        vcl::font::FeatureParser aParser("Font name:abcd[3:6]=0");
+        CPPUNIT_ASSERT_EQUAL(size_t(1), aParser.getFeatures().size());
+        auto aFeatures = aParser.getFeatures();
+
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(0), aFeatures[0].m_nValue);
+        CPPUNIT_ASSERT_EQUAL(static_cast<unsigned int>(3), aFeatures[0].m_nStart);
+        CPPUNIT_ASSERT_EQUAL(static_cast<unsigned int>(6), aFeatures[0].m_nEnd);
+    }
+    { // One feature specified, with character range and minus prefix
+        vcl::font::FeatureParser aParser("Font name:-abcd[3:6]");
+        CPPUNIT_ASSERT_EQUAL(size_t(1), aParser.getFeatures().size());
+        auto aFeatures = aParser.getFeatures();
+
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(0), aFeatures[0].m_nValue);
+        CPPUNIT_ASSERT_EQUAL(static_cast<unsigned int>(3), aFeatures[0].m_nStart);
+        CPPUNIT_ASSERT_EQUAL(static_cast<unsigned int>(6), aFeatures[0].m_nEnd);
+    }
+    { // One feature specified, with CSS on
+        vcl::font::FeatureParser aParser("Font name:\"abcd\" on");
+        CPPUNIT_ASSERT_EQUAL(size_t(1), aParser.getFeatures().size());
+        auto aFeatures = aParser.getFeatures();
+
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(1), aFeatures[0].m_nValue);
+    }
+    { // One feature specified, with CSS off
+        vcl::font::FeatureParser aParser("Font name:'abcd' off");
+        CPPUNIT_ASSERT_EQUAL(size_t(1), aParser.getFeatures().size());
+        auto aFeatures = aParser.getFeatures();
+
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(0), aFeatures[0].m_nValue);
+    }
+    { // One feature specified, with CSS value
+        vcl::font::FeatureParser aParser("Font name:\"abcd\" 2");
+        CPPUNIT_ASSERT_EQUAL(size_t(1), aParser.getFeatures().size());
+        auto aFeatures = aParser.getFeatures();
+
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(2), aFeatures[0].m_nValue);
     }
     { // Multiple features specified, no values
         vcl::font::FeatureParser aParser("Font name:abcd&bcde&efgh");
         CPPUNIT_ASSERT_EQUAL(size_t(3), aParser.getFeatures().size());
         auto aFeatures = aParser.getFeatures();
 
-        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].first);
-        CPPUNIT_ASSERT_EQUAL(sal_uInt32(1), aFeatures[0].second);
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(1), aFeatures[0].m_nValue);
 
-        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("bcde"), aFeatures[1].first);
-        CPPUNIT_ASSERT_EQUAL(sal_uInt32(1), aFeatures[1].second);
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("bcde"), aFeatures[1].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(1), aFeatures[1].m_nValue);
 
-        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("efgh"), aFeatures[2].first);
-        CPPUNIT_ASSERT_EQUAL(sal_uInt32(1), aFeatures[2].second);
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("efgh"), aFeatures[2].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(1), aFeatures[2].m_nValue);
     }
     {
         // Multiple features specified, explicit values
         // Only 4 char parameter names supported - "toolong" is too long and ignored
-        // If value is 0, it should be also ignored
         vcl::font::FeatureParser aParser("Font name:abcd=1&bcde=0&toolong=1&cdef=3");
-        CPPUNIT_ASSERT_EQUAL(size_t(2), aParser.getFeatures().size());
+        CPPUNIT_ASSERT_EQUAL(size_t(3), aParser.getFeatures().size());
         auto aFeatures = aParser.getFeatures();
 
-        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].first);
-        CPPUNIT_ASSERT_EQUAL(sal_uInt32(1), aFeatures[0].second);
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(1), aFeatures[0].m_nValue);
+
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("bcde"), aFeatures[1].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(0), aFeatures[1].m_nValue);
 
-        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("cdef"), aFeatures[1].first);
-        CPPUNIT_ASSERT_EQUAL(sal_uInt32(3), aFeatures[1].second);
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("cdef"), aFeatures[2].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(3), aFeatures[2].m_nValue);
     }
     {
         // Special case - "lang" is parsed specially and access separately not as a feature.
@@ -192,8 +332,8 @@ void FontFeatureTest::testParseFeature()
         CPPUNIT_ASSERT_EQUAL(size_t(1), aParser.getFeatures().size());
         auto aFeatures = aParser.getFeatures();
 
-        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].first);
-        CPPUNIT_ASSERT_EQUAL(sal_uInt32(1), aFeatures[0].second);
+        CPPUNIT_ASSERT_EQUAL(vcl::font::featureCode("abcd"), aFeatures[0].m_nTag);
+        CPPUNIT_ASSERT_EQUAL(uint32_t(1), aFeatures[0].m_nValue);
 
         CPPUNIT_ASSERT_EQUAL(OUString("slo"), aParser.getLanguage());
     }