Bring new crosextra font: Caladea

Caladea is a modern Latin typeface inspired by the contrast, style and
ornaments of Khmer typefaces and writing styles. Its main objective is to
be used to write Latin texts in a Khmer context, but it is also an elegant
choice for all kinds of texts.

Designed by Carolina Giovagnoli and Andres Torresi
for Huerta Tipografica under an Apache 2.0 License.
____

This is specially interesting as it is metrically compatible with
MS Cambria.

While here sort out some issues:
- Sadly, we don't really carry an equivalent for "Arial Narrow".
- There is not need for Arimo in the Windows platform.

external_deps.lst

@@ -245,6 +245,12 @@ if (WITH_CATA_FONTS==YES)
     URL1 = http://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name)
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
+if (WITH_CATA_FONTS==YES)
+    MD5 = 368f114c078f94214a308a74c7e991bc
+    name = crosextrafonts-20130214.tar.gz
+    URL1 = http://gsdview.appspot.com/chromeos-localmirror/distfiles/$(name)
+    URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
+
 if ( true )
     MD5 = fdb27bfe2dbe2e7b57ae194d9bf36bab
     name = SampleICC-1.3.2.tar.gz

more_fonts/fonts/fc_local.conf

@@ -25,19 +25,21 @@
 	<!-- Alias similar/metric-compatible families from various sources: -->
 
 	<alias binding="same">
-	  <family>Arimo</family>
-	  <default>
-	  <family>Arial Narrow</family>
-	  </default>
+	  <family>Caladea</family>
+	  <accept>
+	  <family>Cambria</family>
+	  </accept>
 	</alias>
 
 <!-- -->
+
 	<alias binding="same">
-	  <family>Arial Narrow</family>
+	  <family>Cambria</family>
 	  <accept>
-	  <family>Arimo</family>
+	  <family>Caladea</family>
 	  </accept>
 	</alias>
+
 <!-- -->
 
 </fontconfig>

more_fonts/fonts/ttf_crosextra/makefile.mk

+#**************************************************************
+#  
+#  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_crosextra
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+.IF "$(WITH_CATA_FONTS)" != "YES"
+
+@all:
+    @echo "category A licensed CrossCore font is disabled."
+
+.ELSE
+
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=crosextrafonts-20130214
+TARFILE_MD5=368f114c078f94214a308a74c7e991bc
+
+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

more_fonts/prj/build.lst

 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_gentium	nmake	-	all	gent_fonts NULL

more_fonts/prj/d.lst

@@ -4,5 +4,6 @@ mkdir: %COMMON_DEST%\pck%_EXT%
 ..\%__SRC%\misc\build\dejavu-fonts-ttf-2.35\ttf\*.ttf	%COMMON_DEST%\pck%_EXT%\*.ttf
 ..\%__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\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

scp2/source/ooo/file_font_ooo.scp

@@ -62,12 +62,11 @@ STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed, DejaVuSerifCondensed.ttf, Deja
 STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Bold, DejaVuSerifCondensed-Bold.ttf, DejaVu Serif Condensed Bold) 
 STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Italic, DejaVuSerifCondensed-Italic.ttf, DejaVu Serif Condensed Italic) 
 STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuSerifCondensed-BoldItalic.ttf, DejaVu Serif Condensed Bold Italic) 
-#endif // WITH_CATA_FONTS
 
 
 // Google ChromeOS fonts
 
-#ifdef WITH_CATA_FONTS
+#ifndef WNT 
 
 // Arimo
 STD_FONT_FILE( gid_File_Fnt_Arimo_Regular, Arimo-Regular.ttf, Arimo Regular) 
@@ -75,18 +74,6 @@ 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) 
 
-#ifdef UNX
-File gid_File_FcLocal_Conf
-    Dir = gid_Dir_Fonts_Truetype;
-    USER_FILE_BODY;
-//  Styles = ();
-    Name = "fc_local.conf";
-End
-#endif
-
-
-#ifndef WNT 
-
 // Cousine
 STD_FONT_FILE( gid_File_Fnt_Cousine_Regular, Cousine-Regular.ttf, Cousine Regular) 
 STD_FONT_FILE( gid_File_Fnt_Cousine_Bold, Cousine-Bold.ttf, Cousine Bold) 
@@ -99,10 +86,27 @@ STD_FONT_FILE( gid_File_Fnt_Tinos_Bold, Tinos-Bold.ttf, Tinos Bold)
 STD_FONT_FILE( gid_File_Fnt_Tinos_Italic, Tinos-Italic.ttf, Tinos Italic)
 STD_FONT_FILE( gid_File_Fnt_Tinos_BoldItalic, Tinos-BoldItalic.ttf, Tinos Bold Italic)
 
-#endif // WNT
+#endif // !WNT
 
-#endif // WITH_CATB_FONTS
+// Caladea
+STD_FONT_FILE( gid_File_Fnt_Caladea_Regular, Caladea-Regular.ttf, Caladea Regular)
+STD_FONT_FILE( gid_File_Fnt_Caladea_Bold, Caladea-Bold.ttf, Caladea Bold)
+STD_FONT_FILE( gid_File_Fnt_Caladea_Italic, Caladea-Italic.ttf, Caladea Italic)
+STD_FONT_FILE( gid_File_Fnt_Caladea_BoldItalic, Caladea-BoldItalic.ttf, Caladea Bold Italic)
 
+#endif // WITH_CATA_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
 
 
 // Gentium fonts
@@ -121,5 +125,3 @@ STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium
 
 #endif
 
-// fontconfig updates to allow proper use of local fonts
-