Generalize all font metrics function to char32_t

mike-spa · mike-spa · commit 6725ed06cede · 2025-10-23T13:52:41.000+02:00
Cause that will work with both 16bit and 32bit (i.e. ucs4) character maps
diff --git a/src/engraving/dom/harmony.cpp b/src/engraving/dom/harmony.cpp
@@ -1182,12 +1182,12 @@ void TextSegment::setFont(const muse::draw::Font& f)
             const Char& c2 = m_text.at(i + 1);
             ++i;
             char32_t v = Char::surrogateToUcs4(c, c2);
-            if (!fm.inFontUcs4(v)) {
+            if (!fm.inFont(v)) {
                 fail = true;
                 break;
             }
         } else {
-            if (!fm.inFont(c)) {
+            if (!fm.inFont(c.unicode())) {
                 fail = true;
                 break;
             }
diff --git a/src/engraving/dom/textbase.cpp b/src/engraving/dom/textbase.cpp
@@ -941,12 +941,12 @@ Font TextFragment::font(const TextBase* t) const
                 const Char& c2 = text.at(i + 1);
                 ++i;
                 char32_t v = Char::surrogateToUcs4(c, c2);
-                if (!fm.inFontUcs4(v)) {
+                if (!fm.inFont(v)) {
                     fail = true;
                     break;
                 }
             } else {
-                if (!fm.inFont(c)) {
+                if (!fm.inFont(c.unicode())) {
                     fail = true;
                     break;
                 }
diff --git a/src/engraving/internal/engravingfont.cpp b/src/engraving/internal/engravingfont.cpp
@@ -846,9 +846,9 @@ void EngravingFont::loadEngravingDefaults(const JsonObject& engravingDefaultsObj
 
 void EngravingFont::computeMetrics(EngravingFont::Sym& sym, const Smufl::Code& code)
 {
-    if (fontProvider()->inFontUcs4(m_font, code.smuflCode)) {
+    if (fontProvider()->inFont(m_font, code.smuflCode)) {
         sym.code = code.smuflCode;
-    } else if (fontProvider()->inFontUcs4(m_font, code.musicSymBlockCode)) {
+    } else if (fontProvider()->inFont(m_font, code.musicSymBlockCode)) {
         sym.code = code.musicSymBlockCode;
     }
 
diff --git a/src/engraving/rendering/score/tlayout.cpp b/src/engraving/rendering/score/tlayout.cpp
@@ -1305,9 +1305,7 @@ void TLayout::layoutBend(const Bend* item, Bend::LayoutData* ldata)
 
             int idx = (pitch + 12) / 25;
             const char* l = Bend::label[idx];
-            bb.unite(fm.boundingRect(RectF(x2, y2, 0, 0),
-                                     muse::draw::AlignHCenter | muse::draw::AlignBottom | muse::draw::TextDontClip,
-                                     String::fromAscii(l)));
+            bb.unite(fm.boundingRect(String::fromAscii(l)));
             y = y2;
         }
         if (pitch == item->points().at(pt + 1).pitch) {
@@ -1332,9 +1330,7 @@ void TLayout::layoutBend(const Bend* item, Bend::LayoutData* ldata)
 
             int idx = (item->points().at(pt + 1).pitch + 12) / 25;
             const char* l = Bend::label[idx];
-            bb.unite(fm.boundingRect(RectF(x2, y2, 0, 0),
-                                     muse::draw::AlignHCenter | muse::draw::AlignBottom | muse::draw::TextDontClip,
-                                     String::fromAscii(l)));
+            bb.unite(fm.boundingRect(String::fromAscii(l)));
         } else {
             // down
             x2 = x + spatium * .5;
diff --git a/src/engraving/rendering/single/singlelayout.cpp b/src/engraving/rendering/single/singlelayout.cpp
@@ -669,9 +669,7 @@ void SingleLayout::layout(Bend* item, const Context&)
 
             int idx = (pitch + 12) / 25;
             const char* l = Bend::label[idx];
-            bb.unite(fm.boundingRect(RectF(x2, y2, 0, 0),
-                                     muse::draw::AlignHCenter | muse::draw::AlignBottom | muse::draw::TextDontClip,
-                                     String::fromAscii(l)));
+            bb.unite(fm.boundingRect(String::fromAscii(l)));
             y = y2;
         }
         if (pitch == item->points().at(pt + 1).pitch) {
@@ -696,9 +694,7 @@ void SingleLayout::layout(Bend* item, const Context&)
 
             int idx = (item->points().at(pt + 1).pitch + 12) / 25;
             const char* l = Bend::label[idx];
-            bb.unite(fm.boundingRect(RectF(x2, y2, 0, 0),
-                                     muse::draw::AlignHCenter | muse::draw::AlignBottom | muse::draw::TextDontClip,
-                                     String::fromAscii(l)));
+            bb.unite(fm.boundingRect(String::fromAscii(l)));
         } else {
             // down
             x2 = x + spatium * .5;
diff --git a/src/framework/draw/fontmetrics.cpp b/src/framework/draw/fontmetrics.cpp
@@ -74,24 +74,19 @@ double FontMetrics::horizontalAdvance(const String& string) const
     return fontProvider()->horizontalAdvance(m_font, string);
 }
 
-double FontMetrics::horizontalAdvance(const Char& ch) const
+double FontMetrics::horizontalAdvance(char32_t ucs4) const
 {
-    return fontProvider()->horizontalAdvance(m_font, ch);
+    return fontProvider()->horizontalAdvance(m_font, ucs4);
 }
 
 RectF FontMetrics::boundingRect(const String& string) const
 {
     return fontProvider()->boundingRect(m_font, string);
 }
 
-RectF FontMetrics::boundingRect(const Char& ch) const
+RectF FontMetrics::boundingRect(char32_t ucs4) const
 {
-    return fontProvider()->boundingRect(m_font, ch);
-}
-
-RectF FontMetrics::boundingRect(const RectF& r, int flags, const String& string) const
-{
-    return fontProvider()->boundingRect(m_font, r, flags, string);
+    return fontProvider()->boundingRect(m_font, ucs4);
 }
 
 RectF FontMetrics::tightBoundingRect(const String& string) const
@@ -104,14 +99,9 @@ RectF FontMetrics::tightBoundingRect(const Char& ch) const
     return fontProvider()->tightBoundingRect(m_font, ch);
 }
 
-bool FontMetrics::inFont(Char ch) const
-{
-    return fontProvider()->inFont(m_font, ch);
-}
-
-bool FontMetrics::inFontUcs4(char32_t ucs4) const
+bool FontMetrics::inFont(char32_t ucs4) const
 {
-    return fontProvider()->inFontUcs4(m_font, ucs4);
+    return fontProvider()->inFont(m_font, ucs4);
 }
 
 // Static
diff --git a/src/framework/draw/fontmetrics.h b/src/framework/draw/fontmetrics.h
@@ -49,16 +49,15 @@ class FontMetrics
     double width(const Char& ch) const;
 
     double horizontalAdvance(const String& string) const;
-    double horizontalAdvance(const Char& ch) const;
+    double horizontalAdvance(char32_t ucs4) const;
 
     RectF boundingRect(const String& string) const;
-    RectF boundingRect(const Char& ch) const;
-    RectF boundingRect(const RectF& r, int flags, const String& string) const;
+    RectF boundingRect(char32_t ucs4) const;
+
     RectF tightBoundingRect(const String& string) const;
     RectF tightBoundingRect(const Char& ch) const;
 
-    bool inFont(Char ch) const;
-    bool inFontUcs4(char32_t ucs4) const;
+    bool inFont(char32_t ucs4) const;
 
     static double width(const Font& f, const String& string);
     static RectF boundingRect(const Font& f, const String& string);
diff --git a/src/framework/draw/ifontprovider.h b/src/framework/draw/ifontprovider.h
@@ -47,16 +47,15 @@ class IFontProvider : MODULE_EXPORT_INTERFACE
     virtual double ascent(const Font& f) const = 0;
     virtual double descent(const Font& f) const = 0;
 
-    virtual bool inFont(const Font& f, Char ch) const = 0;
-    virtual bool inFontUcs4(const Font& f, char32_t ucs4) const = 0;
+    virtual bool inFont(const Font& f, char32_t ucs4) const = 0;
 
     // Text
     virtual double horizontalAdvance(const Font& f, const String& string) const = 0;
-    virtual double horizontalAdvance(const Font& f, const Char& ch) const = 0;
+    virtual double horizontalAdvance(const Font& f, char32_t ucs4) const = 0;
 
     virtual RectF boundingRect(const Font& f, const String& string) const = 0;
-    virtual RectF boundingRect(const Font& f, const Char& ch) const = 0;
-    virtual RectF boundingRect(const Font& f, const RectF& r, int flags, const String& string) const = 0;
+    virtual RectF boundingRect(const Font& f, char32_t ucs4) const = 0;
+
     virtual RectF tightBoundingRect(const Font& f, const String& string) const = 0;
 };
 }
diff --git a/src/framework/draw/internal/fontprovider.cpp b/src/framework/draw/internal/fontprovider.cpp
@@ -63,12 +63,7 @@ double FontProvider::descent(const muse::draw::Font& f) const
     return fontsEngine()->descent(f);
 }
 
-bool FontProvider::inFont(const muse::draw::Font& f, muse::Char ch) const
-{
-    return inFontUcs4(f, static_cast<char32_t>(ch.unicode()));
-}
-
-bool FontProvider::inFontUcs4(const muse::draw::Font& f, char32_t ucs4) const
+bool FontProvider::inFont(const muse::draw::Font& f, char32_t ucs4) const
 {
     return fontsEngine()->inFontUcs4(f, ucs4);
 }
@@ -79,26 +74,19 @@ double FontProvider::horizontalAdvance(const muse::draw::Font& f, const muse::St
     return fontsEngine()->horizontalAdvance(f, string.toStdU32String());
 }
 
-double FontProvider::horizontalAdvance(const muse::draw::Font& f, const muse::Char& ch) const
+double FontProvider::horizontalAdvance(const muse::draw::Font& f, char32_t ucs4) const
 {
-    return fontsEngine()->horizontalAdvance(f, ch.unicode());
+    return fontsEngine()->horizontalAdvance(f, ucs4);
 }
 
 RectF FontProvider::boundingRect(const muse::draw::Font& f, const muse::String& string) const
 {
     return fontsEngine()->boundingRect(f, string.toStdU32String());
 }
 
-RectF FontProvider::boundingRect(const muse::draw::Font& f, const muse::Char& ch) const
-{
-    return fontsEngine()->boundingRect(f, ch.unicode());
-}
-
-RectF FontProvider::boundingRect(const muse::draw::Font& f, const RectF& r, int flags, const muse::String& string) const
+RectF FontProvider::boundingRect(const muse::draw::Font& f, char32_t ucs4) const
 {
-    UNUSED(r);
-    UNUSED(flags);
-    return boundingRect(f, string);
+    return fontsEngine()->boundingRect(f, ucs4);
 }
 
 RectF FontProvider::tightBoundingRect(const muse::draw::Font& f, const muse::String& string) const
diff --git a/src/framework/draw/internal/fontprovider.h b/src/framework/draw/internal/fontprovider.h
@@ -46,16 +46,15 @@ class FontProvider : public IFontProvider, public Injectable
     double ascent(const Font& f) const override;
     double descent(const Font& f) const override;
 
-    bool inFont(const Font& f, Char ch) const override;
-    bool inFontUcs4(const Font& f, char32_t ucs4) const override;
+    bool inFont(const Font& f, char32_t ucs4) const override;
 
     // Text
     double horizontalAdvance(const Font& f, const String& string) const override;
-    double horizontalAdvance(const Font& f, const Char& ch) const override;
+    double horizontalAdvance(const Font& f, char32_t ucs4) const override;
 
     RectF boundingRect(const Font& f, const String& string) const override;
-    RectF boundingRect(const Font& f, const Char& ch) const override;
-    RectF boundingRect(const Font& f, const RectF& r, int flags, const String& string) const override;
+    RectF boundingRect(const Font& f, char32_t ucs4) const override;
+
     RectF tightBoundingRect(const Font& f, const String& string) const override;
 };
 }
