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.

Sign up for GitHub

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

Jump to bottom

Allow providing and using multiple fallback fonts #339

Merged
merged 4 commits into from
Apr 24, 2020
Merged

Allow providing and using multiple fallback fonts #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2071f7f
Simplify libunibreak includes
poire-z Apr 24, 2020
01d68bb
Text: fix read/write outside array bounds
poire-z Apr 24, 2020
6c7e2b8
lvtextfm: dont adjust space after initial quotation mark/dash (rework)
poire-z Apr 24, 2020
d980059
Fonts: allow providing and using multiple fallback fonts
poire-z Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions crengine/include/lvdocviewprops.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#define PROP_LOG_AUTOFLUSH "crengine.log.autoflush"
#define PROP_FONT_SIZE "crengine.font.size"
#define PROP_FALLBACK_FONT_FACE "crengine.font.fallback.face"
// multiple fallback font faces allowed, separated by '|' (name kept singular for compatibility)
#define PROP_STATUS_FONT_COLOR "crengine.page.header.font.color"
#define PROP_STATUS_FONT_FACE "crengine.page.header.font.face"
#define PROP_STATUS_FONT_SIZE "crengine.page.header.font.size"
Expand Down
31 changes: 19 additions & 12 deletions crengine/include/lvfntman.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,8 @@ enum kerning_mode_t {
#define LFNT_HINT_BEGINS_PARAGRAPH 0x0004 /// segment is at start of paragraph
#define LFNT_HINT_ENDS_PARAGRAPH 0x0008 /// segment is at end of paragraph

#define LFNT_HINT_IS_FALLBACK_FONT 0x0010 /// set on recursive Harfbuzz rendering/drawing with a fallback font

// These 4 translate from LTEXT_TD_* equivalents (see lvtextfm.h). Keep them in sync.
#define LFNT_DRAW_UNDERLINE 0x0100 /// underlined text
#define LFNT_DRAW_OVERLINE 0x0200 /// overlined text
Expand Down Expand Up @@ -324,7 +326,7 @@ class LVFont : public LVRefCounter
\param glyph is pointer to glyph_info_t struct to place retrieved info
\return true if glyh was found
*/
virtual bool getGlyphInfo( lUInt32 code, glyph_info_t * glyph, lChar16 def_char=0 ) = 0;
virtual bool getGlyphInfo( lUInt32 code, glyph_info_t * glyph, lChar16 def_char=0, bool is_fallback=false ) = 0;

/** \brief measure text
\param text is text string pointer
Expand Down Expand Up @@ -365,7 +367,7 @@ class LVFont : public LVRefCounter
\param code is unicode character
\return glyph pointer if glyph was found, NULL otherwise
*/
virtual LVFontGlyphCacheItem * getGlyph(lUInt32 ch, lChar16 def_char=0) = 0;
virtual LVFontGlyphCacheItem * getGlyph(lUInt32 ch, lChar16 def_char=0, bool is_fallback=false) = 0;

/// returns font baseline offset
virtual int getBaseline() = 0;
Expand Down Expand Up @@ -436,6 +438,11 @@ class LVFont : public LVRefCounter
virtual void setFallbackFont( LVProtectedFastRef<LVFont> font ) { CR_UNUSED(font); }
/// get fallback font for this font
LVFont * getFallbackFont() { return NULL; }

/// set next fallback font for this font (for when used as a fallback font)
virtual void setNextFallbackFont( LVProtectedFastRef<LVFont> font ) { CR_UNUSED(font); }
/// get next fallback font for this font (when already used as a fallback font)
LVFont * getNextFallbackFont() { return NULL; }
};

