Author: pfg
Date: Wed Jan 18 19:41:52 2012
New Revision: 1233015
URL: http://svn.apache.org/viewvc?rev=1233015&view=rev
Log:
Bring back the Gentium Basic fonts. These are under SIL OFL, and have been
temptatively classified as Category-B for now but this may have to be revised
or eventually reverted.
Added:
incubator/ooo/trunk/ext_sources/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
(with props)
incubator/ooo/trunk/main/more_fonts/fonts/ttf_gentium/
incubator/ooo/trunk/main/more_fonts/fonts/ttf_gentium/makefile.mk
Modified:
incubator/ooo/trunk/main/NOTICE
incubator/ooo/trunk/main/more_fonts/prj/build.lst
incubator/ooo/trunk/main/ooo.lst
incubator/ooo/trunk/main/scp2/source/ooo/file_font_ooo.scp
Added:
incubator/ooo/trunk/ext_sources/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_sources/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip?rev=1233015&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/ooo/trunk/ext_sources/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
------------------------------------------------------------------------------
svn:mime-type = application/zip
Modified: incubator/ooo/trunk/main/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/NOTICE?rev=1233015&r1=1233014&r2=1233015&view=diff
==============================================================================
--- incubator/ooo/trunk/main/NOTICE (original)
+++ incubator/ooo/trunk/main/NOTICE Wed Jan 18 19:41:52 2012
@@ -108,3 +108,9 @@ Project available under the MPL here:
Document signing can be provided by Mozilla's Network Security
Services (NSS). The NSS sources are available here:
ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_6_RTM/src/
+
+For convenience we optionally include the Gentium Basic fonts,
+available under the SIL OpenFont License (OFL). The source
+code can be downloaded here:
+ http://scripts.sil.org/cms/scripts/page.php?item_id=Gentium_basic
+
Added: incubator/ooo/trunk/main/more_fonts/fonts/ttf_gentium/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/more_fonts/fonts/ttf_gentium/makefile.mk?rev=1233015&view=auto
==============================================================================
--- incubator/ooo/trunk/main/more_fonts/fonts/ttf_gentium/makefile.mk (added)
+++ incubator/ooo/trunk/main/more_fonts/fonts/ttf_gentium/makefile.mk Wed Jan
18 19:41:52 2012
@@ -0,0 +1,57 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+PRJ=..$/..
+
+PRJNAME=more_fonts
+TARGET=ttf_gentium
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=gentiumbasic-fonts-1.10
+TARFILE_MD5=35efabc239af896dfb79be7ebdd6e6b9
+TARFILE_ROOTDIR=gentiumbasic-fonts-1.10
+
+PATCH_FILES=
+
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=
+
+BUILD_DIR=
+BUILD_ACTION=
+BUILD_FLAGS=
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+
+.IF "$(WITH_FONTS)"!="NO"
+.INCLUDE : tg_ext.mk
+.ENDIF
+
Modified: incubator/ooo/trunk/main/more_fonts/prj/build.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/more_fonts/prj/build.lst?rev=1233015&r1=1233014&r2=1233015&view=diff
==============================================================================
--- incubator/ooo/trunk/main/more_fonts/prj/build.lst (original)
+++ incubator/ooo/trunk/main/more_fonts/prj/build.lst Wed Jan 18 19:41:52 2012
@@ -1,3 +1,3 @@
bs more_fonts : solenv NULL
bs more_fonts\fonts\ttf_dejavu nmake - all
deja_fonts NULL
-
+bs more_fonts\fonts\ttf_gentium nmake - all gent_fonts NULL
Modified: incubator/ooo/trunk/main/ooo.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ooo.lst?rev=1233015&r1=1233014&r2=1233015&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ooo.lst (original)
+++ incubator/ooo/trunk/main/ooo.lst Wed Jan 18 19:41:52 2012
@@ -45,6 +45,7 @@ a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c
c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
# Libraries with category B license
+35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
68dd2e8253d9a7930e9fd50e2d7220d0-hunspell-1.2.9.tar.gz
48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz
Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_font_ooo.scp
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_font_ooo.scp?rev=1233015&r1=1233014&r2=1233015&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_font_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_font_ooo.scp Wed Jan 18
19:41:52 2012
@@ -74,7 +74,21 @@ STD_FONT_FILE( gid_File_Fnt_DejaVuSerifC
STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic,
DejaVuSerifCondensed-BoldItalic.ttf, DejaVu Serif Condensed Bold Italic)
#endif
+// Gentium fonts
+#ifndef WITHOUT_FONTS
+STD_FONT_FILE( gid_File_Fnt_GentiumBasicRegular, GenBasR.ttf, Gentium Basic)
+STD_FONT_FILE( gid_File_Fnt_GentiumBasicBold, GenBasB.ttf, Gentium Basic Bold)
+STD_FONT_FILE( gid_File_Fnt_GentiumBasicItalic, GenBasI.ttf, Gentium Basic
Bold)
+STD_FONT_FILE( gid_File_Fnt_GentiumBasicBoldItalic, GenBasBI.ttf, Gentium
Basic Bold Italic)
+#endif
+
+#ifndef WITHOUT_FONTS
+STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicRegular, GenBkBasR.ttf, Gentium
Book Basic)
+STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBold, GenBkBasB.ttf, Gentium Book
Basic Bold)
+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
// fontconfig updates to allow proper use of local fonts
