INTEGRATION: CWS native99 (1.2.754); FILE MERGED

2007/08/07 16:13:00 is 1.2.754.2: #i80411# preparing new package structure in scp2
2007/08/07 14:04:08 is 1.2.754.1: #i80411#  preparing scp project for package restructuring

scp2/source/ooo/file_font_ooo.scp

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: file_font_ooo.scp,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 01:37:10 $
+ *  last change: $Author: ihi $ $Date: 2007-08-20 15:34:27 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -35,119 +35,44 @@
 
 #include "macros.inc"
 
-#ifdef UNX
-STD_FONTUNX_FILE( gid_File_Fnt_Opensymb, opens___.ttf, OpenSymbol)
-#endif
-#ifdef WNT
-STD_FONTWIN_FILE( gid_File_Fnt_Opensymb, opens___.ttf, OpenSymbol)
-#endif
+STD_FONT_FILE( gid_File_Fnt_Opensymb, opens___.ttf, OpenSymbol)
 
-#ifdef UNX
-#ifndef WITHOUT_FONTS
-SETUP_FONTUNX_FILE( gid_File_Fnt_Vera, Vera.ttf, Vera Sans)
-#endif
-#endif
-#ifdef WNT
 #ifndef WITHOUT_FONTS
-SETUP_FONTWIN_FILE( gid_File_Fnt_Vera, Vera.ttf, Vera Sans)
-#endif
+STD_FONT_FILE( gid_File_Fnt_Vera, Vera.ttf, Vera Sans)
 #endif
 
-#ifdef UNX
 #ifndef WITHOUT_FONTS
-STD_FONTUNX_FILE( gid_File_Fnt_Verabd, VeraBd.ttf, Vera Sans Bold)
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_FONTS
-STD_FONTWIN_FILE( gid_File_Fnt_Verabd, VeraBd.ttf, Vera Sans Bold)
-#endif
+STD_FONT_FILE( gid_File_Fnt_Verabd, VeraBd.ttf, Vera Sans Bold)
 #endif
 
-#ifdef UNX
 #ifndef WITHOUT_FONTS
-STD_FONTUNX_FILE( gid_File_Fnt_Verabi, VeraBI.ttf, Vera Sans Bold Oblique)
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_FONTS
-STD_FONTWIN_FILE( gid_File_Fnt_Verabi, VeraBI.ttf, Vera Sans Bold Italic)
-#endif
+STD_FONT_FILE_DUO( gid_File_Fnt_Verabi, VeraBI.ttf, Vera Sans Bold Oblique, Vera Sans Bold Italic)
 #endif
 
-#ifdef UNX
-#ifndef WITHOUT_FONTS
-STD_FONTUNX_FILE( gid_File_Fnt_Verait, VeraIt.ttf, Vera Sans Oblique)
-#endif
-#endif
-#ifdef WNT
 #ifndef WITHOUT_FONTS
-STD_FONTWIN_FILE( gid_File_Fnt_Verait, VeraIt.ttf, Vera Sans Italic)
-#endif
+STD_FONT_FILE_DUO( gid_File_Fnt_Verait, VeraIt.ttf, Vera Sans Oblique, Vera Sans Italic)
 #endif
 
-#ifdef UNX
-#ifndef WITHOUT_FONTS
-STD_FONTUNX_FILE( gid_File_Fnt_Veramobd, VeraMoBd.ttf, Vera Sans Mono Bold)
-#endif
-#endif
-#ifdef WNT
 #ifndef WITHOUT_FONTS
-STD_FONTWIN_FILE( gid_File_Fnt_Veramobd, VeraMoBd.ttf, Vera Sans Mono Bold)
-#endif
+STD_FONT_FILE( gid_File_Fnt_Veramobd, VeraMoBd.ttf, Vera Sans Mono Bold)
 #endif
 
-#ifdef UNX
-#ifndef WITHOUT_FONTS
-STD_FONTUNX_FILE( gid_File_Fnt_Veramobi, VeraMoBI.ttf, Vera Sans Mono Bold Oblique)
-#endif
-#endif
-#ifdef WNT
 #ifndef WITHOUT_FONTS
-STD_FONTWIN_FILE( gid_File_Fnt_Veramobi, VeraMoBI.ttf, Vera Sans Mono Bold Italic)
-#endif
+STD_FONT_FILE_DUO( gid_File_Fnt_Veramobi, VeraMoBI.ttf, Vera Sans Mono Bold Oblique, Vera Sans Mono Bold Italic)
 #endif
 
-#ifdef UNX
 #ifndef WITHOUT_FONTS
-STD_FONTUNX_FILE( gid_File_Fnt_Veramoit, VeraMoIt.ttf, Vera Sans Mono Oblique)
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_FONTS
-STD_FONTWIN_FILE( gid_File_Fnt_Veramoit, VeraMoIt.ttf, Vera Sans Mono Italic)
-#endif
+STD_FONT_FILE_DUO( gid_File_Fnt_Veramoit, VeraMoIt.ttf, Vera Sans Mono Oblique, Vera Sans Mono Italic)
 #endif
 
-#ifdef UNX
 #ifndef WITHOUT_FONTS
-STD_FONTUNX_FILE( gid_File_Fnt_Veramono, VeraMono.ttf, Vera Sans Mono)
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_FONTS
-STD_FONTWIN_FILE( gid_File_Fnt_Veramono, VeraMono.ttf, Vera Sans Mono)
-#endif
+STD_FONT_FILE( gid_File_Fnt_Veramono, VeraMono.ttf, Vera Sans Mono)
 #endif
 
-#ifdef UNX
-#ifndef WITHOUT_FONTS
-STD_FONTUNX_FILE( gid_File_Fnt_Verase, VeraSe.ttf, Vera Serif)
-#endif
-#endif
-#ifdef WNT
 #ifndef WITHOUT_FONTS
-STD_FONTWIN_FILE( gid_File_Fnt_Verase, VeraSe.ttf, Vera Serif)
-#endif
+STD_FONT_FILE( gid_File_Fnt_Verase, VeraSe.ttf, Vera Serif)
 #endif
 
-#ifdef UNX
 #ifndef WITHOUT_FONTS
-STD_FONTUNX_FILE( gid_File_Fnt_Verasebd, VeraSeBd.ttf, Vera Serif Bold)
-#endif
-#endif
-#ifdef WNT
-#ifndef WITHOUT_FONTS
-STD_FONTWIN_FILE( gid_File_Fnt_Verasebd, VeraSeBd.ttf, Vera Serif Bold)
-#endif
+STD_FONT_FILE( gid_File_Fnt_Verasebd, VeraSeBd.ttf, Vera Serif Bold)
 #endif