typedef LVProtectedFastRef<LVFont> LVFontRef;
Expand Down Expand Up @@ -496,14 +503,14 @@ class LVFontManager
/// returns most similar font
virtual LVFontRef GetFont(int size, int weight, bool italic, css_font_family_t family, lString8 typeface,
int features=0, int documentId = -1, bool useBias=false) = 0;
/// set fallback font face (returns true if specified font is found)
virtual bool SetFallbackFontFace( lString8 face ) { CR_UNUSED(face); return false; }
/// get fallback font face (returns empty string if no fallback font is set)
virtual lString8 GetFallbackFontFace() { return lString8::empty_str; }
/// set fallback font faces (separated by '|')
virtual bool SetFallbackFontFaces( lString8 facesString ) { CR_UNUSED(facesString); return false; }
/// get fallback font faces string (returns empty string if no fallback font is set)
virtual lString8 GetFallbackFontFaces() { return lString8::empty_str; }
/// returns fallback font for specified size
virtual LVFontRef GetFallbackFont(int /*size*/) { return LVFontRef(); }
/// returns fallback font for specified size, weight and italic
virtual LVFontRef GetFallbackFont(int size, int weight=400, bool italic=false ) { return LVFontRef(); }
virtual LVFontRef GetFallbackFont(int size, int weight=400, bool italic=false, lString8 forFaceName=lString8::empty_str ) { return LVFontRef(); }
/// registers font by name
virtual bool RegisterFont( lString8 name ) = 0;
/// registers font by name and face
Expand Down Expand Up @@ -592,7 +599,7 @@ class LBitmapFont : public LVBaseFont
lvfont_handle m_font;
public:
LBitmapFont() : m_font(NULL) { }
virtual bool getGlyphInfo( lUInt32 code, LVFont::glyph_info_t * glyph, lChar16 def_char=0 );
virtual bool getGlyphInfo( lUInt32 code, LVFont::glyph_info_t * glyph, lChar16 def_char=0, bool is_fallback=false );
virtual lUInt16 measureText(
const lChar16 * text, int len,
lUInt16 * widths,
Expand All @@ -612,7 +619,7 @@ class LBitmapFont : public LVBaseFont
virtual lUInt32 getTextWidth(
const lChar16 * text, int len, TextLangCfg * lang_cfg=NULL
);
virtual LVFontGlyphCacheItem * getGlyph(lUInt32 ch, lChar16 def_char=0);
virtual LVFontGlyphCacheItem * getGlyph(lUInt32 ch, lChar16 def_char=0, bool is_fallback=false);
/// returns font baseline offset
virtual int getBaseline();
/// returns font height
Expand Down Expand Up @@ -727,7 +734,7 @@ class LVBaseWin32Font : public LVBaseFont
return css_ff_inherit;
}

virtual LVFontGlyphCacheItem * getGlyph(lUInt32 ch, lChar16 def_char=0) {
virtual LVFontGlyphCacheItem * getGlyph(lUInt32 ch, lChar16 def_char=0, bool is_fallback=false) {
return NULL;
}

Expand All @@ -750,7 +757,7 @@ class LVWin32DrawFont : public LVBaseWin32Font
\param glyph is pointer to glyph_info_t struct to place retrieved info
\return true if glyh was found
*/
virtual bool getGlyphInfo( lUInt32 code, glyph_info_t * glyph, lChar16 def_char=0 );
virtual bool getGlyphInfo( lUInt32 code, glyph_info_t * glyph, lChar16 def_char=0, bool is_fallback=false );

/** \brief measure text
\param glyph is pointer to glyph_info_t struct to place retrieved info
Expand Down Expand Up @@ -930,7 +937,7 @@ class LVWin32Font : public LVBaseWin32Font
\param glyph is pointer to glyph_info_t struct to place retrieved info
\return true if glyh was found
*/
virtual bool getGlyphInfo( lUInt32 code, glyph_info_t * glyph, lChar16 def_char=0 );
virtual bool getGlyphInfo( lUInt32 code, glyph_info_t * glyph, lChar16 def_char=0, bool is_fallback=false );

/** \brief measure text
\param glyph is pointer to glyph_info_t struct to place retrieved info
Expand Down
5 changes: 1 addition & 4 deletions crengine/include/textlang.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,10 @@
#endif

#if USE_LIBUNIBREAK==1
#include <linebreak.h>
// linebreakdef.h is not wrapped by this, unlike linebreak.h
// (not wrapping results in "undefined symbol" with the original
// function name kinda obfuscated)
#ifdef __cplusplus
extern "C" {
#endif
#include <linebreak.h>
#include <linebreakdef.h>
#ifdef __cplusplus
}
Expand Down
12 changes: 6 additions & 6 deletions crengine/src/lvdocview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6307,12 +6307,12 @@ CRPropRef LVDocView::propsApply(CRPropRef props) {
} else if (name == PROP_FONT_FACE) {
setDefaultFontFace(UnicodeToUtf8(value));
} else if (name == PROP_FALLBACK_FONT_FACE) {
lString8 oldFace = fontMan->GetFallbackFontFace();
if ( UnicodeToUtf8(value)!=oldFace )
fontMan->SetFallbackFontFace(UnicodeToUtf8(value));
value = Utf8ToUnicode(fontMan->GetFallbackFontFace());
if ( UnicodeToUtf8(value) != oldFace ) {
REQUEST_RENDER("propsApply fallback font face")
lString8 oldFaces = fontMan->GetFallbackFontFaces();
if ( UnicodeToUtf8(value)!=oldFaces )
fontMan->SetFallbackFontFaces(UnicodeToUtf8(value));
value = Utf8ToUnicode(fontMan->GetFallbackFontFaces());
if ( UnicodeToUtf8(value) != oldFaces ) {
REQUEST_RENDER("propsApply fallback font faces")
}
} else if (name == PROP_STATUS_FONT_FACE) {
setStatusFontFace(UnicodeToUtf8(value));
Expand Down
Loading