install fonts using filelists

Change-Id: I1312908e2039a9836d25ec3a558f9ef78abf177e

extras/Package_fonts.mk

@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Package_Package,extras_fonts,$(SRCDIR)/extras))
 
-$(eval $(call gb_Package_add_file,extras_fonts,pck/opens___.ttf,source/truetype/symbol/opens___.ttf))
+$(eval $(call gb_Package_set_outdir,extras_fonts,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,extras_fonts,share/fonts/truetype/opens___.ttf,source/truetype/symbol/opens___.ttf))
 
 # vim: set noet sw=4 ts=4:

more_fonts/ExternalPackage_dejavu.mk

@@ -9,7 +9,9 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_dejavu,font_dejavu))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_dejavu,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_dejavu,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_dejavu,share/fonts/truetype,\
 	ttf/DejaVuSans-Bold.ttf \
 	ttf/DejaVuSans-BoldOblique.ttf \
 	ttf/DejaVuSans-ExtraLight.ttf \

more_fonts/ExternalPackage_gentium.mk

@@ -9,7 +9,9 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_gentium,font_gentium))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gentium,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_gentium,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gentium,share/fonts/truetype,\
 	GenBasB.ttf \
 	GenBasBI.ttf \
 	GenBasI.ttf \

more_fonts/ExternalPackage_liberation.mk

@@ -9,7 +9,9 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation,font_liberation))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation,share/fonts/truetype,\
 	LiberationMono-Bold.ttf \
 	LiberationMono-BoldItalic.ttf \
 	LiberationMono-Italic.ttf \

more_fonts/ExternalPackage_liberation_narrow.mk

@@ -9,7 +9,9 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation_narrow,font_liberation_narrow))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation_narrow,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation_narrow,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation_narrow,share/fonts/truetype,\
 	LiberationSansNarrow-Bold.ttf \
 	LiberationSansNarrow-BoldItalic.ttf \
 	LiberationSansNarrow-Italic.ttf \

more_fonts/ExternalPackage_libertineg.mk

@@ -9,7 +9,9 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_libertineg,font_libertineg))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_libertineg,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_libertineg,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_libertineg,share/fonts/truetype,\
 	LinBiolinum_RB_G.ttf \
 	LinBiolinum_RI_G.ttf \
 	LinBiolinum_R_G.ttf \

more_fonts/ExternalPackage_opensans.mk

@@ -9,7 +9,9 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_opensans,font_opensans))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opensans,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_opensans,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opensans,share/fonts/truetype,\
 	OpenSans-BoldItalic.ttf \
 	OpenSans-Bold.ttf \
 	OpenSans-Italic.ttf \

more_fonts/ExternalPackage_ptserif.mk

@@ -9,7 +9,9 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_ptserif,font_ptserif))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_ptserif,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_ptserif,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_ptserif,share/fonts/truetype,\
 	PT_Serif-Web-BoldItalic.ttf \
 	PT_Serif-Web-Bold.ttf \
 	PT_Serif-Web-Italic.ttf \

more_fonts/ExternalPackage_sourcecode.mk

@@ -9,7 +9,9 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcecode,font_sourcecode))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcecode,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcecode,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcecode,share/fonts/truetype,\
 	SourceCodePro-Bold.ttf \
 	SourceCodePro-Regular.ttf \
 ))

more_fonts/ExternalPackage_sourcesans.mk

@@ -9,7 +9,9 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcesans,font_sourcesans))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcesans,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,share/fonts/truetype,\
 	SourceSansPro-BoldItalic.ttf \
 	SourceSansPro-Bold.ttf \
 	SourceSansPro-Italic.ttf \

more_fonts/Package_conf.mk

@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Package_Package,more_fonts_conf,$(SRCDIR)/more_fonts/fonts))
 
-$(eval $(call gb_Package_add_file,more_fonts_conf,pck/fc_local.conf,fc_local.conf))
+$(eval $(call gb_Package_set_outdir,more_fonts_conf,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,more_fonts_conf,share/fonts/truetype/fc_local.conf,fc_local.conf))
 
 # vim: set noet sw=4 ts=4:

