tdf#132242: add "None" entry for "frac" OpenTypeFeature (vcl)

Change-Id: I260b37a847887c79645db8015938f8bbbe6772d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92591 Tested-by: Jenkins Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
LibreOffice · Apr 22, 2020 · d28c9d5 · d28c9d5
1 parent b081a34
commit d28c9d5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/vcl/inc/font/OpenTypeFeatureStrings.hrc b/vcl/inc/font/OpenTypeFeatureStrings.hrc
@@ -41,6 +41,7 @@
 #define STR_FONT_FEATURE_ID_EXPT          NC_("STR_FONT_FEATURE_ID_EXPT", "Expert Forms")
 #define STR_FONT_FEATURE_ID_FALT          NC_("STR_FONT_FEATURE_ID_FALT", "Final Glyph on Line Alternates")
 #define STR_FONT_FEATURE_ID_FRAC          NC_("STR_FONT_FEATURE_ID_FRAC", "Fraction style:")
+#define STR_FONT_FEATURE_ID_FRAC_PARAM_0  NC_("STR_FONT_FEATURE_ID_FRAC_PARAM_0", "None")
 #define STR_FONT_FEATURE_ID_FRAC_PARAM_1  NC_("STR_FONT_FEATURE_ID_FRAC_PARAM_1", "Diagonal Fractions")
 #define STR_FONT_FEATURE_ID_FRAC_PARAM_2  NC_("STR_FONT_FEATURE_ID_FRAC_PARAM_2", "Nut Fractions")
 #define STR_FONT_FEATURE_ID_FWID          NC_("STR_FONT_FEATURE_ID_FWID", "Full Widths")

diff --git a/vcl/source/font/OpenTypeFeatureDefinitionList.cxx b/vcl/source/font/OpenTypeFeatureDefinitionList.cxx
@@ -40,7 +40,8 @@ void OpenTypeFeatureDefinitionListPrivate::init()
         { featureCode("expt"), STR_FONT_FEATURE_ID_EXPT },
         { featureCode("falt"), STR_FONT_FEATURE_ID_FALT },
         { featureCode("frac"), STR_FONT_FEATURE_ID_FRAC,
-          std::vector<FeatureParameter>{ { 1, STR_FONT_FEATURE_ID_FRAC_PARAM_1 },
+          std::vector<FeatureParameter>{ { 0, STR_FONT_FEATURE_ID_FRAC_PARAM_0 },
+                                         { 1, STR_FONT_FEATURE_ID_FRAC_PARAM_1 },
                                          { 2, STR_FONT_FEATURE_ID_FRAC_PARAM_2 } } },
         { featureCode("fwid"), STR_FONT_FEATURE_ID_FWID },
         { featureCode("halt"), STR_FONT_FEATURE_ID_HALT },