diff --git a/src/framework/draw/internal/fontproviderdispatcher.cpp b/src/framework/draw/internal/fontproviderdispatcher.cpp
@@ -71,14 +71,9 @@ double FontProviderDispatcher::descent(const muse::draw::Font& f) const
     return m_mainFProvider->descent(f);
 }
 
-bool FontProviderDispatcher::inFont(const muse::draw::Font& f, muse::Char ch) const
+bool FontProviderDispatcher::inFont(const muse::draw::Font& f, char32_t ucs4) const
 {
-    return inFontUcs4(f, static_cast<char32_t>(ch.unicode()));
-}
-
-bool FontProviderDispatcher::inFontUcs4(const muse::draw::Font& f, char32_t ucs4) const
-{
-    bool ret = m_mainFProvider->inFontUcs4(f, ucs4);
+    bool ret = m_mainFProvider->inFont(f, ucs4);
     return ret;
 }
 
@@ -88,26 +83,19 @@ double FontProviderDispatcher::horizontalAdvance(const muse::draw::Font& f, cons
     return m_qtFProvider->horizontalAdvance(f, string);
 }
 
-double FontProviderDispatcher::horizontalAdvance(const muse::draw::Font& f, const muse::Char& ch) const
+double FontProviderDispatcher::horizontalAdvance(const muse::draw::Font& f, char32_t ucs4) const
 {
-    return m_qtFProvider->horizontalAdvance(f, ch.unicode());
+    return m_qtFProvider->horizontalAdvance(f, ucs4);
 }
 
 RectF FontProviderDispatcher::boundingRect(const muse::draw::Font& f, const muse::String& string) const
 {
     return m_qtFProvider->boundingRect(f, string);
 }
 
-RectF FontProviderDispatcher::boundingRect(const muse::draw::Font& f, const muse::Char& ch) const
-{
-    return m_qtFProvider->boundingRect(f, ch.unicode());
-}
-
-RectF FontProviderDispatcher::boundingRect(const muse::draw::Font& f, const RectF& r, int flags, const muse::String& string) const
+RectF FontProviderDispatcher::boundingRect(const muse::draw::Font& f, char32_t ucs4) const
 {
-    UNUSED(r);
-    UNUSED(flags);
-    return boundingRect(f, string);
+    return m_qtFProvider->boundingRect(f, ucs4);
 }
 
 RectF FontProviderDispatcher::tightBoundingRect(const muse::draw::Font& f, const muse::String& string) const
diff --git a/src/framework/draw/internal/fontproviderdispatcher.h b/src/framework/draw/internal/fontproviderdispatcher.h
@@ -42,16 +42,15 @@ class FontProviderDispatcher : public IFontProvider
     double ascent(const Font& f) const override;
     double descent(const Font& f) const override;
 
-    bool inFont(const Font& f, Char ch) const override;
-    bool inFontUcs4(const Font& f, char32_t ucs4) const override;
+    bool inFont(const Font& f, char32_t ucs4) const override;
 
     // Text
     double horizontalAdvance(const Font& f, const String& string) const override;
