diff options
| author | Stefan Knorr <heinzlesspam@gmail.com> | 2012-11-02 14:58:41 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-11-08 21:04:16 +0000 |
| commit | 84ba49c55dccdd619d46e588162fb62dc31b287f (patch) | |
| tree | f31558f2fec02655c185a8447fef2fd5b8969304 /scp2 | |
| parent | f66e86f302a4ab0d0862079bdab3b506733c897f (diff) | |
Add more fonts
(PT Serif, Source Code Pro and Souce Sans Pro under OFL; Open Sans
under ALv2)
Change-Id: Ic783f0d5841cafce6dba60213b0a658978ff2cfd
Reviewed-on: https://gerrit.libreoffice.org/1007
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_font_ooo.scp | 36 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 16 |
2 files changed, 51 insertions, 1 deletions
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index 104f32ceb922..0781dfc046d3 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -143,6 +143,42 @@ STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Bold, LinBiolinum_RB_G.ttf, Linux Bio STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Italic, LinBiolinum_RI_G.ttf, Linux Biolinum G Italic) #endif +// PT Serif fonts + +#ifndef WITHOUT_FONTS +STD_FONT_FILE( gid_File_Fnt_PtSerif_Regular, PT_Serif-Web-Regular.ttf, PT Serif Regular) +STD_FONT_FILE( gid_File_Fnt_PtSerif_Bold, PT_Serif-Web-Bold.ttf, PT Serif Bold) +STD_FONT_FILE( gid_File_Fnt_PtSerif_Italic, PT_Serif-Web-Italic.ttf, PT Serif Italic) +STD_FONT_FILE( gid_File_Fnt_PtSerif_BoldItalic, PT_Serif-Web-BoldItalic.ttf, PT Serif Bold Italic) +#endif + +// Open Sans fonts + +#ifndef WITHOUT_FONTS +STD_FONT_FILE( gid_File_Fnt_OpenSans_Regular, OpenSans-Regular.ttf, Open Sans Regular) +STD_FONT_FILE( gid_File_Fnt_OpenSans_Bold, OpenSans-Bold.ttf, Open Sans Bold) +STD_FONT_FILE( gid_File_Fnt_OpenSans_Italic, OpenSans-Italic.ttf, Open Sans Italic) +STD_FONT_FILE( gid_File_Fnt_OpenSans_BoldItalic, OpenSans-BoldItalic.ttf, Open Sans Bold Italic) +#endif + + +// Source Sans Pro fonts + +#ifndef WITHOUT_FONTS +STD_FONT_FILE( gid_File_Fnt_SourceSans_Regular, SourceSansPro-Regular.ttf, Source Sans Pro Regular) +STD_FONT_FILE( gid_File_Fnt_SourceSans_Bold, SourceSansPro-Bold.ttf, Source Sans Pro Bold) +STD_FONT_FILE( gid_File_Fnt_SourceSans_Italic, SourceSansPro-Italic.ttf, Source Sans Pro Italic) +STD_FONT_FILE( gid_File_Fnt_SourceSans_BoldItalic, SourceSansPro-BoldItalic.ttf, Source Sans Pro Bold Italic) +#endif + + +// Source Code Pro fonts + +#ifndef WITHOUT_FONTS +STD_FONT_FILE( gid_File_Fnt_SourceCode_Regular, SourceCodePro-Regular.ttf, Source Code Pro Regular) +STD_FONT_FILE( gid_File_Fnt_SourceCode_Bold, SourceCodePro-Bold.ttf, Source Code Pro Bold) +#endif + // fontconfig updates to allow proper use of local fonts #ifdef UNX diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index beefae616e8a..435b157d26fb 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -765,7 +765,21 @@ Module gid_Module_Root_Fonts_OOo_Hidden gid_File_Fnt_LiberationSerif_Bold, gid_File_Fnt_LiberationSerif_BoldItalic, gid_File_Fnt_LiberationSerif_Italic, - gid_File_Fnt_LiberationSerif_Regular); + gid_File_Fnt_LiberationSerif_Regular + gid_File_Fnt_PtSerif_Regular + gid_File_Fnt_PtSerif_Bold + gid_File_Fnt_PtSerif_Italic + gid_File_Fnt_PtSerif_BoldItalic + gid_File_Fnt_OpenSans_Regular + gid_File_Fnt_OpenSans_Bold + gid_File_Fnt_OpenSans_Italic + gid_File_Fnt_OpenSans_BoldItalic + gid_File_Fnt_SourceSans_Regular + gid_File_Fnt_SourceSans_Bold + gid_File_Fnt_SourceSans_Italic + gid_File_Fnt_SourceSans_BoldItalic + gid_File_Fnt_SourceCode_Regular + gid_File_Fnt_SourceCode_Bold); End #endif |