scp2/inc/macros.inc

@@ -141,6 +141,14 @@
         Styles    = (PACKED, FONT_WARN_IF_EXISTS); \
         Name      = STRING(name) ; \
     End
+
+#define STD_FONT_FILELIST(id,name) \
+    File id \
+        TXT_FILE_BODY; \
+        Dir       = FILELIST_DIR; \
+        Styles    = (FILELIST, PACKED, FONT_WARN_IF_EXISTS); \
+        Name      = name; \
+    End
 #endif
 
 #ifdef WNT
@@ -152,6 +160,14 @@
         Name     = STRING(name) ; \
         NetDir   = gid_Dir_Winfonts; \
     End
+
+#define STD_FONT_FILELIST(id,name) \
+    File id \
+        TXT_FILE_BODY; \
+        Dir       = FILELIST_DIR; \
+        Styles   = (FILELIST,PACKED,FONT,DONT_DELETE,FONT_WARN_IF_EXISTS); \
+        Name      = name; \
+    End
 #endif
 
 #define STD_JAR_FILE(id,name) \

scp2/source/ooo/file_font_ooo.scp

@@ -29,154 +29,35 @@
 
 // OpenSymbol
 
-STD_FONT_FILE( gid_File_Fnt_Opensymb, opens___.ttf, OpenSymbol)
+STD_FONT_FILELIST( gid_File_Fnt_Opensymb, "extras_fonts.filelist" )
 
-// DejaVu fonts
-
-// DejaVuSans Proportional
-#ifndef WITHOUT_FONTS 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSans, DejaVuSans.ttf, DejaVu Sans) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Bold, DejaVuSans-Bold.ttf, DejaVu Sans Bold) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Oblique, DejaVuSans-Oblique.ttf, DejaVu Sans Oblique) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSans_BoldOblique, DejaVuSans-BoldOblique.ttf, DejaVu Sans Bold Oblique) 
-#endif 
-
-// DejaVuSans ExtraLight
 #ifndef WITHOUT_FONTS 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansExtraLight, DejaVuSans-ExtraLight.ttf, DejaVu Sans ExtraLight) 
-#endif
-
-// DejaVuSans Condensed
-#ifndef WITHOUT_FONTS 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed, DejaVuSansCondensed.ttf, DejaVu Sans Condensed) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Bold, DejaVuSansCondensed-Bold.ttf, DejaVu Sans Condensed Bold) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Oblique, DejaVuSansCondensed-Oblique.ttf, DejaVu Sans Condensed Oblique) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_BoldOblique, DejaVuSansCondensed-BoldOblique.ttf, DejaVu Sans Condensed Bold Oblique) 
-#endif 
-
-// DejaVuSans Mono
-#ifndef WITHOUT_FONTS 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono, DejaVuSansMono.ttf, DejaVu Sans Mono) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Bold, DejaVuSansMono-Bold.ttf, DejaVu Sans Mono Bold) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Oblique, DejaVuSansMono-Oblique.ttf, DejaVu Sans Mono Oblique) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_BoldOblique, DejaVuSansMono-BoldOblique.ttf, DejaVu Sans Mono Bold Oblique) 
-#endif
-
-// DejaVuSerif Proportional
-#ifndef WITHOUT_FONTS 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSerif, DejaVuSerif.ttf, DejaVu Serif) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Bold, DejaVuSerif-Bold.ttf, DejaVu Serif Bold) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Italic, DejaVuSerif-Italic.ttf, DejaVu Serif Italic) 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_BoldItalic, DejaVuSerif-BoldItalic.ttf, DejaVu Serif Bold Italic) 
-#endif 
-
-// DejaVuSerif Condensed
-#ifndef WITHOUT_FONTS 
-STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed, DejaVuSerifCondensed.ttf, DejaVu Serif Condensed) 
-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 
 
+// DejaVu fonts
+STD_FONT_FILELIST(gid_File_Fnt_DejaVu, "fonts_dejavu.filelist")
 
 // Liberation fonts