-    double horizontalAdvance(const Font& f, const Char& ch) const override;
+    double horizontalAdvance(const Font& f, char32_t ucs4) const override;
 
     RectF boundingRect(const Font& f, const String& string) const override;
-    RectF boundingRect(const Font& f, const Char& ch) const override;
-    RectF boundingRect(const Font& f, const RectF& r, int flags, const String& string) const override;
+    RectF boundingRect(const Font& f, char32_t ucs4) const override;
+
     RectF tightBoundingRect(const Font& f, const String& string) const override;
 
 private:
diff --git a/src/framework/draw/internal/qfontprovider.cpp b/src/framework/draw/internal/qfontprovider.cpp
@@ -90,12 +90,7 @@ double QFontProvider::descent(const Font& f) const
     return QFontMetricsF(f.toQFont(), &device).descent();
 }
 
-bool QFontProvider::inFont(const Font& f, Char ch) const
-{
-    return QFontMetricsF(f.toQFont(), &device).inFont(ch);
-}
-
-bool QFontProvider::inFontUcs4(const Font& f, char32_t ucs4) const
+bool QFontProvider::inFont(const Font& f, char32_t ucs4) const
 {
     // NOTE: QFontMetricsF::inFontUcs4 is unreliable for our use case because it uses Qt's fallback
     // system even if the flag noFontMerging is set, and returns true if the character
@@ -119,24 +114,27 @@ double QFontProvider::horizontalAdvance(const Font& f, const String& string) con
     return QFontMetricsF(f.toQFont(), &device).horizontalAdvance(string);
 }
 
-double QFontProvider::horizontalAdvance(const Font& f, const Char& ch) const
+double QFontProvider::horizontalAdvance(const Font& f, char32_t ucs4) const
 {
-    return QFontMetricsF(f.toQFont(), &device).horizontalAdvance(ch);
+    if (Char::requiresSurrogates(ucs4)) {
+        return QFontMetricsF(f.toQFont(), &device).horizontalAdvance(String::fromUcs4(ucs4));
+    }
+
+    return QFontMetricsF(f.toQFont(), &device).horizontalAdvance(static_cast<char16_t>(ucs4));
 }
 
 RectF QFontProvider::boundingRect(const Font& f, const String& string) const
 {
     return RectF::fromQRectF(QFontMetricsF(f.toQFont(), &device).boundingRect(string));
 }
 
