ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Add more fonts

Browse Source 
(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>
This commit is contained in:
Stefan Knorr
2012-11-08 21:04:16 +00:00
committed by Andras Timar
parent f66e86f302
commit 84ba49c55d
14 changed files with 217 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config_host.mk.in
+4
View File
@@ -191,6 +191,10 @@ export FONT_LIBERATION_NARROW_TARBALL=@FONT_LIBERATION_NARROW_TARBALL@
export FONT_LIBERATION_TARBALL=@FONT_LIBERATION_TARBALL@
export FONT_GENTIUM_TARBALL=@FONT_GENTIUM_TARBALL@
export FONT_DEJAVU_TARBALL=@FONT_DEJAVU_TARBALL@
export FONT_PTSERIF_TARBALL=@FONT_PTSERIF_TARBALL@
export FONT_OPENSANS_TARBALL=@FONT_OPENSANS_TARBALL@
export FONT_SOURCESANS_TARBALL=@FONT_SOURCESANS_TARBALL@
export FONT_SOURCECODE_TARBALL=@FONT_SOURCECODE_TARBALL@
export FONTCONFIG_CFLAGS=@FONTCONFIG_CFLAGS@
export FONTCONFIG_LIBS=@FONTCONFIG_LIBS@
export FONTCONFIG_TARBALL=@FONTCONFIG_TARBALL@
configure.ac
+12
View File
@@ -11137,6 +11137,10 @@ if test "$with_fonts" != "no"; then
FONT_LIBERATION_NARROW_TARBALL="0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz"
FONT_LIBERATION_TARBALL="5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz"
FONT_LINLIBERTINEG_TARBALL="e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"
FONT_OPENSANS_TARBALL="7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz"
FONT_PTSERIF_TARBALL="c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz"
FONT_SOURCECODE_TARBALL="0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz"
FONT_SOURCESANS_TARBALL="1e9ddfe25ac9577da709d7b2ea36f939-source-sans-font-1.036.tar.gz"
else
AC_MSG_RESULT([no])
WITH_FONTS=NO
@@ -11146,12 +11150,20 @@ else
FONT_LIBERATION_NARROW_TARBALL=
FONT_LIBERATION_TARBALL=
FONT_LINLIBERTINEG_TARBALL=
FONT_OPENSANS_TARBALL=
FONT_PTSERIF_TARBALL=
FONT_SOURCECODE_TARBALL=
FONT_SOURCESANS_TARBALL=
fi
AC_SUBST(FONT_DEJAVU_TARBALL)
AC_SUBST(FONT_GENTIUM_TARBALL)
AC_SUBST(FONT_LIBERATION_TARBALL)
AC_SUBST(FONT_LINLIBERTINEG_TARBALL)
AC_SUBST(FONT_LIBERATION_NARROW_TARBALL)
AC_SUBST(FONT_OPENSANS_TARBALL)
AC_SUBST(FONT_PTSERIF_TARBALL)
AC_SUBST(FONT_SOURCECODE_TARBALL)
AC_SUBST(FONT_SOURCESANS_TARBALL)
AC_SUBST(WITH_FONTS)
more_fonts/ExternalPackage_opensans.mk
+21
View File
@@ -0,0 +1,21 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_ExternalPackage_ExternalPackage,font_opensans_inc,font_opensans))
$(eval $(call gb_ExternalPackage_add_unpacked_files,font_opensans_inc,pck,\
OpenSans-BoldItalic.ttf \
OpenSans-Bold.ttf \
OpenSans-Italic.ttf \
OpenSans-Regular.ttf \
))
$(eval $(call gb_ExternalPackage_add_unpacked_file,font_opensans_inc,pck/License_opensans.txt,LICENSE.txt))
# vim: set noet sw=4 ts=4:
more_fonts/ExternalPackage_ptserif.mk
+21
View File
@@ -0,0 +1,21 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_ExternalPackage_ExternalPackage,font_ptserif_inc,font_ptserif))
$(eval $(call gb_ExternalPackage_add_unpacked_files,font_ptserif_inc,pck,\
PT_Serif-Web-BoldItalic.ttf \
PT_Serif-Web-Bold.ttf \
PT_Serif-Web-Italic.ttf \
PT_Serif-Web-Regular.ttf \
))
$(eval $(call gb_ExternalPackage_add_unpacked_file,font_ptserif_inc,pck/License_ptserif.txt,OFL.txt))
# vim: set noet sw=4 ts=4:
more_fonts/ExternalPackage_sourcecode.mk
+19
View File
@@ -0,0 +1,19 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_ExternalPackage_ExternalPackage,font_sourcecode_inc,font_sourcecode))
$(eval $(call gb_ExternalPackage_add_unpacked_files,font_sourcecode_inc,pck,\
SourceCodePro-Bold.ttf \
SourceCodePro-Regular.ttf \
))
$(eval $(call gb_ExternalPackage_add_unpacked_file,font_sourcecode_inc,pck/License_sourcecode.txt,OFL.txt))
# vim: set noet sw=4 ts=4:
more_fonts/ExternalPackage_sourcesans.mk
+21
View File
@@ -0,0 +1,21 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_ExternalPackage_ExternalPackage,font_sourcesans_inc,font_sourcesans))
$(eval $(call gb_ExternalPackage_add_unpacked_files,font_sourcesans_inc,pck,\
SourceSansPro-BoldItalic.ttf \
SourceSansPro-Bold.ttf \
SourceSansPro-Italic.ttf \
SourceSansPro-Regular.ttf \
))
$(eval $(call gb_ExternalPackage_add_unpacked_file,font_sourcesans_inc,pck/License_sourcesans.txt,OFL.txt))
# vim: set noet sw=4 ts=4:
more_fonts/Module_more_fonts.mk
+8
View File
@@ -16,11 +16,19 @@ $(eval $(call gb_Module_add_targets,more_fonts,\
ExternalPackage_liberation \
ExternalPackage_liberation_narrow \
ExternalPackage_libertineg \
ExternalPackage_opensans \
ExternalPackage_ptserif \
ExternalPackage_sourcecode \
ExternalPackage_sourcesans \
UnpackedTarball_dejavu \
UnpackedTarball_gentium \
UnpackedTarball_liberation \
UnpackedTarball_liberation_narrow \
UnpackedTarball_libertineg \
UnpackedTarball_opensans \
UnpackedTarball_ptserif \
UnpackedTarball_sourcecode \
UnpackedTarball_sourcesans \
))
# vim: set noet sw=4 ts=4:
more_fonts/UnpackedTarball_opensans.mk
+14
View File
@@ -0,0 +1,14 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_opensans))
$(eval $(call gb_UnpackedTarball_set_tarball,font_opensans,$(FONT_OPENSANS_TARBALL)))
# vim: set noet sw=4 ts=4:
more_fonts/UnpackedTarball_ptserif.mk
+14
View File
@@ -0,0 +1,14 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_ptserif))
$(eval $(call gb_UnpackedTarball_set_tarball,font_ptserif,$(FONT_PTSERIF_TARBALL)))
# vim: set noet sw=4 ts=4:
more_fonts/UnpackedTarball_sourcecode.mk
+14
View File
@@ -0,0 +1,14 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_sourcecode))
$(eval $(call gb_UnpackedTarball_set_tarball,font_sourcecode,$(FONT_SOURCECODE_TARBALL)))
# vim: set noet sw=4 ts=4:
more_fonts/UnpackedTarball_sourcesans.mk
+14
View File
@@ -0,0 +1,14 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_UnpackedTarball_UnpackedTarball,font_sourcesans))
$(eval $(call gb_UnpackedTarball_set_tarball,font_sourcesans,$(FONT_SOURCESANS_TARBALL)))
# vim: set noet sw=4 ts=4:
ooo.lst.in
+4
View File
@@ -25,6 +25,10 @@ c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
@FONT_LIBERATION_NARROW_TARBALL@
@FONT_LIBERATION_TARBALL@
@FONT_LINLIBERTINEG_TARBALL@
@FONT_PTSERIF_TARBALL@
@FONT_OPENSANS_TARBALL@
@FONT_SOURCESANS_TARBALL@
@FONT_SOURCECODE_TARBALL@
@FONTCONFIG_TARBALL@
@FREETYPE_TARBALL@
@GOOGLE_DOCS_EXTENSION_PACK@
scp2/source/ooo/file_font_ooo.scp
+36
View File
@@ -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
scp2/source/ooo/module_hidden_ooo.scp
+15 -1
View File
@@ -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