-
-// Liberation Sans Narrow
-#ifndef WITHOUT_FONTS 
-STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Regular, LiberationSansNarrow-Regular.ttf, Liberation Sans Narrow Regular) 
-STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Bold, LiberationSansNarrow-Bold.ttf, Liberation Sans Narrow Bold) 
-STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Italic, LiberationSansNarrow-Italic.ttf, Liberation Sans Narrow Italic) 
-STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_BoldItalic, LiberationSansNarrow-BoldItalic.ttf, Liberation Sans Narrow Bold Italic) 
-#endif
-
-// Liberation Mono
-#ifndef WITHOUT_FONTS 
-STD_FONT_FILE( gid_File_Fnt_LiberationMono_Regular, LiberationMono-Regular.ttf, Liberation Mono Regular) 
-STD_FONT_FILE( gid_File_Fnt_LiberationMono_Bold, LiberationMono-Bold.ttf, Liberation Mono Bold) 
-STD_FONT_FILE( gid_File_Fnt_LiberationMono_Italic, LiberationMono-Italic.ttf, Liberation Mono Italic) 
-STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic.ttf, Liberation Mono Bold Italic) 
-#endif
-
-// Liberation Sans
-#ifndef WITHOUT_FONTS 
-STD_FONT_FILE( gid_File_Fnt_LiberationSans_Regular, LiberationSans-Regular.ttf, Liberation Sans Regular) 
-STD_FONT_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, Liberation Sans Italic) 
-STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Sans Bold) 
-STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic.ttf, Liberation Sans Bold Italic) 
-#endif
-
-// Liberation Serif
-#ifndef WITHOUT_FONTS 
-STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Regular, LiberationSerif-Regular.ttf, Liberation Serif Regular) 
-STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Bold, LiberationSerif-Bold.ttf, Liberation Serif Bold) 
-STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Italic, LiberationSerif-Italic.ttf, Liberation Serif Italic) 
-STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic) 
-#endif
+STD_FONT_FILELIST(gid_File_Fnt_LibSansNarrow, "fonts_liberation_narrow.filelist")
+STD_FONT_FILELIST(gid_File_Fnt_Liberation, "fonts_liberation.filelist")
 
 // 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 
+STD_FONT_FILELIST(gid_File_Fnt_Gentium, "fonts_gentium.filelist")
 
 // Linux Libertine G and Linux Biolinum G fonts
-
-#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Regular, LinLibertine_R_G.ttf, Linux Libertine G Regular)
-STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Semibold, LinLibertine_RZ_G.ttf, Linux Libertine G Semibold)
-STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Bold, LinLibertine_RB_G.ttf, Linux Libertine G Bold)
-STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Italic, LinLibertine_RI_G.ttf, Linux Libertine G Italic)
-STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_SemiboldItalic, LinLibertine_RZI_G.ttf, Linux Libertine G Semibold Italic)
-STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_BoldItalic, LinLibertine_RBI_G.ttf, Linux Libertine G Bold Italic)
-STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Regular, LinBiolinum_R_G.ttf, Linux Biolinum G Regular)
-STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Bold, LinBiolinum_RB_G.ttf, Linux Biolinum G Bold)
-STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Italic, LinBiolinum_RI_G.ttf, Linux Biolinum G Italic)
-#endif
+STD_FONT_FILELIST(gid_File_Fnt_LinuxLibertineG, "fonts_libertineg.filelist")
 
 // PT Serif fonts
-
-#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_PtSerif_Regular, PT_Serif-Web-Regular.ttf, PT Serif Regular)
-STD_FONT_FILE( gid_File_Fnt_PtSerif_Bold, PT_Serif-Web-Bold.ttf, PT Serif Bold)
-STD_FONT_FILE( gid_File_Fnt_PtSerif_Italic, PT_Serif-Web-Italic.ttf, PT Serif Italic)
-STD_FONT_FILE( gid_File_Fnt_PtSerif_BoldItalic, PT_Serif-Web-BoldItalic.ttf, PT Serif Bold Italic)
-#endif
+STD_FONT_FILELIST(gid_File_Fnt_PtSerif, "fonts_ptserif.filelist")
 
 // Open Sans fonts