-RectF QFontProvider::boundingRect(const Font& f, const Char& ch) const
+RectF QFontProvider::boundingRect(const Font& f, char32_t ucs4) const
 {
-    return RectF::fromQRectF(QFontMetricsF(f.toQFont(), &device).boundingRect(ch));
-}
+    if (Char::requiresSurrogates(ucs4)) {
+        return RectF::fromQRectF(QFontMetrics(f.toQFont(), &device).boundingRect(String::fromUcs4(ucs4)));
+    }
 
-RectF QFontProvider::boundingRect(const Font& f, const RectF& r, int flags, const String& string) const
-{
-    return RectF::fromQRectF(QFontMetricsF(f.toQFont(), &device).boundingRect(r.toQRectF(), flags, string));
+    return RectF::fromQRectF(QFontMetricsF(f.toQFont(), &device).boundingRect(static_cast<char16_t>(ucs4)));
 }
 
 RectF QFontProvider::tightBoundingRect(const Font& f, const String& string) const
diff --git a/src/framework/draw/internal/qfontprovider.h b/src/framework/draw/internal/qfontprovider.h
@@ -41,16 +41,15 @@ class QFontProvider : public IFontProvider
     double ascent(const Font& f) const override;
     double descent(const Font& f) const override;
 
-    bool inFont(const Font& f, Char ch) const override;
-    bool inFontUcs4(const Font& f, char32_t ucs4) const override;
+    bool inFont(const Font& f, char32_t ucs4) const override;
 
     // Text
     double horizontalAdvance(const Font& f, const String& string) const override;
-    double horizontalAdvance(const Font& f, const Char& ch) const override;
+    double horizontalAdvance(const Font& f, char32_t ucs4) const override;
 
     RectF boundingRect(const Font& f, const String& string) const override;
-    RectF boundingRect(const Font& f, const Char& ch) const override;
-    RectF boundingRect(const Font& f, const RectF& r, int flags, const String& string) const override;
+    RectF boundingRect(const Font& f, char32_t ucs4) const override;
+
     RectF tightBoundingRect(const Font& f, const String& string) const override;
 
 private:
