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.

1 files changed, 20 insertions, 18 deletions

diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index 63da849a081e..9dc81bfb0273 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/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
-