You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2012/01/19 22:26:08 UTC
svn commit: r1233577 - in /incubator/ooo/trunk: ext_sources/ main/
main/more_fonts/fonts/ttf_croscore/ main/more_fonts/prj/
main/scp2/source/ooo/
Author: pfg
Date: Thu Jan 19 21:26:07 2012
New Revision: 1233577
URL: http://svn.apache.org/viewvc?rev=1233577&view=rev
Log:
Bring in Google Chrome OS fonts.
Tinos, Arimo and Cousine are replacements for the most common fonts
available on commercial Operating Systems. They are available under
the SIL OpenFont license.
Added:
incubator/ooo/trunk/ext_sources/61f59e4110781cbe66b46449eadac231-croscorefonts-1.21.0.tar.gz (with props)
incubator/ooo/trunk/main/more_fonts/fonts/ttf_croscore/
incubator/ooo/trunk/main/more_fonts/fonts/ttf_croscore/makefile.mk
Modified:
incubator/ooo/trunk/main/NOTICE
incubator/ooo/trunk/main/more_fonts/prj/build.lst
incubator/ooo/trunk/main/more_fonts/prj/d.lst
incubator/ooo/trunk/main/ooo.lst
incubator/ooo/trunk/main/scp2/source/ooo/file_font_ooo.scp
Added: incubator/ooo/trunk/ext_sources/61f59e4110781cbe66b46449eadac231-croscorefonts-1.21.0.tar.gz
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_sources/61f59e4110781cbe66b46449eadac231-croscorefonts-1.21.0.tar.gz?rev=1233577&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/ooo/trunk/ext_sources/61f59e4110781cbe66b46449eadac231-croscorefonts-1.21.0.tar.gz
------------------------------------------------------------------------------
svn:mime-type = application/x-gzip
Modified: incubator/ooo/trunk/main/NOTICE
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/NOTICE?rev=1233577&r1=1233576&r2=1233577&view=diff
==============================================================================
--- incubator/ooo/trunk/main/NOTICE (original)
+++ incubator/ooo/trunk/main/NOTICE Thu Jan 19 21:26:07 2012
@@ -114,3 +114,6 @@ available under the SIL OpenFont License
code can be downloaded here:
http://scripts.sil.org/cms/scripts/page.php?item_id=Gentium_basic
+Also for convenience we hava available a set of fonts developed by
+Google Inc. for ChromeOS available under the OFL in this site:
+ http://gsdview.appspot.com/chromeos-localmirror/distfiles/
Added: incubator/ooo/trunk/main/more_fonts/fonts/ttf_croscore/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/more_fonts/fonts/ttf_croscore/makefile.mk?rev=1233577&view=auto
==============================================================================
--- incubator/ooo/trunk/main/more_fonts/fonts/ttf_croscore/makefile.mk (added)
+++ incubator/ooo/trunk/main/more_fonts/fonts/ttf_croscore/makefile.mk Thu Jan 19 21:26:07 2012
@@ -0,0 +1,54 @@
+#**************************************************************
+#
+# 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_croscore
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=croscorefonts-1.21.0
+TARFILE_MD5=61f59e4110781cbe66b46449eadac231
+TARFILE_ROOTDIR=.
+
+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=1233577&r1=1233576&r2=1233577&view=diff
==============================================================================
--- incubator/ooo/trunk/main/more_fonts/prj/build.lst (original)
+++ incubator/ooo/trunk/main/more_fonts/prj/build.lst Thu Jan 19 21:26:07 2012
@@ -1,3 +1,4 @@
bs more_fonts : solenv NULL
bs more_fonts\fonts\ttf_dejavu nmake - all deja_fonts NULL
+bs more_fonts\fonts\ttf_croscore nmake - all cros_fonts NULL
bs more_fonts\fonts\ttf_gentium nmake - all gent_fonts NULL
Modified: incubator/ooo/trunk/main/more_fonts/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/more_fonts/prj/d.lst?rev=1233577&r1=1233576&r2=1233577&view=diff
==============================================================================
--- incubator/ooo/trunk/main/more_fonts/prj/d.lst (original)
+++ incubator/ooo/trunk/main/more_fonts/prj/d.lst Thu Jan 19 21:26:07 2012
@@ -3,6 +3,7 @@ mkdir: %COMMON_DEST%\pck%_EXT%
# TODO: replace explicit versions by wildcard when the build system learns to handle them
..\%__SRC%\misc\build\dejavu-fonts-ttf-2.33\ttf\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
..\%__SRC%\misc\build\dejavu-fonts-ttf-2.33\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu
+..\%__SRC%\misc\build\croscorefonts-1.21.0\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
+..\%__SRC%\misc\build\croscorefonts-1.21.0\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_croscorefonts
..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt %COMMON_DEST%\pck%_EXT%\LICENSE_gentium
-
Modified: incubator/ooo/trunk/main/ooo.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ooo.lst?rev=1233577&r1=1233576&r2=1233577&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ooo.lst (original)
+++ incubator/ooo/trunk/main/ooo.lst Thu Jan 19 21:26:07 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
+61f59e4110781cbe66b46449eadac231-croscorefonts-1.21.0.tar.gz
35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
68dd2e8253d9a7930e9fd50e2d7220d0-hunspell-1.2.9.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=1233577&r1=1233576&r2=1233577&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 Thu Jan 19 21:26:07 2012
@@ -74,6 +74,46 @@ STD_FONT_FILE( gid_File_Fnt_DejaVuSerifC
STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuSerifCondensed-BoldItalic.ttf, DejaVu Serif Condensed Bold Italic)
#endif
+// Google ChromeOS fonts
+
+// Arimo
+#ifndef WITHOUT_FONTS
+STD_FONT_FILE( gid_File_Fnt_Arimo_Regular, Arimo-Regular.ttf, Arimo Regular)
+STD_FONT_FILE( gid_File_Fnt_Arimo_Bold, Arimo-Bold.ttf, Arimo Bold)
+STD_FONT_FILE( gid_File_Fnt_Arimo_Italic, Arimo-Italic.ttf, Arimo Italic)
+STD_FONT_FILE( gid_File_Fnt_Arimo_BoldItalic, Arimo-BoldItalic.ttf, Arimo Bold Italic)
+#endif
+
+// Cousine
+#ifndef WITHOUT_FONTS
+#ifndef WNT
+STD_FONT_FILE( gid_File_Fnt_Cousine_Regular, Cousine-Regular.ttf, Liberation Mono Regular)
+STD_FONT_FILE( gid_File_Fnt_Cousine_Bold, Cousine-Bold.ttf, Liberation Mono Bold)
+STD_FONT_FILE( gid_File_Fnt_Cousine_Italic, Cousine-Italic.ttf, Liberation Mono Italic)
+STD_FONT_FILE( gid_File_Fnt_Cousine_BoldItalic, Cousine-BoldItalic.ttf, Liberation Mono Bold Italic)
+#endif
+#endif
+
+// Timos
+#ifndef WITHOUT_FONTS
+#ifndef WNT
+STD_FONT_FILE( gid_File_Fnt_Timos_Regular, Timos-Regular.ttf, Liberation Serif Regular)
+STD_FONT_FILE( gid_File_Fnt_Timos_Bold, Timos-Bold.ttf, Liberation Serif Bold)
+STD_FONT_FILE( gid_File_Fnt_Timos_Italic, Timos-Italic.ttf, Liberation Serif Italic)
+STD_FONT_FILE( gid_File_Fnt_Timos_BoldItalic, Timos-BoldItalic.ttf, Liberation Serif Bold Italic)
+#endif
+#endif
+
+// Symbol Neu
+#ifndef WITHOUT_FONTS
+#ifndef WNT
+STD_FONT_FILE( gid_File_Fnt_SymbolNeu, SymbolNeu.ttf, Symbol Neu)
+#endif
+#endif
+
+
+
+
// Gentium fonts
#ifndef WITHOUT_FONTS