Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Incorrect display of utf8 text in standalone #889 #947

Merged

Conversation

IvanMinin
Copy link
Collaborator

No description provided.

@IvanMinin IvanMinin closed this Dec 23, 2022
@IvanMinin IvanMinin reopened this Dec 23, 2022
@@ -15,6 +15,7 @@ option(WITH_STATIC "Build Indigo static library as well as shared" OFF)

# Indigo API options
option(BUILD_INDIGO "Build indigo shared library" ON)
option(USE_FONT_MANAGER "Build indigo render with font_face_manager" OFF)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already have BUILD_STANDALONE for that. I would suggest to use font manager in case of standalone build.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right now, we want to use font manager only in case of WASM.
It will be added later to standalone.

else()
add_subdirectory(cairo)
if (UNIX AND NOT APPLE)
add_subdirectory(freetype)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We also need to add possibility to use system freetype on Linux (see cairo or libpng or libz as an example).

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.
In case of NOT EMSCRIPTEN system freetype and fontconfig libs will be used.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it's not only about NOT EMSCRIPTEN, it's also about BUILD_STANDALONE.

@IvanMinin IvanMinin changed the title Incorrect display of utf8 text in standalone Incorrect display of utf8 text in standalone #889 Jan 11, 2023
@mkviatkovskii mkviatkovskii self-requested a review January 11, 2023 12:57
@mkviatkovskii mkviatkovskii merged commit 93cd7b3 into master Jan 11, 2023
@mkviatkovskii mkviatkovskii deleted the bugfix/889-incorrect-display-of-utf8-text-in-standalone branch January 11, 2023 16:10
loimu pushed a commit that referenced this pull request Jan 17, 2023
* added own-built freetype; removed cairo-wasm

* returned freetype CMakeLists.txt to the original state

* fixed freetype building

* added sans fonts files

* added rendere_font_face_manager; support of external fonts

* added utf8 tests to indigo-ketcher

* clang-format fix for sans fonts files

* clang-format fix for font_face_manager files

* fixed build for non UNIX builds

* clang_format fix

* fixed freetype build

* selected FreeType License (FTL) as used license

* selected FreeType License (FTL) as used license

* moved sans fonts files; added OFL license file

* fixed build and CMakeFiles
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants