Skip to content

C
core
Kaydet (Commit) b89cd99a authored tarafından Pedro Giffuni's avatar Pedro Giffuni
Dosyalara gözat
Seçenekler

Rearrange the fonts installation. 

Disabling the fonts was causing issues with fc_local.conf
üst 1cc4adfc
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 10 deletions
scp2/source/ooo/file_font_ooo.scp
Dosyayı görüntüle @ b89cd99a
......@@ -62,9 +62,11 @@ STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed, DejaVuSerifCondensed.ttf, Deja
STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Bold, DejaVuSerifCondensed-Bold.ttf, DejaVu Serif Condensed Bold)
STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Italic, DejaVuSerifCondensed-Italic.ttf, DejaVu Serif Condensed Italic)
STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuSerifCondensed-BoldItalic.ttf, DejaVu Serif Condensed Bold Italic)
#endif // WITH_CATA_FONTS
// Google ChromeOS fonts
#ifdef WITH_CATA_FONTS
#ifndef WNT
......@@ -94,6 +96,17 @@ STD_FONT_FILE( gid_File_Fnt_Caladea_Bold, Caladea-Bold.ttf, Caladea Bold)
STD_FONT_FILE( gid_File_Fnt_Caladea_Italic, Caladea-Italic.ttf, Caladea Italic)
STD_FONT_FILE( gid_File_Fnt_Caladea_BoldItalic, Caladea-BoldItalic.ttf, Caladea Bold Italic)
// fontconfig updates to allow proper use of local fonts
#ifdef UNX
File gid_File_FcLocal_Conf
Dir = gid_Dir_Fonts_Truetype;
USER_FILE_BODY;
// Styles = ();
Name = "fc_local.conf";
End
#endif
#endif // WITH_CATA_FONTS
......@@ -121,13 +134,3 @@ STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium
#endif // WITH_CATB_FONTS
// fontconfig updates to allow proper use of local fonts
#ifdef UNX
File gid_File_FcLocal_Conf
Dir = gid_Dir_Fonts_Truetype;
USER_FILE_BODY;
// Styles = ();
Name = "fc_local.conf";
End
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment