mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-09 23:34:20 +00:00
Code Activity

Typeface: Implement platform typefaces using Harfbuzz hb_font_t

Browse source
This commit is contained in:
reuk 2024-02-26 16:42:32 +00:00
parent 080ac6e7e7
commit 0d2e34f34c
No known key found for this signature in database
GPG key ID: FCB43929F012EE5C
56 changed files with 8359 additions and 2985 deletions
Download patch file Download diff file Expand all files Collapse all files

8
examples/DemoRunner/Builds/Android/app/CMakeLists.txt
View file

@ -1814,8 +1814,6 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_graphics/fonts/harfbuzz/hb.hh"
"../../../../../modules/juce_graphics/fonts/juce_AttributedString.cpp"
"../../../../../modules/juce_graphics/fonts/juce_AttributedString.h"
"../../../../../modules/juce_graphics/fonts/juce_CustomTypeface.cpp"
"../../../../../modules/juce_graphics/fonts/juce_CustomTypeface.h"
"../../../../../modules/juce_graphics/fonts/juce_Font.cpp"
"../../../../../modules/juce_graphics/fonts/juce_Font.h"
"../../../../../modules/juce_graphics/fonts/juce_FunctionPointerDestructor.h"
@ -1826,6 +1824,7 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_graphics/fonts/juce_TextLayout.h"
"../../../../../modules/juce_graphics/fonts/juce_Typeface.cpp"
"../../../../../modules/juce_graphics/fonts/juce_Typeface.h"
"../../../../../modules/juce_graphics/fonts/juce_TypefaceTestData.cpp"
"../../../../../modules/juce_graphics/geometry/juce_AffineTransform.cpp"
"../../../../../modules/juce_graphics/geometry/juce_AffineTransform.h"
"../../../../../modules/juce_graphics/geometry/juce_BorderSize.h"
@ -1948,7 +1947,6 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_graphics/native/juce_Fonts_freetype.cpp"
"../../../../../modules/juce_graphics/native/juce_Fonts_linux.cpp"
"../../../../../modules/juce_graphics/native/juce_Fonts_mac.mm"
"../../../../../modules/juce_graphics/native/juce_Fonts_windows.cpp"
"../../../../../modules/juce_graphics/native/juce_GraphicsContext_android.cpp"
"../../../../../modules/juce_graphics/native/juce_IconHelpers_android.cpp"
"../../../../../modules/juce_graphics/native/juce_IconHelpers_linux.cpp"
@ -4278,8 +4276,6 @@ set_source_files_properties(
"../../../../../modules/juce_graphics/fonts/harfbuzz/hb.hh"
"../../../../../modules/juce_graphics/fonts/juce_AttributedString.cpp"
"../../../../../modules/juce_graphics/fonts/juce_AttributedString.h"
"../../../../../modules/juce_graphics/fonts/juce_CustomTypeface.cpp"
"../../../../../modules/juce_graphics/fonts/juce_CustomTypeface.h"
"../../../../../modules/juce_graphics/fonts/juce_Font.cpp"
"../../../../../modules/juce_graphics/fonts/juce_Font.h"
"../../../../../modules/juce_graphics/fonts/juce_FunctionPointerDestructor.h"
@ -4290,6 +4286,7 @@ set_source_files_properties(
"../../../../../modules/juce_graphics/fonts/juce_TextLayout.h"
"../../../../../modules/juce_graphics/fonts/juce_Typeface.cpp"
"../../../../../modules/juce_graphics/fonts/juce_Typeface.h"
"../../../../../modules/juce_graphics/fonts/juce_TypefaceTestData.cpp"
"../../../../../modules/juce_graphics/geometry/juce_AffineTransform.cpp"
"../../../../../modules/juce_graphics/geometry/juce_AffineTransform.h"
"../../../../../modules/juce_graphics/geometry/juce_BorderSize.h"
@ -4412,7 +4409,6 @@ set_source_files_properties(
"../../../../../modules/juce_graphics/native/juce_Fonts_freetype.cpp"
"../../../../../modules/juce_graphics/native/juce_Fonts_linux.cpp"
"../../../../../modules/juce_graphics/native/juce_Fonts_mac.mm"
"../../../../../modules/juce_graphics/native/juce_Fonts_windows.cpp"
"../../../../../modules/juce_graphics/native/juce_GraphicsContext_android.cpp"
"../../../../../modules/juce_graphics/native/juce_IconHelpers_android.cpp"
"../../../../../modules/juce_graphics/native/juce_IconHelpers_linux.cpp"

10
examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj
View file

@ -2096,9 +2096,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_AttributedString.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_CustomTypeface.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_Font.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -2111,6 +2108,9 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_Typeface.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_TypefaceTestData.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\geometry\juce_AffineTransform.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -2351,9 +2351,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Fonts_linux.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Fonts_windows.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_GraphicsContext_android.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -4131,7 +4128,6 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\harfbuzz\hb.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\harfbuzz\hb.hh"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_AttributedString.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_CustomTypeface.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_Font.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_FunctionPointerDestructor.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.h"/>

12
examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj.filters
View file

@ -2839,9 +2839,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_AttributedString.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_CustomTypeface.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_Font.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
@ -2854,6 +2851,9 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_Typeface.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_TypefaceTestData.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\geometry\juce_AffineTransform.cpp">
<Filter>JUCE Modules\juce_graphics\geometry</Filter>
</ClCompile>
@ -3100,9 +3100,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Fonts_mac.mm">
<Filter>JUCE Modules\juce_graphics\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Fonts_windows.cpp">
<Filter>JUCE Modules\juce_graphics\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_GraphicsContext_android.cpp">
<Filter>JUCE Modules\juce_graphics\native</Filter>
</ClCompile>
@ -7125,9 +7122,6 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_AttributedString.h">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_CustomTypeface.h">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_Font.h">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClInclude>

10
examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj
View file

@ -2096,9 +2096,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_AttributedString.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_CustomTypeface.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_Font.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -2111,6 +2108,9 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_Typeface.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_TypefaceTestData.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\geometry\juce_AffineTransform.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -2351,9 +2351,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Fonts_linux.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Fonts_windows.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_GraphicsContext_android.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -4131,7 +4128,6 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\harfbuzz\hb.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\harfbuzz\hb.hh"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_AttributedString.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_CustomTypeface.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_Font.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_FunctionPointerDestructor.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.h"/>

12
examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters
View file

@ -2839,9 +2839,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_AttributedString.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_CustomTypeface.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_Font.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
@ -2854,6 +2851,9 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_Typeface.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_TypefaceTestData.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\geometry\juce_AffineTransform.cpp">
<Filter>JUCE Modules\juce_graphics\geometry</Filter>
</ClCompile>
@ -3100,9 +3100,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Fonts_mac.mm">
<Filter>JUCE Modules\juce_graphics\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Fonts_windows.cpp">
<Filter>JUCE Modules\juce_graphics\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_GraphicsContext_android.cpp">
<Filter>JUCE Modules\juce_graphics\native</Filter>
</ClCompile>
@ -7125,9 +7122,6 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_AttributedString.h">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_CustomTypeface.h">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_Font.h">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClInclude>

10
examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj
View file

@ -2096,9 +2096,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_AttributedString.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_CustomTypeface.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_Font.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -2111,6 +2108,9 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_Typeface.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_TypefaceTestData.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\geometry\juce_AffineTransform.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -2351,9 +2351,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Fonts_linux.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Fonts_windows.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_GraphicsContext_android.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -4131,7 +4128,6 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\harfbuzz\hb.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\harfbuzz\hb.hh"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_AttributedString.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_CustomTypeface.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_Font.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_FunctionPointerDestructor.h"/>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_GlyphArrangement.h"/>

12
examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters
View file

@ -2839,9 +2839,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_AttributedString.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_CustomTypeface.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_Font.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
@ -2854,6 +2851,9 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_Typeface.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\fonts\juce_TypefaceTestData.cpp">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\geometry\juce_AffineTransform.cpp">
<Filter>JUCE Modules\juce_graphics\geometry</Filter>
</ClCompile>
@ -3100,9 +3100,6 @@
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Fonts_mac.mm">
<Filter>JUCE Modules\juce_graphics\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Fonts_windows.cpp">
<Filter>JUCE Modules\juce_graphics\native</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_GraphicsContext_android.cpp">
<Filter>JUCE Modules\juce_graphics\native</Filter>
</ClCompile>
@ -7125,9 +7122,6 @@
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_AttributedString.h">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_CustomTypeface.h">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_graphics\fonts\juce_Font.h">
<Filter>JUCE Modules\juce_graphics\fonts</Filter>
</ClInclude>