-
-#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_OpenSans_Regular, OpenSans-Regular.ttf, Open Sans Regular)
-STD_FONT_FILE( gid_File_Fnt_OpenSans_Bold, OpenSans-Bold.ttf, Open Sans Bold)
-STD_FONT_FILE( gid_File_Fnt_OpenSans_Italic, OpenSans-Italic.ttf, Open Sans Italic)
-STD_FONT_FILE( gid_File_Fnt_OpenSans_BoldItalic, OpenSans-BoldItalic.ttf, Open Sans Bold Italic)
-#endif
-
+STD_FONT_FILELIST(gid_File_Fnt_OpenSans, "fonts_opensans.filelist")
 
 // Source Sans Pro fonts
-
-#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_SourceSans_Regular, SourceSansPro-Regular.ttf, Source Sans Pro Regular)
-STD_FONT_FILE( gid_File_Fnt_SourceSans_Bold, SourceSansPro-Bold.ttf, Source Sans Pro Bold)
-STD_FONT_FILE( gid_File_Fnt_SourceSans_Italic, SourceSansPro-Italic.ttf, Source Sans Pro Italic)
-STD_FONT_FILE( gid_File_Fnt_SourceSans_BoldItalic, SourceSansPro-BoldItalic.ttf, Source Sans Pro Bold Italic)
-#endif
-
+STD_FONT_FILELIST(gid_File_Fnt_SourceSans, "fonts_sourcesans.filelist")
 
 // Source Code Pro fonts
+STD_FONT_FILELIST(gid_File_Fnt_SourceCode, "fonts_sourcecode.filelist")
 
-#ifndef WITHOUT_FONTS
-STD_FONT_FILE( gid_File_Fnt_SourceCode_Regular, SourceCodePro-Regular.ttf, Source Code Pro Regular)
-STD_FONT_FILE( gid_File_Fnt_SourceCode_Bold, SourceCodePro-Bold.ttf, Source Code Pro Bold)
 #endif
 
 // fontconfig updates to allow proper use of local fonts
