[stsf-commit] stsf/interface stprivate.tmpl, 1.1.1.1, 1.2 sttypes.tmpl, 1.5, 1.6

[Alexander Gelfenbain]

Committed by: adg


Index: stprivate.tmpl
===================================================================
RCS file: /cvs/stsf/stsf/interface/stprivate.tmpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- a/stprivate.tmpl	26 Mar 2004 19:19:56 -0000	1.1.1.1
+++ b/stprivate.tmpl	1 May 2004 01:54:26 -0000	1.2
@@ -285,7 +285,6 @@
 
 #if defined (SOLARIS_DOORS)
 
-
 /* Initial handshake */
 
 typedef struct {
@@ -305,23 +304,10 @@
     // char doorpath[PATH_MAX];    /* Pathname to the private door allocated for the client */
 } DoorHandshakeOut;
 
-    
-
 #endif
 
 
 
-/**
- * 16.16 tranformation matrix 
- */
-#if 0
-typedef struct {
-    F16Dot16 xx;			        /**< transformation matrix value */
-    F16Dot16 xy;			        /**< transformation matrix value */
-    F16Dot16 yx;			        /**< transformation matrix value */
-    F16Dot16 yy;			        /**< transformation matrix value */
-} TMatrix;
-#endif
 
 %TMatrix%
 
@@ -370,18 +356,6 @@
 #define ST_FL_USER                      (1 << 2)            /**< Search the user folder (~/.fonts) */
 
 
-/**
- * STNameTag struct
- */    
-#if 0
-typedef struct {
-    uint16_t platformID;                            /**< TrueType platform ID. See TT_PLATFORM_ */
-    uint16_t encodingID;                            /**< TrueType encoding ID. See TT_ENCODING_ */
-    uint16_t languageID;                            /**< TrueType language ID. See TT_LANGUAGE_ */
-    uint16_t nameID;                                /**< TrueType name ID. See TT_NAME_ */
-} STNameTag;
-#endif
-
 %STNameTag%
 
 
@@ -402,43 +376,6 @@
 /** Font features. Values are specified in FontFeatureTags enum */
 typedef uint32_t STFontFeatureTag;
 
-
-
-#if 0 /* Now in interface.xml */
-
-/**
- * ???
- */
-typedef struct {
-    F16Dot16 xAdvH;                   /**< X Advance vector for horizontal writing mode */
-    F16Dot16 yAdvH;                   /**< Y Advance vector for horizontal writing mode */
-    F16Dot16 xAdvV;                   /**< X Advance vector for vertical writing mode */
-    F16Dot16 yAdvV;                   /**< Y Advance vector for vertical writing mode */
-    F16Dot16 topH;                    /**< top Vector from glyph origin to top-left corner in horisontal mode */
-    F16Dot16 leftH;                   /**< left Vector from glyph origin to top-left corner in horisontal mode */
-    F16Dot16 topV;                    /**< top Vector from glyph origin to top-left corner in vertical mode */
-    F16Dot16 leftV;                   /**< left Vector from glyph origin to top-left corner in vertical mode */
-} STGlyphMetrics;
-
-typedef struct {
-    int16_t xMin;
-    int16_t yMin;
-    int16_t xMax;
-    int16_t yMax;
-} FUnitBBox;
-
-typedef struct {
-    int16_t xMin;
-    int16_t yMin;
-    int16_t xMax;
-    int16_t yMax;
-    uint16_t aw;                       /**< Advance width in horizontal writing mode */
-    int16_t lsb;                       /**< Left sidebearing in horizontal writing mode */
-    uint16_t ah;                       /**< Advance height in vertical writing mode */
-    int16_t tsb;                       /**< Top sidebearing in vertical writing mode */
-} FUnitGlyphMetrics;
-#endif
-
 %STGlyphMetrics%
 
 %FUnitBBox%
@@ -447,18 +384,6 @@
 
 %STGlyphKey%
 
-/**
- * ???
- */
-#if 0
-typedef struct {
-    double xh;                        /**< X Kerning vector for horizontal writing mode */
-    double yh;                        /**< Y Kerning vector for horizontal writing mode */
-    double xv;                        /**< X Kerning vector for vertical writing mode */
-    double yv;                        /**< Y Kerning vector for vertical writing mode */
-} STKernData;
-#endif
-
 %STKernData%
 
 /**
@@ -604,34 +529,9 @@
     fSubstitutedBitmap = 4                        /* The scaler substituted a bitmap */
 } ScaledGlyphFlags;
 
-#if 0
-/* Scaled glyph data */
-typedef struct {
-    ScaledGlyphFlags flags;                       
-    int32_t width;                                  /* width of the character in pixels */
-    int32_t height;                                 /* height of the character in pixels */
-    int32_t bytesPerRow;                            /* number of bytes per one scan line */
-    F16Dot16 xAdvH, yAdvH;                        /* Advance vector for horisontal writing mode */
-    F16Dot16 xAdvV, yAdvV;                        /* Advance vector for vertical writing mode */
-    F16Dot16 topH, leftH;                         /* Vector from glyph origin to top-left corner in horisontal mode */
-    F16Dot16 topV, leftV;                         /* Vector from glyph origin to top-left corner in vertical mode */
-} ScaledGlyphData;
-#endif
 
 %ScaledGlyphData%
 
-#if 0
-typedef struct {
-    double xMin;                              /* global bounding box: xMin                      */
-    double yMin;                              /* global bounding box: yMin                      */
-    double xMax;                              /* global bounding box: xMax                      */
-    double yMax;                              /* global bounding box: yMax                      */
-    double hlinegap;
-    double hascent;
-    double hdescent;
-} ScaledFontMetrics;
-#endif
-
 %ScaledFontMetrics%
 
 /**

Index: sttypes.tmpl
===================================================================
RCS file: /cvs/stsf/stsf/interface/sttypes.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/sttypes.tmpl	22 Apr 2004 00:43:23 -0000	1.5
+++ b/sttypes.tmpl	1 May 2004 01:54:26 -0000	1.6
@@ -953,9 +953,9 @@
 #define ST_SCALER_FREETYPE1             0x46545931          /**< 'FTY1' FreeType version 1 scaler  */
 #define ST_SCALER_FREETYPE2             0x46545932          /**< 'FTY2' FreeType version 2 scaler  */
 #define ST_SCALER_XATM                  0x5841544D          /**< 'XATM' Adobe XATM-based scaler */
+#define ST_SCALER_LUNA                  0x4C554E41          /**< 'LUNA' Luna scaler */
 #define ST_LAYOUTENGINE_ICU             0x49435530          /**< 'ICU0' IBM ICU Layout Engine */
 
-
 /* TT contstants */
 /**
  * Platform ID values