diff --git a/src/importexport/musicxml/internal/musicxml/import/importmusicxmlpass1.cpp b/src/importexport/musicxml/internal/musicxml/import/importmusicxmlpass1.cpp
@@ -1903,7 +1903,7 @@ static double scaleText(const String& str, const Sid fontFaceSid, const double f
 
     double longestLine = 0.0;
     for (const String& line : str.split(u"\n")) {
-        const double textWidth = fm.boundingRect(RectF(0, 0, pageWidth, pageHeight), TextShowMnemonic, line).width();
+        const double textWidth = fm.boundingRect(line).width();
         longestLine = std::max(longestLine, textWidth);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -846,9 +846,9 @@ void EngravingFont::loadEngravingDefaults(const JsonObject& engravingDefaultsObj`
`846`	`846`
`847`	`847`	`void EngravingFont::computeMetrics(EngravingFont::Sym& sym, const Smufl::Code& code)`
`848`	`848`	`{`
`849`		`- if (fontProvider()->inFontUcs4(m_font, code.smuflCode)) {`
	`849`	`+ if (fontProvider()->inFont(m_font, code.smuflCode)) {`
`850`	`850`	`sym.code = code.smuflCode;`
`851`		`- } else if (fontProvider()->inFontUcs4(m_font, code.musicSymBlockCode)) {`
	`851`	`+ } else if (fontProvider()->inFont(m_font, code.musicSymBlockCode)) {`
`852`	`852`	`sym.code = code.musicSymBlockCode;`
`853`	`853`	`}`
`854`	`854`
Original file line number	Diff line number	Diff line change
`@@ -74,24 +74,19 @@ double FontMetrics::horizontalAdvance(const String& string) const`
`74`	`74`	`return fontProvider()->horizontalAdvance(m_font, string);`
`75`	`75`	`}`
`76`	`76`
`77`		`-double FontMetrics::horizontalAdvance(const Char& ch) const`
	`77`	`+double FontMetrics::horizontalAdvance(char32_t ucs4) const`
`78`	`78`	`{`
`79`		`- return fontProvider()->horizontalAdvance(m_font, ch);`
	`79`	`+ return fontProvider()->horizontalAdvance(m_font, ucs4);`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`RectF FontMetrics::boundingRect(const String& string) const`
`83`	`83`	`{`
`84`	`84`	`return fontProvider()->boundingRect(m_font, string);`
`85`	`85`	`}`
`86`	`86`
`87`		`-RectF FontMetrics::boundingRect(const Char& ch) const`
	`87`	`+RectF FontMetrics::boundingRect(char32_t ucs4) const`
`88`	`88`	`{`
`89`		`- return fontProvider()->boundingRect(m_font, ch);`
`90`		`-}`
`91`		`-`
`92`		`-RectF FontMetrics::boundingRect(const RectF& r, int flags, const String& string) const`
`93`		`-{`
`94`		`- return fontProvider()->boundingRect(m_font, r, flags, string);`
	`89`	`+ return fontProvider()->boundingRect(m_font, ucs4);`
`95`	`90`	`}`
`96`	`91`
`97`	`92`	`RectF FontMetrics::tightBoundingRect(const String& string) const`
`@@ -104,14 +99,9 @@ RectF FontMetrics::tightBoundingRect(const Char& ch) const`
`104`	`99`	`return fontProvider()->tightBoundingRect(m_font, ch);`
`105`	`100`	`}`
`106`	`101`
`107`		`-bool FontMetrics::inFont(Char ch) const`
`108`		`-{`
`109`		`- return fontProvider()->inFont(m_font, ch);`
`110`		`-}`
`111`		`-`
`112`		`-bool FontMetrics::inFontUcs4(char32_t ucs4) const`
	`102`	`+bool FontMetrics::inFont(char32_t ucs4) const`
`113`	`103`	`{`
`114`		`- return fontProvider()->inFontUcs4(m_font, ucs4);`
	`104`	`+ return fontProvider()->inFont(m_font, ucs4);`
`115`	`105`	`}`
`116`	`106`
`117`	`107`	`// Static`
Original file line number	Diff line number	Diff line change
`@@ -63,12 +63,7 @@ double FontProvider::descent(const muse::draw::Font& f) const`
`63`	`63`	`return fontsEngine()->descent(f);`
`64`	`64`	`}`
`65`	`65`
`66`		`-bool FontProvider::inFont(const muse::draw::Font& f, muse::Char ch) const`
`67`		`-{`
`68`		`- return inFontUcs4(f, static_cast<char32_t>(ch.unicode()));`
`69`		`-}`
`70`		`-`
`71`		`-bool FontProvider::inFontUcs4(const muse::draw::Font& f, char32_t ucs4) const`
	`66`	`+bool FontProvider::inFont(const muse::draw::Font& f, char32_t ucs4) const`
`72`	`67`	`{`
`73`	`68`	`return fontsEngine()->inFontUcs4(f, ucs4);`
`74`	`69`	`}`
`@@ -79,26 +74,19 @@ double FontProvider::horizontalAdvance(const muse::draw::Font& f, const muse::St`
`79`	`74`	`return fontsEngine()->horizontalAdvance(f, string.toStdU32String());`
`80`	`75`	`}`
`81`	`76`
`82`		`-double FontProvider::horizontalAdvance(const muse::draw::Font& f, const muse::Char& ch) const`
	`77`	`+double FontProvider::horizontalAdvance(const muse::draw::Font& f, char32_t ucs4) const`
`83`	`78`	`{`
`84`		`- return fontsEngine()->horizontalAdvance(f, ch.unicode());`
	`79`	`+ return fontsEngine()->horizontalAdvance(f, ucs4);`
`85`	`80`	`}`
`86`	`81`
`87`	`82`	`RectF FontProvider::boundingRect(const muse::draw::Font& f, const muse::String& string) const`
`88`	`83`	`{`
`89`	`84`	`return fontsEngine()->boundingRect(f, string.toStdU32String());`
`90`	`85`	`}`
`91`	`86`
`92`		`-RectF FontProvider::boundingRect(const muse::draw::Font& f, const muse::Char& ch) const`
`93`		`-{`
`94`		`- return fontsEngine()->boundingRect(f, ch.unicode());`
`95`		`-}`
`96`		`-`
`97`		`-RectF FontProvider::boundingRect(const muse::draw::Font& f, const RectF& r, int flags, const muse::String& string) const`
	`87`	`+RectF FontProvider::boundingRect(const muse::draw::Font& f, char32_t ucs4) const`
`98`	`88`	`{`
`99`		`- UNUSED(r);`
`100`		`- UNUSED(flags);`
`101`		`- return boundingRect(f, string);`
	`89`	`+ return fontsEngine()->boundingRect(f, ucs4);`
`102`	`90`	`}`
`103`	`91`
`104`	`92`	`RectF FontProvider::tightBoundingRect(const muse::draw::Font& f, const muse::String& string) const`