@@ -184,10 +65,10 @@ STD_FONT_FILE( gid_File_Fnt_SourceCode_Bold, SourceCodePro-Bold.ttf, Source Code
 #ifdef UNX
 #ifndef WITHOUT_FONTS 
 File gid_File_FcLocal_Conf
-    Dir = gid_Dir_Fonts_Truetype;
+    Dir = FILELIST_DIR;
     USER_FILE_BODY;
-//  Styles = ();
-    Name = "fc_local.conf";
+    Styles = (FILELIST);
+    Name = "more_fonts_conf.filelist";
 End
 #endif
 #endif

scp2/source/ooo/module_hidden_ooo.scp

@@ -683,74 +683,15 @@ Module gid_Module_Root_Fonts_OOo_Hidden
 	Default = YES;
 	Styles = (HIDDEN_ROOT);
 	Files = (gid_File_Fnt_Opensymb,
-	gid_File_Fnt_DejaVuSans_Bold,
-	gid_File_Fnt_DejaVuSans_BoldOblique,
-	gid_File_Fnt_DejaVuSans_Oblique,
-	gid_File_Fnt_DejaVuSans,
-	gid_File_Fnt_DejaVuSansCondensed_Bold,
-	gid_File_Fnt_DejaVuSansCondensed_BoldOblique,
-	gid_File_Fnt_DejaVuSansCondensed_Oblique,
-	gid_File_Fnt_DejaVuSansCondensed,
-	gid_File_Fnt_DejaVuSansExtraLight,
-	gid_File_Fnt_DejaVuSansMono_Bold,
-	gid_File_Fnt_DejaVuSansMono_BoldOblique,
-	gid_File_Fnt_DejaVuSansMono_Oblique,
-	gid_File_Fnt_DejaVuSansMono,
-	gid_File_Fnt_DejaVuSerif_Bold,
-	gid_File_Fnt_DejaVuSerif_BoldItalic,
-	gid_File_Fnt_DejaVuSerif_Italic,
-	gid_File_Fnt_DejaVuSerif,
-	gid_File_Fnt_DejaVuSerifCondensed_Bold,
-	gid_File_Fnt_DejaVuSerifCondensed_BoldItalic,
-	gid_File_Fnt_DejaVuSerifCondensed_Italic,
-	gid_File_Fnt_DejaVuSerifCondensed,
-	gid_File_Fnt_GentiumBasicRegular,
-	gid_File_Fnt_GentiumBasicBold,
-	gid_File_Fnt_GentiumBasicItalic,
-	gid_File_Fnt_GentiumBasicBoldItalic,
-	gid_File_Fnt_GentiumBookBasicRegular,
-	gid_File_Fnt_GentiumBookBasicBold,
-	gid_File_Fnt_GentiumBookBasicItalic,
-	gid_File_Fnt_GentiumBookBasicBoldItalic,
-	gid_File_Fnt_LibSansNarrow_Regular, 
-	gid_File_Fnt_LibSansNarrow_Bold,
-	gid_File_Fnt_LibSansNarrow_BoldItalic,
-	gid_File_Fnt_LibSansNarrow_Italic,
-	gid_File_Fnt_LiberationMono_Bold, 
-	gid_File_Fnt_LiberationMono_BoldItalic, 
-	gid_File_Fnt_LiberationMono_Italic,
-	gid_File_Fnt_LiberationMono_Regular, 
-	gid_File_Fnt_LiberationSans_Bold,
-	gid_File_Fnt_LiberationSans_BoldItalic,
-	gid_File_Fnt_LiberationSans_Italic,
-	gid_File_Fnt_LiberationSans_Regular,
-	gid_File_Fnt_LiberationSerif_Bold,
-	gid_File_Fnt_LiberationSerif_BoldItalic,
-	gid_File_Fnt_LiberationSerif_Italic,
-	gid_File_Fnt_LiberationSerif_Regular,
-	gid_File_Fnt_LinuxLibertineG_Regular,
-	gid_File_Fnt_LinuxLibertineG_Semibold,
-	gid_File_Fnt_LinuxLibertineG_Bold,
-	gid_File_Fnt_LinuxLibertineG_Italic,
-	gid_File_Fnt_LinuxLibertineG_SemiboldItalic,
-	gid_File_Fnt_LinuxLibertineG_BoldItalic,
-	gid_File_Fnt_LinuxBiolinumG_Regular,
-	gid_File_Fnt_LinuxBiolinumG_Bold,
-	gid_File_Fnt_LinuxBiolinumG_Italic,
-	gid_File_Fnt_PtSerif_Regular,
-	gid_File_Fnt_PtSerif_Bold,
-	gid_File_Fnt_PtSerif_Italic,
-	gid_File_Fnt_PtSerif_BoldItalic,
-	gid_File_Fnt_OpenSans_Regular,
-	gid_File_Fnt_OpenSans_Bold,
-	gid_File_Fnt_OpenSans_Italic,
-	gid_File_Fnt_OpenSans_BoldItalic,
-	gid_File_Fnt_SourceSans_Regular,
-	gid_File_Fnt_SourceSans_Bold,
-	gid_File_Fnt_SourceSans_Italic,
-	gid_File_Fnt_SourceSans_BoldItalic,
-	gid_File_Fnt_SourceCode_Regular,
-	gid_File_Fnt_SourceCode_Bold,
+	gid_File_Fnt_DejaVu,
+	gid_File_Fnt_Gentium,
+	gid_File_Fnt_LibSansNarrow,
+	gid_File_Fnt_Liberation,
+	gid_File_Fnt_LinuxLibertineG,
+	gid_File_Fnt_PtSerif,
+	gid_File_Fnt_OpenSans,
+	gid_File_Fnt_SourceSans,
+	gid_File_Fnt_SourceCode,
 	gid_File_FcLocal_Conf);
 End
 #endif