ooo-build r12108 - in trunk: . bin patches/src680 scratch/scp2/source/accessories
- From: szalaik svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r12108 - in trunk: . bin patches/src680 scratch/scp2/source/accessories
- Date: Sat, 5 Apr 2008 09:16:04 +0100 (BST)
Author: szalaik
Date: Sat Apr 5 09:16:03 2008
New Revision: 12108
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12108&view=rev
Log:
2008-04-05 Kalman Szalai - KAMI <kamihir freemail hu>
* patches/src680/dejavu_liberation_packaging_fix.diff: Replace
old DejaVu filenames with new ones. Introduce Liberation fonts
for all platform (not just UNIXes).
* patches/src680/novell-win32-agfa-monotype-fonts.diff: Cosmetic
changes in the first leading lines of the patch.
* scratch/scp2/source/accessories/file_font_accessories.scp
* bin/unpack: Fix DejaVu font delivery in bitstream_vera_fonts
module. Now it is based on the package name if enabled.
* patches/src680/scp2_accessories.diff: Simplify the font assignment
for OxygenOffice Professional's fonts
* scratch/scp2/source/accessories/file_font_accessories.scp: Simplify
the font assignment for OxygenOffice Professional's fonts
* patches/src680/apply
Added:
trunk/patches/src680/dejavu_liberation_packaging_fix.diff
Modified:
trunk/ChangeLog
trunk/bin/unpack
trunk/patches/src680/apply
trunk/patches/src680/novell-win32-agfa-monotype-fonts.diff
trunk/patches/src680/scp2_accessories.diff
trunk/scratch/scp2/source/accessories/file_font_accessories.scp
Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack (original)
+++ trunk/bin/unpack Sat Apr 5 09:16:03 2008
@@ -408,6 +408,11 @@
sed -e "s|TARFILE_NAME=.*$|TARFILE_NAME=$DEJAVU_FONTS_PACK_NAME|" -e "s|TARFILE_ROOTDIR=.*$|TARFILE_ROOTDIR=$DEJAVU_FONTS_PACK_NAME|" $OOBUILDDIR/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk > $OOBUILDDIR/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk.ver
mv $OOBUILDDIR/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk.ver $OOBUILDDIR/bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk
echo "done"
+ echo "Correcting the delivery file of DejaVu Font packages"
+ sed -e "sed -e "s|dejavu-ttf-2.21|$DEJAVU_FONTS_PACK_NAME|" $OOBUILDDIR/bitstream_vera_fonts/prj/d.lst > $OOBUILDDIR/bitstream_vera_fonts/prj/d.lst.ver
+ mv $OOBUILDDIR/bitstream_vera_fonts/prj/d.lst.ver $OOBUILDDIR/bitstream_vera_fonts/prj/d.lst
+ echo "done"
+
fi
if test "x$LIBERATION_FONTS_VER" != "x"; then
Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply (original)
+++ trunk/patches/src680/apply Sat Apr 5 09:16:03 2008
@@ -918,6 +918,10 @@
[ BuildBits ]
+# Following the changed names of DejaVu fonts
+# Add Liberation fonts for all platforms
+dejavu_liberation_packaging_fix.diff, kami
+
novell-win32-agfa-monotype-fonts.diff, tml
# allow to define java target, so the build is usable with the JVM 1.4
@@ -2129,8 +2133,6 @@
ooop-win32-installer-branding.diff
#Update URL added to the OxygenOffice
ooop-update-URL.diff
-#Enable liberation fonts for all
-liberation_font_for_all.diff
# help LCD displays
ooo85470.workspace.cairotext01.diff, ccheney
Added: trunk/patches/src680/dejavu_liberation_packaging_fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/dejavu_liberation_packaging_fix.diff Sat Apr 5 09:16:03 2008
@@ -0,0 +1,186 @@
+--- scp2/source/ooo/file_font_ooo.scp.orig 2008-01-08 16:14:16.000000000 +0100
++++ scp2/source/ooo/file_font_ooo.scp 2008-04-05 09:44:51.000000000 +0200
+@@ -45,54 +45,54 @@
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Bold, DejaVuSansBold.ttf, DejaVu Sans Bold)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Bold, DejaVuSans-Bold.ttf, DejaVu Sans Bold)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Oblique, DejaVuSansOblique.ttf, DejaVu Sans Oblique)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Oblique, DejaVuSans-Oblique.ttf, DejaVu Sans Oblique)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSans_BoldOblique, DejaVuSansBoldOblique.ttf, DejaVu Sans Bold 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, DejaVuSansExtraLight.ttf, DejaVu Sans ExtraLight)
++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, DejaVuCondensedSans.ttf, DejaVu Sans Condensed)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed, DejaVuSansCondensed.ttf, DejaVu Sans Condensed)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Bold, DejaVuCondensedSansBold.ttf, DejaVu Sans Condensed Bold)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Bold, DejaVuSansCondensed-Bold.ttf, DejaVu Sans Condensed Bold)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Oblique, DejaVuCondensedSansOblique.ttf, DejaVu Sans Condensed Oblique)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Oblique, DejaVuSansCondensed-Oblique.ttf, DejaVu Sans Condensed Oblique)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_BoldOblique, DejaVuCondensedSansBoldOblique.ttf, DejaVu Sans Condensed Bold 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, DejaVuMonoSans.ttf, DejaVu Sans Mono)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono, DejaVuSansMono.ttf, DejaVu Sans Mono)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Bold, DejaVuMonoSansBold.ttf, DejaVu Sans Mono Bold)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Bold, DejaVuSansMono-Bold.ttf, DejaVu Sans Mono Bold)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Oblique, DejaVuMonoSansOblique.ttf, DejaVu Sans Mono Oblique)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Oblique, DejaVuSansMono-Oblique.ttf, DejaVu Sans Mono Oblique)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_BoldOblique, DejaVuMonoSansBoldOblique.ttf, DejaVu Sans Mono Bold Oblique)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_BoldOblique, DejaVuSansMono-BoldOblique.ttf, DejaVu Sans Mono Bold Oblique)
+ #endif
+
+ // DejaVuSerif Proportional
+@@ -101,32 +101,32 @@
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Bold, DejaVuSerifBold.ttf, DejaVu Serif Bold)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Bold, DejaVuSerif-Bold.ttf, DejaVu Serif Bold)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Italic, DejaVuSerifItalic.ttf, DejaVu Serif Italic)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Italic, DejaVuSerif-Italic.ttf, DejaVu Serif Italic)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_BoldItalic, DejaVuSerifBoldItalic.ttf, DejaVu Serif Bold 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, DejaVuCondensedSerif.ttf, DejaVu Serif Condensed)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed, DejaVuSerifCondensed.ttf, DejaVu Serif Condensed)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Bold, DejaVuCondensedSerifBold.ttf, DejaVu Serif Condensed Bold)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Bold, DejaVuSerifCondensed-Bold.ttf, DejaVu Serif Condensed Bold)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Italic, DejaVuCondensedSerifItalic.ttf, DejaVu Serif Condensed Italic)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Italic, DejaVuSerifCondensed-Italic.ttf, DejaVu Serif Condensed Italic)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuCondensedSerifBoldItalic.ttf, DejaVu Serif Condensed Bold Italic)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuSerifCondensed-BoldItalic.ttf, DejaVu Serif Condensed Bold Italic)
+ #endif
+
+
+@@ -134,75 +134,52 @@
+
+ // Liberation Mono
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationMono_Regular, LiberationMono-Regular.ttf, Liberation Mono Regular)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationMono_Bold, LiberationMono-Bold.ttf, Liberation Mono Bold)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationMono_Italic, LiberationMono-Italic.ttf, Liberation Mono Italic)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic.ttf, Liberation Mono Bold Italic)
+ #endif
+-#endif
+
+ // Liberation Sans
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSans_Regular, LiberationSans-Regular.ttf, Liberation Sans Regular)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, Liberation Sans Italic)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Serif Bold)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic.ttf, Liberation Sans Bold Italic)
+ #endif
+-#endif
+
+ // Liberation Serif
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Regular, LiberationSerif-Regular.ttf, Liberation Serif Regular)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Bold, LiberationSerif-Bold.ttf, Liberation Serif Bold)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Italic, LiberationSerif-Italic.ttf, Liberation Serif Italic)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic)
+ #endif
+-#endif
++
Modified: trunk/patches/src680/novell-win32-agfa-monotype-fonts.diff
==============================================================================
--- trunk/patches/src680/novell-win32-agfa-monotype-fonts.diff (original)
+++ trunk/patches/src680/novell-win32-agfa-monotype-fonts.diff Sat Apr 5 09:16:03 2008
@@ -126,9 +126,9 @@
--- scp2/source/ooo/file_font_ooo.scp.OLD 2005-09-09 04:37:10.000000000 +0300
+++ scp2/source/ooo/file_font_ooo.scp 2005-11-23 05:08:35.375000000 +0200
@@ -151,3 +151,31 @@
- STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic)
- #endif
- #endif
+STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic)
+#endif
+
+
+#ifdef WNT
+#ifdef WITH_AGFA_MONOTYPE_FONTS
Modified: trunk/patches/src680/scp2_accessories.diff
==============================================================================
--- trunk/patches/src680/scp2_accessories.diff (original)
+++ trunk/patches/src680/scp2_accessories.diff Sat Apr 5 09:16:03 2008
@@ -57,9 +57,9 @@
+ Name = "basicsrvooowikipedia.zip";
+End
diff -Naur scp2/source/accessories/file_font_accessories.scp scp2/source/accessories/file_font_accessories.scp
---- scp2/source/accessories/file_font_accessories.scp 1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/file_font_accessories.scp 2008-03-23 23:48:46.000000000 +0100
-@@ -0,0 +1,1792 @@
+--- scp2/source/accessories/file_font_accessories.scp.orig 1970-01-01 01:00:00.000000000 +0100
++++ scp2/source/accessories/file_font_accessories.scp 2008-04-05 09:24:30.000000000 +0200
+@@ -0,0 +1,769 @@
+/*************************************************************************
+*
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -98,1759 +98,736 @@
+#include "macros.inc"
+
+/* Airmole font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_airmole, airmole.ttf, Airmole )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_airmole, airmole.ttf, Airmole )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_airmole, airmole.ttf, Airmole )
+#endif
+
+/* Airmole Antique font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_airmolea, airmolea.ttf, Airmole Antique )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_airmolea, airmolea.ttf, Airmole Antique )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_airmolea, airmolea.ttf, Airmole Antique )
+#endif
+
+/* Airmole Shaded font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_airmoles, airmoles.ttf, Airmole Shaded )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_airmoles, airmoles.ttf, Airmole Shaded )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_airmoles, airmoles.ttf, Airmole Shaded )
+#endif
+
+/* Airmole Stripe font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_airmoleq, airmoleq.ttf, Airmole Stripe )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_airmoleq, airmoleq.ttf, Airmole Stripe )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_airmoleq, airmoleq.ttf, Airmole Stripe )
+#endif
+
+/* Astron Boy font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_astronbo, astronbo.ttf, Astron Boy )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_astronbo, astronbo.ttf, Astron Boy )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_astronbo, astronbo.ttf, Astron Boy )
+#endif
+
+/* Astron Boy Italic font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_astronbi, astronbi.ttf, Astron Boy Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_astronbi, astronbi.ttf, Astron Boy Italic )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_astronbi, astronbi.ttf, Astron Boy Italic )
+#endif
+
+/* Astron Boy Video font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_astronbv, astronbv.ttf, Astron Boy Video )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_astronbv, astronbv.ttf, Astron Boy Video )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_astronbv, astronbv.ttf, Astron Boy Video )
+#endif
+
+/* Astron Boy Wonder font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_astronbw, astronbw.ttf, Astron Boy Wonder )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_astronbw, astronbw.ttf, Astron Boy Wonder )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_astronbw, astronbw.ttf, Astron Boy Wonder )
+#endif
+
+/* Baveuse font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_baveuse, baveuse.ttf, Baveuse )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_baveuse, baveuse.ttf, Baveuse )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_baveuse, baveuse.ttf, Baveuse )
+#endif
+
+/* Berylium font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_Berylium, Berylium.ttf, Berylium )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_Berylium, Berylium.ttf, Berylium )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_Berylium, Berylium.ttf, Berylium )
+#endif
+
+/* Berylium Bold font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_Beryliub, Beryliub.ttf, Berylium Bold )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_Beryliub, Beryliub.ttf, Berylium Bold )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_Beryliub, Beryliub.ttf, Berylium Bold )
+#endif
+
+/* Berylium Bold Italic font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_Berylibi, Berylibi.ttf, Berylium Bold Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_Berylibi, Berylibi.ttf, Berylium Bold Italic )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_Berylibi, Berylibi.ttf, Berylium Bold Italic )
+#endif
+
+/* Berylium Italic font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_Beryliui, Beryliui.ttf, Berylium Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_Beryliui, Beryliui.ttf, Berylium Italic )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_Beryliui, Beryliui.ttf, Berylium Italic )
+#endif
+
+/* Betsy Flanagan 2 font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_BETSY2, BETSY2.ttf, Betsy Flanagan 2 )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_BETSY2, BETSY2.ttf, Betsy Flanagan 2 )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_BETSY2, BETSY2.ttf, Betsy Flanagan 2 )
+#endif
+
+/* Blue Highway font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_bluehigh, bluehigh.ttf, Blue Highway )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_bluehigh, bluehigh.ttf, Blue Highway )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_bluehigh, bluehigh.ttf, Blue Highway )
+#endif
+
+/* Blue Highway Bold font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_bluebold, bluebold.ttf, Blue Highway Bold )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_bluebold, bluebold.ttf, Blue Highway Bold )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_bluebold, bluebold.ttf, Blue Highway Bold )
+#endif
+
+/* Blue Highway Condensed font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_bluecond, bluecond.ttf, Blue Highway Condensed )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_bluecond, bluecond.ttf, Blue Highway Condensed )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_bluecond, bluecond.ttf, Blue Highway Condensed )
+#endif
+
+/* Blue Highway Linocut font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_bluehigl, bluehigl.ttf, Blue Highway Linocut )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_bluehigl, bluehigl.ttf, Blue Highway Linocut )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_bluehigl, bluehigl.ttf, Blue Highway Linocut )
+#endif
+
+/* Bullpen font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_bullpen_, bullpen_.ttf, Bullpen )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_bullpen_, bullpen_.ttf, Bullpen )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_bullpen_, bullpen_.ttf, Bullpen )
+#endif
+
+/* Bullpen 3D font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_bullpen3, bullpen3.ttf, Bullpen 3D )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_bullpen3, bullpen3.ttf, Bullpen 3D )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_bullpen3, bullpen3.ttf, Bullpen 3D )
+#endif
+
+/* Bullpen Italic font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_bullpeni, bullpeni.ttf, Bullpen Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_bullpeni, bullpeni.ttf, Bullpen Italic )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_bullpeni, bullpeni.ttf, Bullpen Italic )
+#endif
+
+/* Colourbars font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_colourba, colourba.ttf, Colourbars )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_colourba, colourba.ttf, Colourbars )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_colourba, colourba.ttf, Colourbars )
+#endif
+
+/* Colourbars Bold font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_colourbb, colourbb.ttf, Colourbars Bold )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_colourbb, colourbb.ttf, Colourbars Bold )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_colourbb, colourbb.ttf, Colourbars Bold )
+#endif
+
+/* Counterscraps font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_counters, counters.ttf, Counterscraps )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_counters, counters.ttf, Counterscraps )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_counters, counters.ttf, Counterscraps )
+#endif
+
+/* Credit Valley font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_creditva, creditva.ttf, Credit Valley )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_creditva, creditva.ttf, Credit Valley )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_creditva, creditva.ttf, Credit Valley )
+#endif
+
+/* Credit Valley Bold font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_creditvb, creditvb.ttf, Credit Valley Bold )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_creditvb, creditvb.ttf, Credit Valley Bold )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_creditvb, creditvb.ttf, Credit Valley Bold )
+#endif
+
+/* Credit Valley Bold Italic font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_creditvz, creditvz.ttf, Credit Valley Bold Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_creditvz, creditvz.ttf, Credit Valley Bold Italic )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_creditvz, creditvz.ttf, Credit Valley Bold Italic )
+#endif
+
+/* Credit Valley Italic font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_creditvi, creditvi.ttf, Credit Valley Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_creditvi, creditvi.ttf, Credit Valley Italic )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_creditvi, creditvi.ttf, Credit Valley Italic )
+#endif
+
+/* Edmunds font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_edmunds, edmunds.ttf, Edmunds )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_edmunds, edmunds.ttf, Edmunds )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_edmunds, edmunds.ttf, Edmunds )
+#endif
+
+/* Edmunds Distressed font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_edmundis, edmundis.ttf, Edmunds Distressed )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_edmundis, edmundis.ttf, Edmunds Distressed )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_edmundis, edmundis.ttf, Edmunds Distressed )
+#endif
+
+/* Engebrechtre font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_engeregu, engeregu.ttf, Engebrechtre )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_engeregu, engeregu.ttf, Engebrechtre )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_engeregu, engeregu.ttf, Engebrechtre )
++#endif
+
+/* Engebrechtre Bold font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_engebold, engebold.ttf, Engebrechtre Bold )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_engebold, engebold.ttf, Engebrechtre Bold )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_engebold, engebold.ttf, Engebrechtre Bold )
++#endif
+
+/* Engebrechtre Bold Italic font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_engeboit, engeboit.ttf, Engebrechtre Bold Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_engeboit, engeboit.ttf, Engebrechtre Bold Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_engeboit, engeboit.ttf, Engebrechtre Bold Italic )
++#endif
+
+/* Engebrechtre Expanded font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_engeexpa, engeexpa.ttf, Engebrechtre Expanded )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_engeexpa, engeexpa.ttf, Engebrechtre Expanded )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_engeexpa, engeexpa.ttf, Engebrechtre Expanded )
++#endif
+
+/* Engebrechtre Expanded Bold font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_engeexbo, engeexbo.ttf, Engebrechtre Expanded Bold )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_engeexbo, engeexbo.ttf, Engebrechtre Expanded Bold )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_engeexbo, engeexbo.ttf, Engebrechtre Expanded Bold )
++#endif
+
+/* Engebrechtre Expanded Bold Italic font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_engeexbi, engeexbi.ttf, Engebrechtre Expanded Bold Italic )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_engeexbi, engeexbi.ttf, Engebrechtre Expanded Bold Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_engeexbi, engeexbi.ttf, Engebrechtre Expanded Bold Italic )
++#endif
+
+/* Engebrechtre Expanded Italic font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_engeexit, engeexit.ttf, Engebrechtre Expanded Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_engeexit, engeexit.ttf, Engebrechtre Expanded Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_engeexit, engeexit.ttf, Engebrechtre Expanded Italic )
++#endif
+
+/* Engebrechtre Italic font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_engeital, engeital.ttf, Engebrechtre Italic )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_engeital, engeital.ttf, Engebrechtre Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_engeital, engeital.ttf, Engebrechtre Italic )
++#endif
+
+/* Goodfish font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_goodfish, goodfish.ttf, Goodfish )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_goodfish, goodfish.ttf, Goodfish )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_goodfish, goodfish.ttf, Goodfish )
++#endif
+
+/* Goodfish Bold font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_goodfisb, goodfisb.ttf, Goodfish Bold )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_goodfisb, goodfisb.ttf, Goodfish Bold )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_goodfisb, goodfisb.ttf, Goodfish Bold )
++#endif
+
+/* Goodfish Bold Italic font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_goodfisc, goodfisc.ttf, Goodfish Bold Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_goodfisc, goodfisc.ttf, Goodfish Bold Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_goodfisc, goodfisc.ttf, Goodfish Bold Italic )
++#endif
+
+/* Goodfish Italic font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_goodfisi, goodfisi.ttf, Goodfish Italic )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_goodfisi, goodfisi.ttf, Goodfish Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_goodfisi, goodfisi.ttf, Goodfish Italic )
++#endif
+
+/* Guanine font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_guanine_, guanine_.ttf, Guanine )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_guanine_, guanine_.ttf, Guanine )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_guanine_, guanine_.ttf, Guanine )
++#endif
+
+/* Gunplay font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_gunplay, gunplay.ttf, Gunplay )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_gunplay, gunplay.ttf, Gunplay )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_gunplay, gunplay.ttf, Gunplay )
++#endif
+
+/* Kirsty font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_kirsty__, kirsty__.ttf, Kirsty )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_kirsty__, kirsty__.ttf, Kirsty )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_kirsty__, kirsty__.ttf, Kirsty )
++#endif
+
+/* Kirsty Bold font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_kirsty_b, kirsty_b.ttf, Kirsty Bold )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_kirsty_b, kirsty_b.ttf, Kirsty Bold )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_kirsty_b, kirsty_b.ttf, Kirsty Bold )
++#endif
+
+/* Kirsty Bold Italic font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_kirstybi, kirstybi.ttf, Kirsty Bold Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_kirstybi, kirstybi.ttf, Kirsty Bold Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_kirstybi, kirstybi.ttf, Kirsty Bold Italic )
++#endif
+
+/* Kirsty Italic font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_kirsty_i, kirsty_i.ttf, Kirsty Italic )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_kirsty_i, kirsty_i.ttf, Kirsty Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_kirsty_i, kirsty_i.ttf, Kirsty Italic )
++#endif
+
+/* Kirsty Ink font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_kirstyin, kirstyin.ttf, Kirsty Ink )
-+#endif
-+#endif
-+#ifdef WNT
++STD_FONT_FILE( gid_File_Fnt_kirstyin, kirstyin.ttf, Kirsty Ink )
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_kirstyin, kirstyin.ttf, Kirsty Ink )
-+#endif
-+#endif
+
+/* Mufferaw font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_mufferaw, mufferaw.ttf, Mufferaw )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_mufferaw, mufferaw.ttf, Mufferaw )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_mufferaw, mufferaw.ttf, Mufferaw )
++#endif
+
+/* Nasalization font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_nasaliza, nasaliza.ttf, Nasalization )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_nasaliza, nasaliza.ttf, Nasalization )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_nasaliza, nasaliza.ttf, Nasalization )
++#endif
+
+/* Neuropol font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_NEUROPOL, NEUROPOL.ttf, Neuropol )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_NEUROPOL, NEUROPOL.ttf, Neuropol )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_NEUROPOL, NEUROPOL.ttf, Neuropol )
++#endif
+
+/* Numberpile font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_numberpi, numberpi.ttf, Numberpile )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_numberpi, numberpi.ttf, Numberpile )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_numberpi, numberpi.ttf, Numberpile )
++#endif
+
+/* Pricedown font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_pricedow, pricedow.ttf, Pricedown )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_pricedow, pricedow.ttf, Pricedown )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_pricedow, pricedow.ttf, Pricedown )
++#endif
+
+/* Pupcat font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_pupcat__, pupcat__.ttf, Pupcat )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_pupcat__, pupcat__.ttf, Pupcat )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_pupcat__, pupcat__.ttf, Pupcat )
++#endif
+
+/* Rina font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_rina, rina.ttf, Rina )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_rina, rina.ttf, Rina )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_rina, rina.ttf, Rina )
++#endif
+
+/* Sandoval font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_sandoval, sandoval.ttf, Sandoval )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_sandoval, sandoval.ttf, Sandoval )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_sandoval, sandoval.ttf, Sandoval )
++#endif
+
+/* Sappy Mugs font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_SAPPM___, SAPPM___.ttf, Sappy Mugs )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_SAPPM___, SAPPM___.ttf, Sappy Mugs )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_SAPPM___, SAPPM___.ttf, Sappy Mugs )
++#endif
+
+/* Screengem font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_screenge, screenge.ttf, Screengem )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_screenge, screenge.ttf, Screengem )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_screenge, screenge.ttf, Screengem )
++#endif
+
+/* Steelfish font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_steelfis, steelfis.ttf, Steelfish )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_steelfis, steelfis.ttf, Steelfish )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_steelfis, steelfis.ttf, Steelfish )
++#endif
+
+/* Steelfish Bold font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_steelfib, steelfib.ttf, Steelfish Bold )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_steelfib, steelfib.ttf, Steelfish Bold )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_steelfib, steelfib.ttf, Steelfish Bold )
++#endif
+
+/* Steelfish Outline font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_steelout, steelout.ttf, Steelfish Outline )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_steelout, steelout.ttf, Steelfish Outline )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_steelout, steelout.ttf, Steelfish Outline )
++#endif
+
+/* Strenuous font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_strenuou, strenuou.ttf, Strenuous )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_strenuou, strenuou.ttf, Strenuous )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_strenuou, strenuou.ttf, Strenuous )
++#endif
+
+/* Strenuous 3D font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_strenu3d, strenu3d.ttf, Strenuous 3D )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_strenu3d, strenu3d.ttf, Strenuous 3D )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_strenu3d, strenu3d.ttf, Strenuous 3D )
++#endif
+
+/* Subpear font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_subpear_, subpear_.ttf, Subpear )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_subpear_, subpear_.ttf, Subpear )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_subpear_, subpear_.ttf, Subpear )
++#endif
+
+/* Teen font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_teen____, teen____.ttf, Teen )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_teen____, teen____.ttf, Teen )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_teen____, teen____.ttf, Teen )
++#endif
+
+/* Teen Bold font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_teenbold, teenbold.ttf, Teen Bold )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_teenbold, teenbold.ttf, Teen Bold )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_teenbold, teenbold.ttf, Teen Bold )
++#endif
+
+/* Teen Bold Italic font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_teenbdit, teenbdit.ttf, Teen Bold Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_teenbdit, teenbdit.ttf, Teen Bold Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_teenbdit, teenbdit.ttf, Teen Bold Italic )
++#endif
+
+/* Teen Italic font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_teenital, teenital.ttf, Teen Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_teenital, teenital.ttf, Teen Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_teenital, teenital.ttf, Teen Italic )
++#endif
+
+/* Teen Light font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_teenlite, teenlite.ttf, Teen Light )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_teenlite, teenlite.ttf, Teen Light )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_teenlite, teenlite.ttf, Teen Light )
++#endif
+
+/* Teen Light Italic font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_teenlita, teenlita.ttf, Teen Light Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_teenlita, teenlita.ttf, Teen Light Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_teenlita, teenlita.ttf, Teen Light Italic )
++#endif
+
+/* Typodermic font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_typoderm, typoderm.ttf, Typodermic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_typoderm, typoderm.ttf, Typodermic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_typoderm, typoderm.ttf, Typodermic )
++#endif
+
+/* Vahika font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_vahika_, vahika_.ttf, Vahika )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_vahika_, vahika_.ttf, Vahika )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_vahika_, vahika_.ttf, Vahika )
++#endif
+
+/* Vahika Bold font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_vahikab, vahikab.ttf, Vahika Bold )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_vahikab, vahikab.ttf, Vahika Bold )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_vahikab, vahikab.ttf, Vahika Bold )
++#endif
+
+/* Vahika Bold Italic font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_vahikac, vahikac.ttf, Vahika Bold Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_vahikac, vahikac.ttf, Vahika Bold Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_vahikac, vahikac.ttf, Vahika Bold Italic )
++#endif
+
+/* Vahika Italic font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_vahikai, vahikai.ttf, Vahika Italic )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_vahikai, vahikai.ttf, Vahika Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_vahikai, vahikai.ttf, Vahika Italic )
++#endif
+
+/* Vectroid font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_vectroid, vectroid.ttf, Vectroid )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_vectroid, vectroid.ttf, Vectroid )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_vectroid, vectroid.ttf, Vectroid )
++#endif
+
+/* Velvenda Cooler font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_velvendc, velvendc.ttf, Velvenda Cooler )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_velvendc, velvendc.ttf, Velvenda Cooler )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_velvendc, velvendc.ttf, Velvenda Cooler )
++#endif
+
+/* Velvenda Megablack font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_velvenda, velvenda.ttf, Velvenda Megablack )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_velvenda, velvenda.ttf, Velvenda Megablack )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_velvenda, velvenda.ttf, Velvenda Megablack )
++#endif
+
+/* Vibrocentric font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_vibrocen, vibrocen.ttf, Vibrocentric )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_vibrocen, vibrocen.ttf, Vibrocentric )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_vibrocen, vibrocen.ttf, Vibrocentric )
++#endif
+
+/* Vibrocentric Bold font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_vibroceb, vibroceb.ttf, Vibrocentric Bold )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_vibroceb, vibroceb.ttf, Vibrocentric Bold )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_vibroceb, vibroceb.ttf, Vibrocentric Bold )
++#endif
+
+/* Vibrocentric Bold Italic font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_vibrocex, vibrocex.ttf, Vibrocentric Bold Italic )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_vibrocex, vibrocex.ttf, Vibrocentric Bold Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_vibrocex, vibrocex.ttf, Vibrocentric Bold Italic )
++#endif
+
+/* Vibrocentric Italic font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_vibrocei, vibrocei.ttf, Vibrocentric Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_vibrocei, vibrocei.ttf, Vibrocentric Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_vibrocei, vibrocei.ttf, Vibrocentric Italic )
++#endif
+
+/* Wintermute font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_wintermu, wintermu.ttf, Wintermute )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_wintermu, wintermu.ttf, Wintermute )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_wintermu, wintermu.ttf, Wintermute )
++#endif
+
+/* You're Gone font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_youregon, youregon.ttf, You are Gone )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_youregon, youregon.ttf, You are Gone )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_youregon, youregon.ttf, You are Gone )
++#endif
+
+/* You're Gone Italic font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_youregoi, youregoi.ttf, You are Gone Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_youregoi, youregoi.ttf, You are Gone Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_youregoi, youregoi.ttf, You are Gone Italic )
++#endif
+
+/* Zekton font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_zekton__, zekton__.ttf, Zekton )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_zekton__, zekton__.ttf, Zekton )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_zekton__, zekton__.ttf, Zekton )
++#endif
+
+/* Zekton Bold font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_zektonbo, zektonbo.ttf, Zekton Bold )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_zektonbo, zektonbo.ttf, Zekton Bold )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_zektonbo, zektonbo.ttf, Zekton Bold )
++#endif
+
+/* Zekton Bold Italic font */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_zektonbi, zektonbi.ttf, Zekton Bold Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_zektonbi, zektonbi.ttf, Zekton Bold Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_zektonbi, zektonbi.ttf, Zekton Bold Italic )
++#endif
+
+/* Zekton Italic font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_zektonit, zektonit.ttf, Zekton Italic )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_zektonit, zektonit.ttf, Zekton Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_zektonit, zektonit.ttf, Zekton Italic )
++#endif
+
+/* Zorque font */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_zorque, zorque.ttf, Zorque )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_zorque, zorque.ttf, Zorque )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_zorque, zorque.ttf, Zorque )
+#endif
+
+/* Additional fonts for 2.0.3 */
+
+/* -URW-Gothic L */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Gothic_L_Avantgarde, a010013l.ttf, -URW-Gothic L )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Gothic_L_Avantgarde, a010013l.ttf, -URW-Gothic L )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Gothic_L_Avantgarde, a010013l.ttf, -URW-Gothic L )
++#endif
+
+/* -URW-Gothic L Bold */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Gothic_L_Bold_Avantgarde, a010015l.ttf, -URW-Gothic L Bold )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Gothic_L_Bold_Avantgarde, a010015l.ttf, -URW-Gothic L Bold )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Gothic_L_Bold_Avantgarde, a010015l.ttf, -URW-Gothic L Bold )
++#endif
+
+/* -URW-Gothic L Italic */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Gothic_L_Italic_Avantgarde, a010033l.ttf, -URW-Gothic L Italic )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Gothic_L_Italic_Avantgarde, a010033l.ttf, -URW-Gothic L Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Gothic_L_Italic_Avantgarde, a010033l.ttf, -URW-Gothic L Italic )
++#endif
+
+/* -URW-Gothic L Bold Italic */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Gothic_L_Bold_Italic_Avantgarde, a010035l.ttf, -URW-Gothic L Bold Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Gothic_L_Bold_Italic_Avantgarde, a010035l.ttf, -URW-Gothic L Bold Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Gothic_L_Bold_Italic_Avantgarde, a010035l.ttf, -URW-Gothic L Bold Italic )
++#endif
+
+/* -URW-Bookman L */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Bookman_L_Bookman, b018012l.ttf, -URW-Bookman L )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Bookman_L_Bookman, b018012l.ttf, -URW-Bookman L )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Bookman_L_Bookman, b018012l.ttf, -URW-Bookman L )
++#endif
+
+/* -URW-Bookman L Bold */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Bookman_L_Bold_Bookman, b018015l.ttf, -URW-Bookman L Bold )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Bookman_L_Bold_Bookman, b018015l.ttf, -URW-Bookman L Bold )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Bookman_L_Bold_Bookman, b018015l.ttf, -URW-Bookman L Bold )
++#endif
+
+/* -URW-Bookman L Italic */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Bookman_L_Italic_Bookman, b018032l.ttf, -URW-Bookman L Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Bookman_L_Italic_Bookman, b018032l.ttf, -URW-Bookman L Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Bookman_L_Italic_Bookman, b018032l.ttf, -URW-Bookman L Italic )
++#endif
+
+/* -URW-Bookman L Bold Italic */
-+#ifdef UNX
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Bookman_L_Bold_Italic_Bookman, b018035l.ttf, -URW-Bookman L Bold Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Bookman_L_Bold_Italic_Bookman, b018035l.ttf, -URW-Bookman L Bold Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Bookman_L_Bold_Italic_Bookman, b018035l.ttf, -URW-Bookman L Bold Italic )
++#endif
+
+/* -URW-Century Schoolbook L */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_New_Century_SchoolBook, c059013l.ttf, -URW-Century Schoolbook L )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_New_Century_SchoolBook, c059013l.ttf, -URW-Century Schoolbook L )
-+#endif
-+#endif
-+
-+/* -URW-Century Schoolbook L Bold */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_New_Century_SchoolBook, c059016l.ttf, -URW-Century Schoolbook L Bold )
-+#endif
-+#endif
-+#ifdef WNT
++STD_FONT_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_New_Century_SchoolBook, c059013l.ttf, -URW-Century Schoolbook L )
++#endif
++
++/* -URW-Century Schoolbook L Bold */
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_New_Century_SchoolBook, c059016l.ttf, -URW-Century Schoolbook L Bold )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_New_Century_SchoolBook, c059016l.ttf, -URW-Century Schoolbook L Bold )
++#endif
+
+/* -URW-Century Schoolbook L Italic */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Italic_New_Century_SchoolBook, c059033l.ttf, -URW-Century Schoolbook L Italic )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Italic_New_Century_SchoolBook, c059033l.ttf, -URW-Century Schoolbook L Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Italic_New_Century_SchoolBook, c059033l.ttf, -URW-Century Schoolbook L Italic )
++#endif
+
+/* -URW-Century Schoolbook L Bold Italic */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook, c059036l.ttf, -URW-Century Schoolbook L Bold Italic )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook, c059036l.ttf, -URW-Century Schoolbook L Bold Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook, c059036l.ttf, -URW-Century Schoolbook L Bold Italic )
++#endif
+
+/* -URW-Nimbus Sans L */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica, n019003l.ttf, -URW-Nimbus Sans L )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica, n019003l.ttf, -URW-Nimbus Sans L )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica, n019003l.ttf, -URW-Nimbus Sans L )
++#endif
+
+/* -URW-Nimbus Sans L Bold */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica, n019004l.ttf, -URW-Nimbus Sans L Bold )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica, n019004l.ttf, -URW-Nimbus Sans L Bold )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica, n019004l.ttf, -URW-Nimbus Sans L Bold )
++#endif
+
+/* -URW-Nimbus Sans L Italic */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica, n019023l.ttf, -URW-Nimbus Sans L Italic )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica, n019023l.ttf, -URW-Nimbus Sans L Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica, n019023l.ttf, -URW-Nimbus Sans L Italic )
++#endif
+
+/* -URW-Nimbus Sans L Bold Italic */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica, n019024l.ttf, -URW-Nimbus Sans L Bold Italic )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica, n019024l.ttf, -URW-Nimbus Sans L Bold Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica, n019024l.ttf, -URW-Nimbus Sans L Bold Italic )
++#endif
+
+/* -URW-Nimbus Sans L Condensed */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica_Condensed, n019043l.ttf, -URW-Nimbus Sans L Condensed )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica_Condensed, n019043l.ttf, -URW-Nimbus Sans L Condensed )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica_Condensed, n019043l.ttf, -URW-Nimbus Sans L Condensed )
++#endif
+
+/* -URW-Nimbus Sans L Bold Condensed */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica_Condensed, n019044l.ttf, -URW-Nimbus Sans L Bold Condensed )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica_Condensed, n019044l.ttf, -URW-Nimbus Sans L Bold Condensed )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica_Condensed, n019044l.ttf, -URW-Nimbus Sans L Bold Condensed )
++#endif
+
+/* -URW-Nimbus Sans L Italic Condensed */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica_Condensed, n019063l.ttf, -URW-Nimbus Sans L Italic Condensed )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica_Condensed, n019063l.ttf, -URW-Nimbus Sans L Italic Condensed )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica_Condensed, n019063l.ttf, -URW-Nimbus Sans L Italic Condensed )
++#endif
+
+/* -URW-Nimbus Sans L Bold Italic Condensed */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed, n019064l.ttf, -URW-Nimbus Sans L Bold Italic Condensed )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed, n019064l.ttf, -URW-Nimbus Sans L Bold Italic Condensed )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed, n019064l.ttf, -URW-Nimbus Sans L Bold Italic Condensed )
++#endif
+
+/* -URW-Nimbus Roman No9 L */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Times, n021003l.ttf, -URW-Nimbus Roman No9 L )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Times, n021003l.ttf, -URW-Nimbus Roman No9 L )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Times, n021003l.ttf, -URW-Nimbus Roman No9 L )
++#endif
+
+/* -URW-Nimbus Roman No9 L Bold */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Times, n021004l.ttf, -URW-Nimbus Roman No9 L Bold )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Times, n021004l.ttf, -URW-Nimbus Roman No9 L Bold )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Times, n021004l.ttf, -URW-Nimbus Roman No9 L Bold )
++#endif
+
+/* -URW-Nimbus Roman No9 L Italic */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Italic_Times, n021023l.ttf, -URW-Nimbus Roman No9 L Italic )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Italic_Times, n021023l.ttf, -URW-Nimbus Roman No9 L Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Italic_Times, n021023l.ttf, -URW-Nimbus Roman No9 L Italic )
++#endif
+
+/* -URW-Nimbus Roman No9 L Bold Italic */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Italic_Times, n021024l.ttf, -URW-Nimbus Roman No9 L Bold Italic )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Italic_Times, n021024l.ttf, -URW-Nimbus Roman No9 L Bold Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Italic_Times, n021024l.ttf, -URW-Nimbus Roman No9 L Bold Italic )
++#endif
+
+/* -URW-Nimbus Mono L */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Courier, n022003l.ttf, -URW-Nimbus Mono L )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Courier, n022003l.ttf, -URW-Nimbus Mono L )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Courier, n022003l.ttf, -URW-Nimbus Mono L )
++#endif
+
+/* -URW-Nimbus Mono L Bold */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Courier, n022004l.ttf, -URW-Nimbus Mono L Bold )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Courier, n022004l.ttf, -URW-Nimbus Mono L Bold )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Courier, n022004l.ttf, -URW-Nimbus Mono L Bold )
++#endif
+
+/* -URW-Nimbus Mono LK Italic */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Mono_LK_Italic_Courier, n022023l.ttf, -URW-Nimbus Mono LK Italic )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Mono_LK_Italic_Courier, n022023l.ttf, -URW-Nimbus Mono LK Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Mono_LK_Italic_Courier, n022023l.ttf, -URW-Nimbus Mono LK Italic )
++#endif
+
+/* -URW-Nimbus Mono L Bold Italic */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Italic_Courier, n022024l.ttf, -URW-Nimbus Mono L Bold Italic )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Italic_Courier, n022024l.ttf, -URW-Nimbus Mono L Bold Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Italic_Courier, n022024l.ttf, -URW-Nimbus Mono L Bold Italic )
++#endif
+
+/* -URW-Palladio L */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Palladio_L_Palitino, p052003l.ttf, -URW-Palladio L )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Palladio_L_Palitino, p052003l.ttf, -URW-Palladio L )
++STD_FONT_FILE( gid_File_Fnt_-URW-Palladio_L_Palitino, p052003l.ttf, -URW-Palladio L )
+#endif
-+#endif
+
+/* -URW-Palladio L Bold */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Palladio_L_Bold_Palitino, p052004l.ttf, -URW-Palladio L Bold )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Palladio_L_Bold_Palitino, p052004l.ttf, -URW-Palladio L Bold )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Palladio_L_Bold_Palitino, p052004l.ttf, -URW-Palladio L Bold )
++#endif
+
+/* -URW-Palladio L Italic */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Palladio_L_Italic_Palitino, p052023l.ttf, -URW-Palladio L Italic )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Palladio_L_Italic_Palitino, p052023l.ttf, -URW-Palladio L Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Palladio_L_Italic_Palitino, p052023l.ttf, -URW-Palladio L Italic )
++#endif
+
+/* -URW-Palladio L Bold Italic */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Palladio_L_Bold_Italic_Palitino, p052024l.ttf, -URW-Palladio L Bold Italic )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Palladio_L_Bold_Italic_Palitino, p052024l.ttf, -URW-Palladio L Bold Italic )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Palladio_L_Bold_Italic_Palitino, p052024l.ttf, -URW-Palladio L Bold Italic )
++#endif
+
+/* -URW-Standard Symbols L */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Standard_Symbols_L_Symbol, s050000l.ttf, -URW-Standard Symbols L )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Standard_Symbols_L_Symbol, s050000l.ttf, -URW-Standard Symbols L )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Standard_Symbols_L_Symbol, s050000l.ttf, -URW-Standard Symbols L )
++#endif
+
+/* -URW-Chancery L */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Chancery_L_Zapf_Chancery, z003034l.ttf, -URW-Chancery L )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Chancery_L_Zapf_Chancery, z003034l.ttf, -URW-Chancery L )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_-URW-Chancery_L_Zapf_Chancery, z003034l.ttf, -URW-Chancery L )
++#endif
+
+/* Dingbats */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_Dingbats, d050000l.ttf, Dingbats )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_Dingbats, d050000l.ttf, Dingbats )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_Dingbats, d050000l.ttf, Dingbats )
++#endif
+
+/* Luxi Mono Bold */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Mono_Bold, luximb.ttf, Luxi Mono Bold )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Mono_Bold, luximb.ttf, Luxi Mono Bold )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Bold, luximb.ttf, Luxi Mono Bold )
++#endif
+
+/* Luxi Mono Bold Oblique */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Mono_Bold_Oblique, luximbi.ttf, Luxi Mono Bold Oblique )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Mono_Bold_Oblique, luximbi.ttf, Luxi Mono Bold Oblique )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Bold_Oblique, luximbi.ttf, Luxi Mono Bold Oblique )
++#endif
+
+/* Luxi Mono Regular */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Mono_Regular, luximr.ttf, Luxi Mono Regular )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Mono_Regular, luximr.ttf, Luxi Mono Regular )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Regular, luximr.ttf, Luxi Mono Regular )
++#endif
+
+/* Luxi Mono Oblique */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Mono_Oblique, luximri.ttf, Luxi Mono Oblique )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Mono_Oblique, luximri.ttf, Luxi Mono Oblique )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Oblique, luximri.ttf, Luxi Mono Oblique )
++#endif
+
+/* Luxi Serif Bold */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Serif_Bold, luxirb.ttf, Luxi Serif Bold )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Serif_Bold, luxirb.ttf, Luxi Serif Bold )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Bold, luxirb.ttf, Luxi Serif Bold )
++#endif
+
+/* Luxi Serif Bold Oblique */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Serif_Bold_Oblique, luxirbi.ttf, Luxi Serif Bold Oblique )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Serif_Bold_Oblique, luxirbi.ttf, Luxi Serif Bold Oblique )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Bold_Oblique, luxirbi.ttf, Luxi Serif Bold Oblique )
++#endif
+
+/* Luxi Serif Regular */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Serif_Regular, luxirr.ttf, Luxi Serif Regular )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Serif_Regular, luxirr.ttf, Luxi Serif Regular )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Regular, luxirr.ttf, Luxi Serif Regular )
++#endif
+
+/* Luxi Serif Oblique */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Serif_Oblique, luxirri.ttf, Luxi Serif Oblique )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Serif_Oblique, luxirri.ttf, Luxi Serif Oblique )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Oblique, luxirri.ttf, Luxi Serif Oblique )
++#endif
+
+/* Luxi Sans Bold */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Sans_Bold, luxisb.ttf, Luxi Sans Bold )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Sans_Bold, luxisb.ttf, Luxi Sans Bold )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Bold, luxisb.ttf, Luxi Sans Bold )
++#endif
+
+/* Luxi Sans Bold Oblique */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Sans_Bold_Oblique, luxisbi.ttf, Luxi Sans Bold Oblique )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Sans_Bold_Oblique, luxisbi.ttf, Luxi Sans Bold Oblique )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Bold_Oblique, luxisbi.ttf, Luxi Sans Bold Oblique )
++#endif
+
+/* Luxi Sans Regular */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Sans_Regular, luxisr.ttf, Luxi Sans Regular )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Sans_Regular, luxisr.ttf, Luxi Sans Regular )
-+#endif
-+#endif
++STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Regular, luxisr.ttf, Luxi Sans Regular )
++#endif
+
+/* Luxi Sans Oblique */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Sans_Oblique, luxisri.ttf, Luxi Sans Oblique )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Sans_Oblique, luxisri.ttf, Luxi Sans Oblique )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Oblique, luxisri.ttf, Luxi Sans Oblique )
+#endif
+
+/* Gentium */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_Gentium, GenR102.TTF, Gentium )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_Gentium, GenR102.TTF, Gentium )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_Gentium, GenR102.TTF, Gentium )
+#endif
+
+/* Gentium Italic */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_Gentium_Italic, GenI102.TTF, Gentium Italic )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_Gentium_Italic, GenI102.TTF, Gentium Italic )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_Gentium_Italic, GenI102.TTF, Gentium Italic )
+#endif
+
+/* GentiumAlt */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_GentiumAlt, GenAR102.TTF, GentiumAlt )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_GentiumAlt, GenAR102.TTF, GentiumAlt )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_GentiumAlt, GenAR102.TTF, GentiumAlt )
+#endif
+
+/* GentiumAlt Italic */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_GentiumAlt_Italic, GenAI102.TTF, GentiumAlt Italic )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_GentiumAlt_Italic, GenAI102.TTF, GentiumAlt Italic )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_GentiumAlt_Italic, GenAI102.TTF, GentiumAlt Italic )
+#endif
+
+/* MgOpen Canonica Bold */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_MgOpen_Canonica_Bold, MgOpenCanonicaBold.ttf, MgOpen Canonica Bold )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_MgOpen_Canonica_Bold, MgOpenCanonicaBold.ttf, MgOpen Canonica Bold )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Bold, MgOpenCanonicaBold.ttf, MgOpen Canonica Bold )
+#endif
+
+/* MgOpen Canonica Bold Italic */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_MgOpen_Canonica_Bold_Italic, MgOpenCanonicaBoldItalic.ttf, MgOpen Canonica Bold Italic)
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_MgOpen_Canonica_Bold_Italic, MgOpenCanonicaBoldItalic.ttf, MgOpen Canonica Bold Italic)
-+#endif
++STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Bold_Italic, MgOpenCanonicaBoldItalic.ttf, MgOpen Canonica Bold Italic)
+#endif
+
+/* MgOpen Canonica Italic */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_MgOpen_Canonica_Italic, MgOpenCanonicaItalic.ttf, MgOpen Canonica Italic )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_MgOpen_Canonica_Italic, MgOpenCanonicaItalic.ttf, MgOpen Canonica Italic )
-+#endif
++STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Italic, MgOpenCanonicaItalic.ttf, MgOpen Canonica Italic )
+#endif
+
+/* MgOpen Canonica Regular */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_MgOpen_Canonica_Regular, MgOpenCanonicaRegular.ttf, MgOpen Canonica )
-+#endif
-+#endif
-+#ifdef WNT
+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_MgOpen_Canonica_Regular, MgOpenCanonicaRegular.ttf, MgOpen Canonica )
++STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Regular, MgOpenCanonicaRegular.ttf, MgOpen Canonica )
+#endif
-+#endif
-+
+
diff -Naur scp2/source/accessories/file_gallery_accessories.scp scp2/source/accessories/file_gallery_accessories.scp
--- scp2/source/accessories/file_gallery_accessories.scp 1970-01-01 01:00:00.000000000 +0100
Modified: trunk/scratch/scp2/source/accessories/file_font_accessories.scp
==============================================================================
--- trunk/scratch/scp2/source/accessories/file_font_accessories.scp (original)
+++ trunk/scratch/scp2/source/accessories/file_font_accessories.scp Sat Apr 5 09:16:03 2008
@@ -36,1900 +36,734 @@
#include "macros.inc"
/* Airmole font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_airmole, airmole.ttf, Airmole )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_airmole, airmole.ttf, Airmole )
-#endif
+STD_FONT_FILE( gid_File_Fnt_airmole, airmole.ttf, Airmole )
#endif
/* Airmole Antique font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_airmolea, airmolea.ttf, Airmole Antique )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_airmolea, airmolea.ttf, Airmole Antique )
-#endif
+STD_FONT_FILE( gid_File_Fnt_airmolea, airmolea.ttf, Airmole Antique )
#endif
/* Airmole Shaded font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_airmoles, airmoles.ttf, Airmole Shaded )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_airmoles, airmoles.ttf, Airmole Shaded )
-#endif
+STD_FONT_FILE( gid_File_Fnt_airmoles, airmoles.ttf, Airmole Shaded )
#endif
/* Airmole Stripe font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_airmoleq, airmoleq.ttf, Airmole Stripe )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_airmoleq, airmoleq.ttf, Airmole Stripe )
-#endif
+STD_FONT_FILE( gid_File_Fnt_airmoleq, airmoleq.ttf, Airmole Stripe )
#endif
/* Astron Boy font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_astronbo, astronbo.ttf, Astron Boy )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_astronbo, astronbo.ttf, Astron Boy )
-#endif
+STD_FONT_FILE( gid_File_Fnt_astronbo, astronbo.ttf, Astron Boy )
#endif
/* Astron Boy Italic font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_astronbi, astronbi.ttf, Astron Boy Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_astronbi, astronbi.ttf, Astron Boy Italic )
-#endif
+STD_FONT_FILE( gid_File_Fnt_astronbi, astronbi.ttf, Astron Boy Italic )
#endif
/* Astron Boy Video font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_astronbv, astronbv.ttf, Astron Boy Video )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_astronbv, astronbv.ttf, Astron Boy Video )
-#endif
+STD_FONT_FILE( gid_File_Fnt_astronbv, astronbv.ttf, Astron Boy Video )
#endif
/* Astron Boy Wonder font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_astronbw, astronbw.ttf, Astron Boy Wonder )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_astronbw, astronbw.ttf, Astron Boy Wonder )
-#endif
+STD_FONT_FILE( gid_File_Fnt_astronbw, astronbw.ttf, Astron Boy Wonder )
#endif
/* Baveuse font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_baveuse, baveuse.ttf, Baveuse )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_baveuse, baveuse.ttf, Baveuse )
-#endif
+STD_FONT_FILE( gid_File_Fnt_baveuse, baveuse.ttf, Baveuse )
#endif
/* Berylium font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_Berylium, Berylium.ttf, Berylium )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_Berylium, Berylium.ttf, Berylium )
-#endif
+STD_FONT_FILE( gid_File_Fnt_Berylium, Berylium.ttf, Berylium )
#endif
/* Berylium Bold font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_Beryliub, Beryliub.ttf, Berylium Bold )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_Beryliub, Beryliub.ttf, Berylium Bold )
-#endif
+STD_FONT_FILE( gid_File_Fnt_Beryliub, Beryliub.ttf, Berylium Bold )
#endif
/* Berylium Bold Italic font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_Berylibi, Berylibi.ttf, Berylium Bold Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_Berylibi, Berylibi.ttf, Berylium Bold Italic )
-#endif
+STD_FONT_FILE( gid_File_Fnt_Berylibi, Berylibi.ttf, Berylium Bold Italic )
#endif
/* Berylium Italic font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_Beryliui, Beryliui.ttf, Berylium Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_Beryliui, Beryliui.ttf, Berylium Italic )
-#endif
+STD_FONT_FILE( gid_File_Fnt_Beryliui, Beryliui.ttf, Berylium Italic )
#endif
/* Betsy Flanagan 2 font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_BETSY2, BETSY2.ttf, Betsy Flanagan 2 )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_BETSY2, BETSY2.ttf, Betsy Flanagan 2 )
-#endif
+STD_FONT_FILE( gid_File_Fnt_BETSY2, BETSY2.ttf, Betsy Flanagan 2 )
#endif
/* Blue Highway font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_bluehigh, bluehigh.ttf, Blue Highway )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_bluehigh, bluehigh.ttf, Blue Highway )
-#endif
+STD_FONT_FILE( gid_File_Fnt_bluehigh, bluehigh.ttf, Blue Highway )
#endif
/* Blue Highway Bold font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_bluebold, bluebold.ttf, Blue Highway Bold )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_bluebold, bluebold.ttf, Blue Highway Bold )
-#endif
+STD_FONT_FILE( gid_File_Fnt_bluebold, bluebold.ttf, Blue Highway Bold )
#endif
/* Blue Highway Condensed font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_bluecond, bluecond.ttf, Blue Highway Condensed )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_bluecond, bluecond.ttf, Blue Highway Condensed )
-#endif
+STD_FONT_FILE( gid_File_Fnt_bluecond, bluecond.ttf, Blue Highway Condensed )
#endif
/* Blue Highway Linocut font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_bluehigl, bluehigl.ttf, Blue Highway Linocut )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_bluehigl, bluehigl.ttf, Blue Highway Linocut )
-#endif
+STD_FONT_FILE( gid_File_Fnt_bluehigl, bluehigl.ttf, Blue Highway Linocut )
#endif
/* Bullpen font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_bullpen_, bullpen_.ttf, Bullpen )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_bullpen_, bullpen_.ttf, Bullpen )
-#endif
+STD_FONT_FILE( gid_File_Fnt_bullpen_, bullpen_.ttf, Bullpen )
#endif
/* Bullpen 3D font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_bullpen3, bullpen3.ttf, Bullpen 3D )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_bullpen3, bullpen3.ttf, Bullpen 3D )
-#endif
+STD_FONT_FILE( gid_File_Fnt_bullpen3, bullpen3.ttf, Bullpen 3D )
#endif
/* Bullpen Italic font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_bullpeni, bullpeni.ttf, Bullpen Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_bullpeni, bullpeni.ttf, Bullpen Italic )
-#endif
+STD_FONT_FILE( gid_File_Fnt_bullpeni, bullpeni.ttf, Bullpen Italic )
#endif
/* Colourbars font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_colourba, colourba.ttf, Colourbars )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_colourba, colourba.ttf, Colourbars )
-#endif
+STD_FONT_FILE( gid_File_Fnt_colourba, colourba.ttf, Colourbars )
#endif
/* Colourbars Bold font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_colourbb, colourbb.ttf, Colourbars Bold )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_colourbb, colourbb.ttf, Colourbars Bold )
-#endif
+STD_FONT_FILE( gid_File_Fnt_colourbb, colourbb.ttf, Colourbars Bold )
#endif
/* Counterscraps font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_counters, counters.ttf, Counterscraps )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_counters, counters.ttf, Counterscraps )
-#endif
+STD_FONT_FILE( gid_File_Fnt_counters, counters.ttf, Counterscraps )
#endif
/* Credit Valley font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_creditva, creditva.ttf, Credit Valley )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_creditva, creditva.ttf, Credit Valley )
-#endif
+STD_FONT_FILE( gid_File_Fnt_creditva, creditva.ttf, Credit Valley )
#endif
/* Credit Valley Bold font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_creditvb, creditvb.ttf, Credit Valley Bold )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_creditvb, creditvb.ttf, Credit Valley Bold )
-#endif
+STD_FONT_FILE( gid_File_Fnt_creditvb, creditvb.ttf, Credit Valley Bold )
#endif
/* Credit Valley Bold Italic font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_creditvz, creditvz.ttf, Credit Valley Bold Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_creditvz, creditvz.ttf, Credit Valley Bold Italic )
-#endif
+STD_FONT_FILE( gid_File_Fnt_creditvz, creditvz.ttf, Credit Valley Bold Italic )
#endif
/* Credit Valley Italic font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_creditvi, creditvi.ttf, Credit Valley Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_creditvi, creditvi.ttf, Credit Valley Italic )
-#endif
+STD_FONT_FILE( gid_File_Fnt_creditvi, creditvi.ttf, Credit Valley Italic )
#endif
/* Edmunds font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_edmunds, edmunds.ttf, Edmunds )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_edmunds, edmunds.ttf, Edmunds )
-#endif
+STD_FONT_FILE( gid_File_Fnt_edmunds, edmunds.ttf, Edmunds )
#endif
/* Edmunds Distressed font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_edmundis, edmundis.ttf, Edmunds Distressed )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_edmundis, edmundis.ttf, Edmunds Distressed )
-#endif
+STD_FONT_FILE( gid_File_Fnt_edmundis, edmundis.ttf, Edmunds Distressed )
#endif
/* Engebrechtre font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_engeregu, engeregu.ttf, Engebrechtre )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_engeregu, engeregu.ttf, Engebrechtre )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_engeregu, engeregu.ttf, Engebrechtre )
+#endif
/* Engebrechtre Bold font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_engebold, engebold.ttf, Engebrechtre Bold )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_engebold, engebold.ttf, Engebrechtre Bold )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_engebold, engebold.ttf, Engebrechtre Bold )
+#endif
/* Engebrechtre Bold Italic font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_engeboit, engeboit.ttf, Engebrechtre Bold Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_engeboit, engeboit.ttf, Engebrechtre Bold Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_engeboit, engeboit.ttf, Engebrechtre Bold Italic )
+#endif
/* Engebrechtre Expanded font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_engeexpa, engeexpa.ttf, Engebrechtre Expanded )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_engeexpa, engeexpa.ttf, Engebrechtre Expanded )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_engeexpa, engeexpa.ttf, Engebrechtre Expanded )
+#endif
/* Engebrechtre Expanded Bold font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_engeexbo, engeexbo.ttf, Engebrechtre Expanded Bold )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_engeexbo, engeexbo.ttf, Engebrechtre Expanded Bold )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_engeexbo, engeexbo.ttf, Engebrechtre Expanded Bold )
+#endif
/* Engebrechtre Expanded Bold Italic font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_engeexbi, engeexbi.ttf, Engebrechtre Expanded Bold Italic )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_engeexbi, engeexbi.ttf, Engebrechtre Expanded Bold Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_engeexbi, engeexbi.ttf, Engebrechtre Expanded Bold Italic )
+#endif
/* Engebrechtre Expanded Italic font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_engeexit, engeexit.ttf, Engebrechtre Expanded Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_engeexit, engeexit.ttf, Engebrechtre Expanded Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_engeexit, engeexit.ttf, Engebrechtre Expanded Italic )
+#endif
/* Engebrechtre Italic font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_engeital, engeital.ttf, Engebrechtre Italic )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_engeital, engeital.ttf, Engebrechtre Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_engeital, engeital.ttf, Engebrechtre Italic )
+#endif
/* Goodfish font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_goodfish, goodfish.ttf, Goodfish )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_goodfish, goodfish.ttf, Goodfish )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_goodfish, goodfish.ttf, Goodfish )
+#endif
/* Goodfish Bold font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_goodfisb, goodfisb.ttf, Goodfish Bold )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_goodfisb, goodfisb.ttf, Goodfish Bold )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_goodfisb, goodfisb.ttf, Goodfish Bold )
+#endif
/* Goodfish Bold Italic font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_goodfisc, goodfisc.ttf, Goodfish Bold Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_goodfisc, goodfisc.ttf, Goodfish Bold Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_goodfisc, goodfisc.ttf, Goodfish Bold Italic )
+#endif
/* Goodfish Italic font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_goodfisi, goodfisi.ttf, Goodfish Italic )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_goodfisi, goodfisi.ttf, Goodfish Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_goodfisi, goodfisi.ttf, Goodfish Italic )
+#endif
/* Guanine font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_guanine_, guanine_.ttf, Guanine )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_guanine_, guanine_.ttf, Guanine )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_guanine_, guanine_.ttf, Guanine )
+#endif
/* Gunplay font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_gunplay, gunplay.ttf, Gunplay )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_gunplay, gunplay.ttf, Gunplay )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_gunplay, gunplay.ttf, Gunplay )
+#endif
/* Kirsty font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_kirsty__, kirsty__.ttf, Kirsty )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_kirsty__, kirsty__.ttf, Kirsty )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_kirsty__, kirsty__.ttf, Kirsty )
+#endif
/* Kirsty Bold font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_kirsty_b, kirsty_b.ttf, Kirsty Bold )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_kirsty_b, kirsty_b.ttf, Kirsty Bold )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_kirsty_b, kirsty_b.ttf, Kirsty Bold )
+#endif
/* Kirsty Bold Italic font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_kirstybi, kirstybi.ttf, Kirsty Bold Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_kirstybi, kirstybi.ttf, Kirsty Bold Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_kirstybi, kirstybi.ttf, Kirsty Bold Italic )
+#endif
/* Kirsty Italic font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_kirsty_i, kirsty_i.ttf, Kirsty Italic )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_kirsty_i, kirsty_i.ttf, Kirsty Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_kirsty_i, kirsty_i.ttf, Kirsty Italic )
+#endif
/* Kirsty Ink font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_kirstyin, kirstyin.ttf, Kirsty Ink )
-#endif
-#endif
-#ifdef WNT
+STD_FONT_FILE( gid_File_Fnt_kirstyin, kirstyin.ttf, Kirsty Ink )
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_kirstyin, kirstyin.ttf, Kirsty Ink )
-#endif
-#endif
/* Mufferaw font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_mufferaw, mufferaw.ttf, Mufferaw )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_mufferaw, mufferaw.ttf, Mufferaw )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_mufferaw, mufferaw.ttf, Mufferaw )
+#endif
/* Nasalization font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_nasaliza, nasaliza.ttf, Nasalization )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_nasaliza, nasaliza.ttf, Nasalization )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_nasaliza, nasaliza.ttf, Nasalization )
+#endif
/* Neuropol font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_NEUROPOL, NEUROPOL.ttf, Neuropol )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_NEUROPOL, NEUROPOL.ttf, Neuropol )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_NEUROPOL, NEUROPOL.ttf, Neuropol )
+#endif
/* Numberpile font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_numberpi, numberpi.ttf, Numberpile )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_numberpi, numberpi.ttf, Numberpile )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_numberpi, numberpi.ttf, Numberpile )
+#endif
/* Pricedown font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_pricedow, pricedow.ttf, Pricedown )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_pricedow, pricedow.ttf, Pricedown )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_pricedow, pricedow.ttf, Pricedown )
+#endif
/* Pupcat font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_pupcat__, pupcat__.ttf, Pupcat )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_pupcat__, pupcat__.ttf, Pupcat )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_pupcat__, pupcat__.ttf, Pupcat )
+#endif
/* Rina font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_rina, rina.ttf, Rina )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_rina, rina.ttf, Rina )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_rina, rina.ttf, Rina )
+#endif
/* Sandoval font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_sandoval, sandoval.ttf, Sandoval )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_sandoval, sandoval.ttf, Sandoval )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_sandoval, sandoval.ttf, Sandoval )
+#endif
/* Sappy Mugs font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_SAPPM___, SAPPM___.ttf, Sappy Mugs )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_SAPPM___, SAPPM___.ttf, Sappy Mugs )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_SAPPM___, SAPPM___.ttf, Sappy Mugs )
+#endif
/* Screengem font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_screenge, screenge.ttf, Screengem )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_screenge, screenge.ttf, Screengem )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_screenge, screenge.ttf, Screengem )
+#endif
/* Steelfish font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_steelfis, steelfis.ttf, Steelfish )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_steelfis, steelfis.ttf, Steelfish )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_steelfis, steelfis.ttf, Steelfish )
+#endif
/* Steelfish Bold font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_steelfib, steelfib.ttf, Steelfish Bold )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_steelfib, steelfib.ttf, Steelfish Bold )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_steelfib, steelfib.ttf, Steelfish Bold )
+#endif
/* Steelfish Outline font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_steelout, steelout.ttf, Steelfish Outline )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_steelout, steelout.ttf, Steelfish Outline )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_steelout, steelout.ttf, Steelfish Outline )
+#endif
/* Strenuous font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_strenuou, strenuou.ttf, Strenuous )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_strenuou, strenuou.ttf, Strenuous )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_strenuou, strenuou.ttf, Strenuous )
+#endif
/* Strenuous 3D font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_strenu3d, strenu3d.ttf, Strenuous 3D )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_strenu3d, strenu3d.ttf, Strenuous 3D )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_strenu3d, strenu3d.ttf, Strenuous 3D )
+#endif
/* Subpear font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_subpear_, subpear_.ttf, Subpear )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_subpear_, subpear_.ttf, Subpear )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_subpear_, subpear_.ttf, Subpear )
+#endif
/* Teen font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_teen____, teen____.ttf, Teen )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_teen____, teen____.ttf, Teen )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_teen____, teen____.ttf, Teen )
+#endif
/* Teen Bold font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_teenbold, teenbold.ttf, Teen Bold )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_teenbold, teenbold.ttf, Teen Bold )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_teenbold, teenbold.ttf, Teen Bold )
+#endif
/* Teen Bold Italic font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_teenbdit, teenbdit.ttf, Teen Bold Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_teenbdit, teenbdit.ttf, Teen Bold Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_teenbdit, teenbdit.ttf, Teen Bold Italic )
+#endif
/* Teen Italic font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_teenital, teenital.ttf, Teen Italic )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_teenital, teenital.ttf, Teen Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_teenital, teenital.ttf, Teen Italic )
+#endif
/* Teen Light font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_teenlite, teenlite.ttf, Teen Light )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_teenlite, teenlite.ttf, Teen Light )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_teenlite, teenlite.ttf, Teen Light )
+#endif
/* Teen Light Italic font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_teenlita, teenlita.ttf, Teen Light Italic )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_teenlita, teenlita.ttf, Teen Light Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_teenlita, teenlita.ttf, Teen Light Italic )
+#endif
/* Typodermic font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_typoderm, typoderm.ttf, Typodermic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_typoderm, typoderm.ttf, Typodermic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_typoderm, typoderm.ttf, Typodermic )
+#endif
/* Vahika font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_vahika_, vahika_.ttf, Vahika )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_vahika_, vahika_.ttf, Vahika )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_vahika_, vahika_.ttf, Vahika )
+#endif
/* Vahika Bold font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_vahikab, vahikab.ttf, Vahika Bold )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_vahikab, vahikab.ttf, Vahika Bold )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_vahikab, vahikab.ttf, Vahika Bold )
+#endif
/* Vahika Bold Italic font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_vahikac, vahikac.ttf, Vahika Bold Italic )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_vahikac, vahikac.ttf, Vahika Bold Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_vahikac, vahikac.ttf, Vahika Bold Italic )
+#endif
/* Vahika Italic font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_vahikai, vahikai.ttf, Vahika Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_vahikai, vahikai.ttf, Vahika Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_vahikai, vahikai.ttf, Vahika Italic )
+#endif
/* Vectroid font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_vectroid, vectroid.ttf, Vectroid )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_vectroid, vectroid.ttf, Vectroid )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_vectroid, vectroid.ttf, Vectroid )
+#endif
/* Velvenda Cooler font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_velvendc, velvendc.ttf, Velvenda Cooler )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_velvendc, velvendc.ttf, Velvenda Cooler )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_velvendc, velvendc.ttf, Velvenda Cooler )
+#endif
/* Velvenda Megablack font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_velvenda, velvenda.ttf, Velvenda Megablack )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_velvenda, velvenda.ttf, Velvenda Megablack )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_velvenda, velvenda.ttf, Velvenda Megablack )
+#endif
/* Vibrocentric font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_vibrocen, vibrocen.ttf, Vibrocentric )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_vibrocen, vibrocen.ttf, Vibrocentric )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_vibrocen, vibrocen.ttf, Vibrocentric )
+#endif
/* Vibrocentric Bold font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_vibroceb, vibroceb.ttf, Vibrocentric Bold )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_vibroceb, vibroceb.ttf, Vibrocentric Bold )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_vibroceb, vibroceb.ttf, Vibrocentric Bold )
+#endif
/* Vibrocentric Bold Italic font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_vibrocex, vibrocex.ttf, Vibrocentric Bold Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_vibrocex, vibrocex.ttf, Vibrocentric Bold Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_vibrocex, vibrocex.ttf, Vibrocentric Bold Italic )
+#endif
/* Vibrocentric Italic font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_vibrocei, vibrocei.ttf, Vibrocentric Italic )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_vibrocei, vibrocei.ttf, Vibrocentric Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_vibrocei, vibrocei.ttf, Vibrocentric Italic )
+#endif
/* Wintermute font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_wintermu, wintermu.ttf, Wintermute )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_wintermu, wintermu.ttf, Wintermute )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_wintermu, wintermu.ttf, Wintermute )
+#endif
/* You're Gone font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_youregon, youregon.ttf, You are Gone )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_youregon, youregon.ttf, You are Gone )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_youregon, youregon.ttf, You are Gone )
+#endif
/* You're Gone Italic font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_youregoi, youregoi.ttf, You are Gone Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_youregoi, youregoi.ttf, You are Gone Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_youregoi, youregoi.ttf, You are Gone Italic )
+#endif
/* Zekton font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_zekton__, zekton__.ttf, Zekton )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_zekton__, zekton__.ttf, Zekton )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_zekton__, zekton__.ttf, Zekton )
+#endif
/* Zekton Bold font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_zektonbo, zektonbo.ttf, Zekton Bold )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_zektonbo, zektonbo.ttf, Zekton Bold )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_zektonbo, zektonbo.ttf, Zekton Bold )
+#endif
/* Zekton Bold Italic font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_zektonbi, zektonbi.ttf, Zekton Bold Italic )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_zektonbi, zektonbi.ttf, Zekton Bold Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_zektonbi, zektonbi.ttf, Zekton Bold Italic )
+#endif
/* Zekton Italic font */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_zektonit, zektonit.ttf, Zekton Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_zektonit, zektonit.ttf, Zekton Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_zektonit, zektonit.ttf, Zekton Italic )
+#endif
/* Zorque font */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_zorque, zorque.ttf, Zorque )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_zorque, zorque.ttf, Zorque )
-#endif
+STD_FONT_FILE( gid_File_Fnt_zorque, zorque.ttf, Zorque )
#endif
/* Additional fonts for 2.0.3 */
/* -URW-Gothic L */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Gothic_L_Avantgarde, a010013l.ttf, -URW-Gothic L )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Gothic_L_Avantgarde, a010013l.ttf, -URW-Gothic L )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Gothic_L_Avantgarde, a010013l.ttf, -URW-Gothic L )
+#endif
/* -URW-Gothic L Bold */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Gothic_L_Bold_Avantgarde, a010015l.ttf, -URW-Gothic L Bold )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Gothic_L_Bold_Avantgarde, a010015l.ttf, -URW-Gothic L Bold )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Gothic_L_Bold_Avantgarde, a010015l.ttf, -URW-Gothic L Bold )
+#endif
/* -URW-Gothic L Italic */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Gothic_L_Italic_Avantgarde, a010033l.ttf, -URW-Gothic L Italic )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Gothic_L_Italic_Avantgarde, a010033l.ttf, -URW-Gothic L Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Gothic_L_Italic_Avantgarde, a010033l.ttf, -URW-Gothic L Italic )
+#endif
/* -URW-Gothic L Bold Italic */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Gothic_L_Bold_Italic_Avantgarde, a010035l.ttf, -URW-Gothic L Bold Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Gothic_L_Bold_Italic_Avantgarde, a010035l.ttf, -URW-Gothic L Bold Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Gothic_L_Bold_Italic_Avantgarde, a010035l.ttf, -URW-Gothic L Bold Italic )
+#endif
/* -URW-Bookman L */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Bookman_L_Bookman, b018012l.ttf, -URW-Bookman L )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Bookman_L_Bookman, b018012l.ttf, -URW-Bookman L )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Bookman_L_Bookman, b018012l.ttf, -URW-Bookman L )
+#endif
/* -URW-Bookman L Bold */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Bookman_L_Bold_Bookman, b018015l.ttf, -URW-Bookman L Bold )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Bookman_L_Bold_Bookman, b018015l.ttf, -URW-Bookman L Bold )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Bookman_L_Bold_Bookman, b018015l.ttf, -URW-Bookman L Bold )
+#endif
/* -URW-Bookman L Italic */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Bookman_L_Italic_Bookman, b018032l.ttf, -URW-Bookman L Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Bookman_L_Italic_Bookman, b018032l.ttf, -URW-Bookman L Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Bookman_L_Italic_Bookman, b018032l.ttf, -URW-Bookman L Italic )
+#endif
/* -URW-Bookman L Bold Italic */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Bookman_L_Bold_Italic_Bookman, b018035l.ttf, -URW-Bookman L Bold Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Bookman_L_Bold_Italic_Bookman, b018035l.ttf, -URW-Bookman L Bold Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Bookman_L_Bold_Italic_Bookman, b018035l.ttf, -URW-Bookman L Bold Italic )
+#endif
/* -URW-Century Schoolbook L */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_New_Century_SchoolBook, c059013l.ttf, -URW-Century Schoolbook L )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_New_Century_SchoolBook, c059013l.ttf, -URW-Century Schoolbook L )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_New_Century_SchoolBook, c059013l.ttf, -URW-Century Schoolbook L )
+#endif
/* -URW-Century Schoolbook L Bold */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_New_Century_SchoolBook, c059016l.ttf, -URW-Century Schoolbook L Bold )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_New_Century_SchoolBook, c059016l.ttf, -URW-Century Schoolbook L Bold )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_New_Century_SchoolBook, c059016l.ttf, -URW-Century Schoolbook L Bold )
+#endif
/* -URW-Century Schoolbook L Italic */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Italic_New_Century_SchoolBook, c059033l.ttf, -URW-Century Schoolbook L Italic )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Italic_New_Century_SchoolBook, c059033l.ttf, -URW-Century Schoolbook L Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Italic_New_Century_SchoolBook, c059033l.ttf, -URW-Century Schoolbook L Italic )
+#endif
/* -URW-Century Schoolbook L Bold Italic */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook, c059036l.ttf, -URW-Century Schoolbook L Bold Italic )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook, c059036l.ttf, -URW-Century Schoolbook L Bold Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook, c059036l.ttf, -URW-Century Schoolbook L Bold Italic )
+#endif
/* -URW-Nimbus Sans L */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica, n019003l.ttf, -URW-Nimbus Sans L )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica, n019003l.ttf, -URW-Nimbus Sans L )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica, n019003l.ttf, -URW-Nimbus Sans L )
+#endif
/* -URW-Nimbus Sans L Bold */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica, n019004l.ttf, -URW-Nimbus Sans L Bold )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica, n019004l.ttf, -URW-Nimbus Sans L Bold )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica, n019004l.ttf, -URW-Nimbus Sans L Bold )
+#endif
/* -URW-Nimbus Sans L Italic */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica, n019023l.ttf, -URW-Nimbus Sans L Italic )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica, n019023l.ttf, -URW-Nimbus Sans L Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica, n019023l.ttf, -URW-Nimbus Sans L Italic )
+#endif
/* -URW-Nimbus Sans L Bold Italic */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica, n019024l.ttf, -URW-Nimbus Sans L Bold Italic )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica, n019024l.ttf, -URW-Nimbus Sans L Bold Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica, n019024l.ttf, -URW-Nimbus Sans L Bold Italic )
+#endif
/* -URW-Nimbus Sans L Condensed */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica_Condensed, n019043l.ttf, -URW-Nimbus Sans L Condensed )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica_Condensed, n019043l.ttf, -URW-Nimbus Sans L Condensed )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica_Condensed, n019043l.ttf, -URW-Nimbus Sans L Condensed )
+#endif
/* -URW-Nimbus Sans L Bold Condensed */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica_Condensed, n019044l.ttf, -URW-Nimbus Sans L Bold Condensed )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica_Condensed, n019044l.ttf, -URW-Nimbus Sans L Bold Condensed )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica_Condensed, n019044l.ttf, -URW-Nimbus Sans L Bold Condensed )
+#endif
/* -URW-Nimbus Sans L Italic Condensed */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica_Condensed, n019063l.ttf, -URW-Nimbus Sans L Italic Condensed )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica_Condensed, n019063l.ttf, -URW-Nimbus Sans L Italic Condensed )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica_Condensed, n019063l.ttf, -URW-Nimbus Sans L Italic Condensed )
+#endif
/* -URW-Nimbus Sans L Bold Italic Condensed */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed, n019064l.ttf, -URW-Nimbus Sans L Bold Italic Condensed )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed, n019064l.ttf, -URW-Nimbus Sans L Bold Italic Condensed )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed, n019064l.ttf, -URW-Nimbus Sans L Bold Italic Condensed )
+#endif
/* -URW-Nimbus Roman No9 L */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Times, n021003l.ttf, -URW-Nimbus Roman No9 L )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Times, n021003l.ttf, -URW-Nimbus Roman No9 L )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Times, n021003l.ttf, -URW-Nimbus Roman No9 L )
+#endif
/* -URW-Nimbus Roman No9 L Bold */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Times, n021004l.ttf, -URW-Nimbus Roman No9 L Bold )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Times, n021004l.ttf, -URW-Nimbus Roman No9 L Bold )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Times, n021004l.ttf, -URW-Nimbus Roman No9 L Bold )
+#endif
/* -URW-Nimbus Roman No9 L Italic */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Italic_Times, n021023l.ttf, -URW-Nimbus Roman No9 L Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Italic_Times, n021023l.ttf, -URW-Nimbus Roman No9 L Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Italic_Times, n021023l.ttf, -URW-Nimbus Roman No9 L Italic )
+#endif
/* -URW-Nimbus Roman No9 L Bold Italic */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Italic_Times, n021024l.ttf, -URW-Nimbus Roman No9 L Bold Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Italic_Times, n021024l.ttf, -URW-Nimbus Roman No9 L Bold Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Italic_Times, n021024l.ttf, -URW-Nimbus Roman No9 L Bold Italic )
+#endif
/* -URW-Nimbus Mono L */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Courier, n022003l.ttf, -URW-Nimbus Mono L )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Courier, n022003l.ttf, -URW-Nimbus Mono L )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Courier, n022003l.ttf, -URW-Nimbus Mono L )
+#endif
/* -URW-Nimbus Mono L Bold */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Courier, n022004l.ttf, -URW-Nimbus Mono L Bold )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Courier, n022004l.ttf, -URW-Nimbus Mono L Bold )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Courier, n022004l.ttf, -URW-Nimbus Mono L Bold )
+#endif
/* -URW-Nimbus Mono LK Italic */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Mono_LK_Italic_Courier, n022023l.ttf, -URW-Nimbus Mono LK Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Mono_LK_Italic_Courier, n022023l.ttf, -URW-Nimbus Mono LK Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Mono_LK_Italic_Courier, n022023l.ttf, -URW-Nimbus Mono LK Italic )
+#endif
/* -URW-Nimbus Mono L Bold Italic */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Italic_Courier, n022024l.ttf, -URW-Nimbus Mono L Bold Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Italic_Courier, n022024l.ttf, -URW-Nimbus Mono L Bold Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Italic_Courier, n022024l.ttf, -URW-Nimbus Mono L Bold Italic )
+#endif
/* -URW-Palladio L */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Palladio_L_Palitino, p052003l.ttf, -URW-Palladio L )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Palladio_L_Palitino, p052003l.ttf, -URW-Palladio L )
+STD_FONT_FILE( gid_File_Fnt_-URW-Palladio_L_Palitino, p052003l.ttf, -URW-Palladio L )
#endif
-#endif
/* -URW-Palladio L Bold */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Palladio_L_Bold_Palitino, p052004l.ttf, -URW-Palladio L Bold )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Palladio_L_Bold_Palitino, p052004l.ttf, -URW-Palladio L Bold )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Palladio_L_Bold_Palitino, p052004l.ttf, -URW-Palladio L Bold )
+#endif
/* -URW-Palladio L Italic */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Palladio_L_Italic_Palitino, p052023l.ttf, -URW-Palladio L Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Palladio_L_Italic_Palitino, p052023l.ttf, -URW-Palladio L Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Palladio_L_Italic_Palitino, p052023l.ttf, -URW-Palladio L Italic )
+#endif
/* -URW-Palladio L Bold Italic */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Palladio_L_Bold_Italic_Palitino, p052024l.ttf, -URW-Palladio L Bold Italic )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Palladio_L_Bold_Italic_Palitino, p052024l.ttf, -URW-Palladio L Bold Italic )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Palladio_L_Bold_Italic_Palitino, p052024l.ttf, -URW-Palladio L Bold Italic )
+#endif
/* -URW-Standard Symbols L */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Standard_Symbols_L_Symbol, s050000l.ttf, -URW-Standard Symbols L )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Standard_Symbols_L_Symbol, s050000l.ttf, -URW-Standard Symbols L )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Standard_Symbols_L_Symbol, s050000l.ttf, -URW-Standard Symbols L )
+#endif
/* -URW-Chancery L */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_-URW-Chancery_L_Zapf_Chancery, z003034l.ttf, -URW-Chancery L )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_-URW-Chancery_L_Zapf_Chancery, z003034l.ttf, -URW-Chancery L )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_-URW-Chancery_L_Zapf_Chancery, z003034l.ttf, -URW-Chancery L )
+#endif
/* Dingbats */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_Dingbats, d050000l.ttf, Dingbats )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_Dingbats, d050000l.ttf, Dingbats )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_Dingbats, d050000l.ttf, Dingbats )
+#endif
/* Luxi Mono Bold */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Mono_Bold, luximb.ttf, Luxi Mono Bold )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Mono_Bold, luximb.ttf, Luxi Mono Bold )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Bold, luximb.ttf, Luxi Mono Bold )
+#endif
/* Luxi Mono Bold Oblique */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Mono_Bold_Oblique, luximbi.ttf, Luxi Mono Bold Oblique )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Mono_Bold_Oblique, luximbi.ttf, Luxi Mono Bold Oblique )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Bold_Oblique, luximbi.ttf, Luxi Mono Bold Oblique )
+#endif
/* Luxi Mono Regular */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Mono_Regular, luximr.ttf, Luxi Mono Regular )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Mono_Regular, luximr.ttf, Luxi Mono Regular )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Regular, luximr.ttf, Luxi Mono Regular )
+#endif
/* Luxi Mono Oblique */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Mono_Oblique, luximri.ttf, Luxi Mono Oblique )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Mono_Oblique, luximri.ttf, Luxi Mono Oblique )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Oblique, luximri.ttf, Luxi Mono Oblique )
+#endif
/* Luxi Serif Bold */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Serif_Bold, luxirb.ttf, Luxi Serif Bold )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Serif_Bold, luxirb.ttf, Luxi Serif Bold )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Bold, luxirb.ttf, Luxi Serif Bold )
+#endif
/* Luxi Serif Bold Oblique */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Serif_Bold_Oblique, luxirbi.ttf, Luxi Serif Bold Oblique )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Serif_Bold_Oblique, luxirbi.ttf, Luxi Serif Bold Oblique )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Bold_Oblique, luxirbi.ttf, Luxi Serif Bold Oblique )
+#endif
/* Luxi Serif Regular */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Serif_Regular, luxirr.ttf, Luxi Serif Regular )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Serif_Regular, luxirr.ttf, Luxi Serif Regular )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Regular, luxirr.ttf, Luxi Serif Regular )
+#endif
/* Luxi Serif Oblique */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Serif_Oblique, luxirri.ttf, Luxi Serif Oblique )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Serif_Oblique, luxirri.ttf, Luxi Serif Oblique )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Oblique, luxirri.ttf, Luxi Serif Oblique )
+#endif
/* Luxi Sans Bold */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Sans_Bold, luxisb.ttf, Luxi Sans Bold )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Sans_Bold, luxisb.ttf, Luxi Sans Bold )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Bold, luxisb.ttf, Luxi Sans Bold )
+#endif
/* Luxi Sans Bold Oblique */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Sans_Bold_Oblique, luxisbi.ttf, Luxi Sans Bold Oblique )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Sans_Bold_Oblique, luxisbi.ttf, Luxi Sans Bold Oblique )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Bold_Oblique, luxisbi.ttf, Luxi Sans Bold Oblique )
+#endif
/* Luxi Sans Regular */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Sans_Regular, luxisr.ttf, Luxi Sans Regular )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Sans_Regular, luxisr.ttf, Luxi Sans Regular )
-#endif
-#endif
+STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Regular, luxisr.ttf, Luxi Sans Regular )
+#endif
/* Luxi Sans Oblique */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Sans_Oblique, luxisri.ttf, Luxi Sans Oblique )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Sans_Oblique, luxisri.ttf, Luxi Sans Oblique )
-#endif
+STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Oblique, luxisri.ttf, Luxi Sans Oblique )
#endif
/* Gentium */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_Gentium, GenR102.TTF, Gentium )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_Gentium, GenR102.TTF, Gentium )
-#endif
+STD_FONT_FILE( gid_File_Fnt_Gentium, GenR102.TTF, Gentium )
#endif
/* Gentium Italic */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_Gentium_Italic, GenI102.TTF, Gentium Italic )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_Gentium_Italic, GenI102.TTF, Gentium Italic )
-#endif
+STD_FONT_FILE( gid_File_Fnt_Gentium_Italic, GenI102.TTF, Gentium Italic )
#endif
/* GentiumAlt */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_GentiumAlt, GenAR102.TTF, GentiumAlt )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_GentiumAlt, GenAR102.TTF, GentiumAlt )
-#endif
+STD_FONT_FILE( gid_File_Fnt_GentiumAlt, GenAR102.TTF, GentiumAlt )
#endif
/* GentiumAlt Italic */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_GentiumAlt_Italic, GenAI102.TTF, GentiumAlt Italic )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_GentiumAlt_Italic, GenAI102.TTF, GentiumAlt Italic )
-#endif
+STD_FONT_FILE( gid_File_Fnt_GentiumAlt_Italic, GenAI102.TTF, GentiumAlt Italic )
#endif
/* MgOpen Canonica Bold */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_MgOpen_Canonica_Bold, MgOpenCanonicaBold.ttf, MgOpen Canonica Bold )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_MgOpen_Canonica_Bold, MgOpenCanonicaBold.ttf, MgOpen Canonica Bold )
-#endif
+STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Bold, MgOpenCanonicaBold.ttf, MgOpen Canonica Bold )
#endif
/* MgOpen Canonica Bold Italic */
-#ifdef UNX
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_MgOpen_Canonica_Bold_Italic, MgOpenCanonicaBoldItalic.ttf, MgOpen Canonica Bold Italic)
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_MgOpen_Canonica_Bold_Italic, MgOpenCanonicaBoldItalic.ttf, MgOpen Canonica Bold Italic)
-#endif
+STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Bold_Italic, MgOpenCanonicaBoldItalic.ttf, MgOpen Canonica Bold Italic)
#endif
/* MgOpen Canonica Italic */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_MgOpen_Canonica_Italic, MgOpenCanonicaItalic.ttf, MgOpen Canonica Italic )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_MgOpen_Canonica_Italic, MgOpenCanonicaItalic.ttf, MgOpen Canonica Italic )
-#endif
+STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Italic, MgOpenCanonicaItalic.ttf, MgOpen Canonica Italic )
#endif
/* MgOpen Canonica Regular */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_MgOpen_Canonica_Regular, MgOpenCanonicaRegular.ttf, MgOpen Canonica )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_MgOpen_Canonica_Regular, MgOpenCanonicaRegular.ttf, MgOpen Canonica )
-#endif
-#endif
-
-/* Liberation Mono Bold Italic */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic.ttf, Liberation Mono )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic.ttf, Liberation Mono )
-#endif
-#endif
-
-/* Liberation Mono Bold */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_LiberationMono_Bold, LiberationMono-Bold.ttf, Liberation Mono )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_LiberationMono_Bold, LiberationMono-Bold.ttf, Liberation Mono )
-#endif
-#endif
-
-/* Liberation Mono Italic */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_LiberationMono_Italic, LiberationMono-Italic.ttf, Liberation Mono )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_LiberationMono_Italic, LiberationMono-Italic.ttf, Liberation Mono )
-#endif
-#endif
-
-/* Liberation Mono Regular */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_LiberationMono_Regular, LiberationMono-Regular.ttf, Liberation Mono )
-#endif
-#endif
-#ifdef WNT
#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_LiberationMono_Regular, LiberationMono-Regular.ttf, Liberation Mono )
-#endif
-#endif
-
-/* Liberation Sans Bold Italic */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic.ttf, Liberation Sans )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic.ttf, Liberation Sans )
-#endif
-#endif
-
-/* Liberation Sans Bold */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Sans )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Sans )
-#endif
-#endif
-
-/* Liberation Sans Italic */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, Liberation Sans )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, Liberation Sans )
-#endif
-#endif
-
-/* Liberation Sans Regular */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_LiberationSans_Regular, LiberationSans-Regular.ttf, Liberation Sans )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_LiberationSans_Regular, LiberationSans-Regular.ttf, Liberation Sans )
-#endif
-#endif
-
-/* Liberation Serif Bold Italic */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif )
-#endif
-#endif
-
-/* Liberation Serif Bold */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_LiberationSerif_Bold, LiberationSerif-Bold.ttf, Liberation Serif )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_LiberationSerif_Bold, LiberationSerif-Bold.ttf, Liberation Serif )
-#endif
-#endif
-
-/* Liberation Serif Italic */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_LiberationSerif_Italic, LiberationSerif-Italic.ttf, Liberation Serif )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_LiberationSerif_Italic, LiberationSerif-Italic.ttf, Liberation Serif )
-#endif
-#endif
-
-/* Liberation Serif Regular */
-#ifdef UNX
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTUNX_FILE( gid_File_Fnt_LiberationSerif_Regular, LiberationSerif-Regular.ttf, Liberation Serif )
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_EXTRA_FONT
-STD_FONTWIN_FILE( gid_File_Fnt_LiberationSerif_Regular, LiberationSerif-Regular.ttf, Liberation Serif )
-#endif
+STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Regular, MgOpenCanonicaRegular.ttf, MgOpen Canonica )
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
