Author: pfg
Date: Tue Dec 29 18:13:44 2015
New Revision: 1722202
URL: http://svn.apache.org/viewvc?rev=1722202&view=rev
Log:
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.
Added:
openoffice/trunk/main/more_fonts/fonts/ttf_carlito/
openoffice/trunk/main/more_fonts/fonts/ttf_carlito/makefile.mk
Modified:
openoffice/trunk/main/external_deps.lst
openoffice/trunk/main/more_fonts/fonts/fc_local.conf
openoffice/trunk/main/more_fonts/prj/build.lst
openoffice/trunk/main/more_fonts/prj/d.lst
openoffice/trunk/main/scp2/source/ooo/file_font_ooo.scp
Modified: openoffice/trunk/main/external_deps.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1722202&r1=1722201&r2=1722202&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Tue Dec 29 18:13:44 2015
@@ -279,6 +279,12 @@ if (ENABLE_CATEGORY_B==YES && SYSTEM_COI
# URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
URL1 = http://www.coin-or.org/download/source/CoinMP/$(name)
+if (WITH_CATB_FONTS==YES)
+ MD5 = c74b7223abe75949b4af367942d96c7a
+ name = crosextrafonts-carlito-20130920.tar.gz
+ URL1 = http://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name)
+ URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
+
if (WITH_CATB_FONTS == YES)
MD5 = 35efabc239af896dfb79be7ebdd6e6b9
name = gentiumbasic-fonts-1.10.zip
Modified: openoffice/trunk/main/more_fonts/fonts/fc_local.conf
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/more_fonts/fonts/fc_local.conf?rev=1722202&r1=1722201&r2=1722202&view=diff
==============================================================================
--- openoffice/trunk/main/more_fonts/fonts/fc_local.conf (original)
+++ openoffice/trunk/main/more_fonts/fonts/fc_local.conf Tue Dec 29 18:13:44
2015
@@ -30,6 +30,12 @@
<family>Cambria</family>
</accept>
</alias>
+ <alias binding="same">
+ <family>Carlito</family>
+ <accept>
+ <family>Colibri</family>
+ </accept>
+ </alias>
<!-- -->
@@ -39,6 +45,12 @@
<family>Caladea</family>
</accept>
</alias>
+ <alias binding="same">
+ <family>Colibri</family>
+ <accept>
+ <family>Carlito</family>
+ </accept>
+ </alias>
<!-- -->
Added: openoffice/trunk/main/more_fonts/fonts/ttf_carlito/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/more_fonts/fonts/ttf_carlito/makefile.mk?rev=1722202&view=auto
==============================================================================
--- openoffice/trunk/main/more_fonts/fonts/ttf_carlito/makefile.mk (added)
+++ openoffice/trunk/main/more_fonts/fonts/ttf_carlito/makefile.mk Tue Dec 29
18:13:44 2015
@@ -0,0 +1,64 @@
+#**************************************************************
+#
+# 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_carlito
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+.IF "$(WITH_CATB_FONTS)" != "YES"
+
+@all:
+ @echo "category B licensed Carlito font is disabled."
+
+.ELSE
+
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=crosextrafonts-carlito-20130920
+TARFILE_MD5=c74b7223abe75949b4af367942d96c7a
+
+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
+
+.ENDIF
Modified: openoffice/trunk/main/more_fonts/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/more_fonts/prj/build.lst?rev=1722202&r1=1722201&r2=1722202&view=diff
==============================================================================
--- openoffice/trunk/main/more_fonts/prj/build.lst (original)
+++ openoffice/trunk/main/more_fonts/prj/build.lst Tue Dec 29 18:13:44 2015
@@ -2,4 +2,5 @@ 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_crosextra nmake - all xtra_fonts NULL
+bs more_fonts\fonts\ttf_carlito nmake - all carl_fonts NULL
bs more_fonts\fonts\ttf_gentium nmake - all gent_fonts NULL
Modified: openoffice/trunk/main/more_fonts/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/more_fonts/prj/d.lst?rev=1722202&r1=1722201&r2=1722202&view=diff
==============================================================================
--- openoffice/trunk/main/more_fonts/prj/d.lst (original)
+++ openoffice/trunk/main/more_fonts/prj/d.lst Tue Dec 29 18:13:44 2015
@@ -5,5 +5,6 @@ mkdir: %COMMON_DEST%\pck%_EXT%
..\%__SRC%\misc\build\dejavu-fonts-ttf-2.35\LICENSE
%COMMON_DEST%\pck%_EXT%\LICENSE_dejavu
..\%__SRC%\misc\build\croscorefonts-1.31.0\*.ttf
%COMMON_DEST%\pck%_EXT%\*.ttf
..\%__SRC%\misc\build\crosextrafonts-20130214\*.ttf
%COMMON_DEST%\pck%_EXT%\*.ttf
+..\%__SRC%\misc\build\crosextrafonts-carlito-20130920\*.ttf
%COMMON_DEST%\pck%_EXT%\*.ttf
..\%__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: openoffice/trunk/main/scp2/source/ooo/file_font_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_font_ooo.scp?rev=1722202&r1=1722201&r2=1722202&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_font_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_font_ooo.scp Tue Dec 29 18:13:44
2015
@@ -97,21 +97,17 @@ STD_FONT_FILE( gid_File_Fnt_Caladea_Bold
#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_GentiumBookB
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
