[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kcontrol/kfontinst
From:       Craig Drummond <craig () kde ! org>
Date:       2004-03-17 20:08:27
Message-ID: 20040317200827.6333099C4 () office ! kde ! org
[Download RAW message or body]

CVS commit by craig: 

Preview bitmap fonts.


  M +7 -42     lib/FontEngine.h   1.6
  M +1 -1      viewpart/kfontviewpart.desktop   1.59


--- kdebase/kcontrol/kfontinst/lib/FontEngine.h  #1.5:1.6
@@ -135,26 +135,6 @@ class CFontEngine
         PROPERTIES = 0x2,    // Read weight, familiy, and postscript names
         XLFD       = 0x4    // Read extra details only needed for xlfd (i.e. \
                foundry, width, and spacing)
-#ifdef KFONTINST_AFM
-        ,AFM        = NAME|PROPERTIES|XLFD   // For AFM, just read all properties...
-#endif
-    };
-
-#ifdef KFONTINST_AFM
-    struct TGlyphInfo
-    {
-        enum EConstants
-        {
-            MAX_NAME_LEN = 255
         };
 
-        char name[MAX_NAME_LEN+1];
-        int  scaledWidth,
-             xMin,
-             xMax,
-             yMin,
-             yMax;
-    };
-#endif
-
     private:
 
@@ -192,5 +172,6 @@ class CFontEngine
                       height,
                       greys,
-                      mod;
+                      pitch;
+        bool          mono;
         unsigned char *buffer;
     };
@@ -262,21 +243,4 @@ class CFontEngine
 #endif
 
-#ifdef KFONTINST_AFM
-    //
-    // Metric accsessing functions...  (only work for TrueType & Type1)
-    //
-    int                scaleMetric(int metric);
-    float              getItalicAngle();
-    int                getAscender();
-    int                getDescender();
-    int                getUnderlineThickness();
-    int                getUnderlinePosition(); 
-    int                getBBoxXMin();
-    int                getBBoxXMax();
-    int                getBBoxYMin();
-    int                getBBoxYMax();
-    const TGlyphInfo * getGlyphInfo(unsigned long glyph);
-#endif
-
     //
     // Type1 functions...
@@ -352,5 +316,5 @@ class CFontEngine
                              int &xAdvance, FT_Pointer *ptr);
     void       align32(Bitmap &bmp);
-    bool       drawGlyph(QPixmap &pix, FTC_Image_Desc &font, FT_Size &size, int \
glyphNum, FT_F26Dot6 &x, FT_F26Dot6 &y, +    bool       drawGlyph(QPixmap &pix, \
                FTC_Image_Desc &font, int glyphNum, FT_F26Dot6 &x, FT_F26Dot6 &y,
                          FT_F26Dot6 width, FT_F26Dot6 height, FT_F26Dot6 startX, \
FT_F26Dot6 stepY, int space=0);  #endif
@@ -372,5 +336,6 @@ class CFontEngine
                    itsPath;
     float          itsItalicAngle;
-    int            itsNumFaces;
+    int            itsNumFaces,
+                   itsPixelSize;   // Used for Bitmap fonts
     TFtData        itsFt;
 };

--- kdebase/kcontrol/kfontinst/viewpart/kfontviewpart.desktop  #1.58:1.59
@@ -60,5 +60,5 @@
 Name[zh_TW]=字型檢視器
 Name[zu]=Umbukisi Wohlobo lwamagama
-MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-otf;application/x-font-ttc
 +MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-otf;application/x-font-ttc;application/x-font-pcf;application/x-font-bdf
  ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-KDE-Library=libkfontviewpart


[prev in list] [next in list] [prev in thread] [next in thread]