diff options
| author | Pedro Giffuni <pfg@apache.org> | 2015-12-29 18:13:44 +0000 |
|---|---|---|
| committer | Pedro Giffuni <pfg@apache.org> | 2015-12-29 18:13:44 +0000 |
| commit | 7436d7726b0142a253c63de64e532ae426f8d30b (patch) | |
| tree | 3e9d5c2a832e3fe01348dc689a7f80b6387a5639 /scp2 | |
| parent | c5b77f1a39d31b456334d7d584cbb1184542e24c (diff) | |
Optionally bring new crosextra font: Carlito
Carlito is a modern, friendly sans-serif font, metric-compatible with
Microsoft's Calibri font. Carlito comes in regular, bold, italic, and bold
italic. The family covers Latin-Greek-Cyrillic (not a complete set,
though) with about 2,000 glyphs.
Designed by Lukasz Dziedzic available under Open Font License.
____
In general it's a bad practice to bring new features/fonts under
a Category B license: in this case we do it purely for compatibility
with other office suites and we apply the regular rules for Category B.
Notes
Notes:
prefer: bde5e683286096b9255254b28a862e519d57f547
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_font_ooo.scp | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index 9dc81bfb0273..87a819b8bd51 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -97,21 +97,17 @@ STD_FONT_FILE( gid_File_Fnt_Caladea_BoldItalic, Caladea-BoldItalic.ttf, Caladea #endif // WITH_CATA_FONTS -// fontconfig updates to allow proper use of local fonts +#ifdef WITH_CATB_FONTS -#ifdef UNX -File gid_File_FcLocal_Conf - Dir = gid_Dir_Fonts_Truetype; - USER_FILE_BODY; -// Styles = (); - Name = "fc_local.conf"; -End -#endif +// Carlito fonts +STD_FONT_FILE( gid_File_Fnt_Carlito_Regular, Carlito-Regular.ttf, Carlito Regular) +STD_FONT_FILE( gid_File_Fnt_Carlito_Bold, Carlito-Bold.ttf, Carlito Bold) +STD_FONT_FILE( gid_File_Fnt_Carlito_Italic, Carlito-Italic.ttf, Carlito Italic) +STD_FONT_FILE( gid_File_Fnt_Carlito_BoldItalic, Carlito-BoldItalic.ttf, Carlito Bold Italic) -// Gentium fonts -#ifdef WITH_CATB_FONTS +// Gentium fonts STD_FONT_FILE( gid_File_Fnt_GentiumBasicRegular, GenBasR.ttf, Gentium Basic) STD_FONT_FILE( gid_File_Fnt_GentiumBasicBold, GenBasB.ttf, Gentium Basic Bold) @@ -123,5 +119,15 @@ STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBold, GenBkBasB.ttf, Gentium Book Ba STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicItalic, GenBkBasI.ttf, Gentium Book Basic Bold) STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium Book Basic Bold Italic) -#endif +#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 |