LunaSVG: add custom font support #4620

Lpsd · 2026-01-08T05:12:04Z

Makes use of newly added font support with a new Lua API
Fonts must be registered before attempting to createSvg referencing the font-family.

bool svgRegisterFont(string fontFamily, string fontPath)
bool svgUnregisterFont(string fontFamily)

Fonts are cached in lunasvg for resource lifetime or until manually unregistered.
Loading existing system fonts is also supported (so can load a wider range of default system fonts now) - some discussion here: https://discord.com/channels/801330706252038164/801411628600000522/1458564145984176168
Note: LunaSVG already loads system fonts in our current version, but the latest version improves this

This was tested using a new SVG testing suite resource: svg.zip (say thanks to Claude Opus 4.5, he worked hard on this resource). Just run it and you'll see the UI with various testing presets and tools
All seems to be working

Based on #4615 - must be merged after that
Awaiting resolution of sammycage/lunasvg#258

curl/curl#13748

Lua API: svgRegisterFont(string fontFamily, string path) svgUnregisterFont(string fontFamily)

This reverts commit 969dfec.

This reverts commit 7c29995.

qaisjp · 2026-01-08T06:22:21Z

Client/mods/deathmatch/logic/luadefs/CLuaVectorGraphicDefs.cpp

+    CResource* pResource = pLuaMain->GetResource();
+    if (!pResource)
+        return false;
+


Maybe we should emit a warning when the font is registered already? I think right now it just returns false.

Bonus points if the warning message includes the name of the resource that registered the font

Implemented

qaisjp · 2026-01-08T06:22:32Z

Client/mods/deathmatch/logic/CSVGFontManager.cpp

+    // Allocate memory for font data that will be owned by LunaSVG
+    size_t dataSize = fontData.size();
+    char* pFontData = new char[dataSize];
+    memcpy(pFontData, fontData.data(), dataSize);


Is there a way we can avoid the memcpy? e.g. FileLoad straight into a char* or cast SString to a char*?

I don't know what the recommended approach is here, but avoiding the memcpy seems preferable

FileLoad uses SString which manages its own memory, so we can't pass this to LunaSVG for it to take ownership (and there is no way to 'release' the buffer provided by FileLoad)...

However, we can use the SharedUtil file functions for this to avoid the memcpy, which I've changed.

qaisjp · 2026-01-08T06:26:59Z

Client/mods/deathmatch/logic/CSVGFontManager.cpp

+    std::vector<SString> fonts;
+    fonts.reserve(m_RegisteredFonts.size());
+
+    for (const auto& pair : m_RegisteredFonts)
+        fonts.push_back(pair.first);


(Non-blocking feedback) The code you have is good because it's very clear what it does. Apparently in C++20 there's now a two-liner for this, up to you whether you want to try it: https://stackoverflow.com/a/68094571/1517394

Implemented

qaisjp · 2026-01-08T06:28:41Z

Client/mods/deathmatch/logic/CSVGFontManager.cpp

+
+bool CSVGFontManager::IsFontRegistered(const SString& strFontFamily) const
+{
+    return m_RegisteredFonts.find(strFontFamily) != m_RegisteredFonts.end();


Is this invalid?

Suggested change

return m_RegisteredFonts.find(strFontFamily) != m_RegisteredFonts.end();

return m_RegisteredFonts.contains(strFontFamily);

https://en.cppreference.com/w/cpp/container/map/contains.html

If it's valid, I think there's opportunity to use this function elsewhere in your PR too (RegisterFont)

It is indeed valid - updated!

qaisjp · 2026-01-08T06:33:03Z

Client/mods/deathmatch/logic/CSVGFontManager.cpp

+    // LunaSVG takes ownership of the data and will call our destroy callback when done
+    if (!lunasvg_add_font_face_from_data(strFontFamily.c_str(), false, false, pFontData, dataSize, FontDataDestroyCallback, pFontData))


Relationship between resource lifetime and fonts in m_RegisteredFonts are clear so far, but it looks like there could be some sort of desync between what's in m_RegisteredFonts and what's actually in lunasvg.

my questions are:

In what scenario is FontDataDestroyCallback called?

Does the callback also need to remove the font from m_RegisteredFonts? (I don't know if it's possible for lunasvg to eagerly unload a font?)

UnregisterFont (on resource unload) doesn't communicate with lunasvg. Should it?

wdyt?

Looking into this further, it doesn't actually work how I thought. Once we register a font with lunasvg/plutovg, the reference count on that side will always remain above 0, and therefore our callback won't ever be fired (see plutovg_font_face_destroy)

There's no way to request removal of font faces from cache using the public API (i.e no such lunasvg_remove_font_face), the only font related public APIs are lunasvg_add_font_face_from_file and lunasvg_add_font_face_from_data. Therefore once registered, a font will remain in the lunasvg/plutovg cache until application shutdown.

We'll need to defer this PR until the public API for lifecycle of font faces is improved, particularly around explicit destruction (I'm considering opening a PR @ lunasvg repo to speed this up).

sammycage/lunasvg#258

qaisjp

This is super cool and really well written, thanks. Some minor questions

sbx320 · 2026-01-08T16:41:57Z

Client/mods/deathmatch/logic/CSVGFontManager.cpp

+        UnregisterFont(fontFamily);
+}
+
+std::vector<SString> CSVGFontManager::GetRegisteredFonts() const


GetRegisteredFonts is never called

Bumps LunaSVG from 3.2.0 to [0dd60d1](sammycage/lunasvg@0dd60d1). See [releases for LunaSVG](https://github.com/sammycage/lunasvg/releases) for changes in previous versions. Testing resource with presets/test cases: [svg.zip](https://github.com/user-attachments/files/24606373/svg.zip) Additional PR for custom font support #4620

…- PR #4615 See [releases for LunaSVG](https://github.com/sammycage/lunasvg/releases) for changes in previous versions. Testing resource with presets/test cases: [svg.zip](https://github.com/user-attachments/files/24606373/svg.zip) Additional PR for custom font support #4620

Lpsd added 30 commits May 24, 2024 10:35

mbedTLS fix for cURL 8.8.0

8a11b3c

curl/curl#13748

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

181bf0f

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

6728cbe

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

0b989ac

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

9c19509

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

75c36ed

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

96dd1ee

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

f9eaf3f

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

54bd11b

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

ddee2d0

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

288b8db

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

b30a4a2

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

27b9eae

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

3731d81

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

b50a68c

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

58ae23f

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

f3645b8

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

e62d9f4

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

3346e9c

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

95dfc97

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

3307dc6

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

f091a85

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

c66e5de

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

c132ae1

Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

5739ef0

Update lunasvg vendor to 3.5.0

41f7bfa

Update premake5.lua

3a613f2

Allow custom resource fonts

969dfec

Lua API: svgRegisterFont(string fontFamily, string path) svgUnregisterFont(string fontFamily)

Merge branch 'master' into lunasvg-3.5.0

892cc22

Revert "Allow custom resource fonts"

7c29995

This reverts commit 969dfec.

Lpsd added 2 commits January 8, 2026 05:08

Re-introduce sanity checks

fbfd66c

Reapply "Allow custom resource fonts"

3f16442

This reverts commit 7c29995.

Lpsd requested a review from a team as a code owner January 8, 2026 05:12

Lpsd mentioned this pull request Jan 8, 2026

Bump LunaSVG to 0dd60d1 #4615

Merged

Merge branch 'master' into lunasvg-fonts

c37786d

qaisjp reviewed Jan 8, 2026

View reviewed changes

qaisjp requested changes Jan 8, 2026

View reviewed changes

Lpsd added 5 commits January 8, 2026 12:55

Add check for existing font on register

0cc6405

Avoid memcpy in font registration

6874010

Use key view in GetRegisteredFonts

9fae239

Use map.contains in IsFontRegistered

4cbba65

Update comments (todo)

96e8601

Lpsd marked this pull request as draft January 8, 2026 14:21

sbx320 requested changes Jan 8, 2026

View reviewed changes

	return m_RegisteredFonts.find(strFontFamily) != m_RegisteredFonts.end();
	return m_RegisteredFonts.contains(strFontFamily);

		// LunaSVG takes ownership of the data and will call our destroy callback when done
		if (!lunasvg_add_font_face_from_data(strFontFamily.c_str(), false, false, pFontData, dataSize, FontDataDestroyCallback, pFontData))

Uh oh!

LunaSVG: add custom font support #4620

Are you sure you want to change the base?

LunaSVG: add custom font support #4620

Conversation

Lpsd commented Jan 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

qaisjp Jan 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

qaisjp Jan 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Lpsd Jan 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

qaisjp left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Lpsd commented Jan 8, 2026 •

edited

Loading

qaisjp Jan 8, 2026 •

edited

Loading

qaisjp Jan 8, 2026 •

edited

Loading

Lpsd Jan 8, 2026 •

edited

Loading