*** empty log message ***

diff --git a/cmd/smyrna/draw.c b/cmd/smyrna/draw.c
index 02b2d5e0bf5df80f959825d18eead89115411fac..341aabfdb1f05c03452bc5e1dea98a67d6df730e 100755 (executable)
--- a/cmd/smyrna/draw.c
+++ b/cmd/smyrna/draw.c
@@ -459,7 +459,8 @@ static void EmbedText(xdot_op * op, int param)
        x = (GLfloat) op->u.text.x;
     if (op->u.text.align == -1)
        x = (GLfloat) op->u.text.x + op->u.text.width;
-    fontSize(view->FontSize);
+    fontSize(view->fontset
+               view->FontSize);
     if (param == 0)
        fontColor(view->penColor.R, view->penColor.G, view->penColor.B);
     if (param == 1)            //selected

diff --git a/cmd/smyrna/main.c b/cmd/smyrna/main.c
index 9d346426b58de5f43de3db3c4733434f4b61b764..0da23d4f0f9af582acb7d2cc386a1f6b2cc1e909 100755 (executable)
--- a/cmd/smyrna/main.c
+++ b/cmd/smyrna/main.c
@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
        smyrnaDir = SMYRNA_PATH;
 #endif
 
-//     create_font_file("c:\\pango_test.png",(float)64.0,(float)64.0);
+       create_font_file("c:\\pango_test.png",(float)64.0,(float)64.0);
        load_attributes();
 
 #ifdef G_OS_WIN32

diff --git a/cmd/smyrna/smyrnadefs.h b/cmd/smyrna/smyrnadefs.h
index 3f1dbeaf0d8dcf459da8f2b4d763b44a7a0a8e90..f0bcedb2b4714d20987befdec00647325e9e43c0 100644 (file)
--- a/cmd/smyrna/smyrnadefs.h
+++ b/cmd/smyrna/smyrnadefs.h
@@ -18,6 +18,7 @@
 
 #ifdef WIN32
 #include "windows.h"
+#include "gltexfont.h"
 //#define       SMYRNA_GLADE "C:/Projects/graphviz2/share/gui/smyrna.glade"
 #define        SMYRNA_ATTRS "c:/Projects/graphviz2/share/gui/attrs.txt"
 #endif
@@ -494,6 +495,7 @@ typedef struct _ViewInfo
        gvk_layout dfltEngine;
        GtkTextBuffer* consoleText;
        float FontSizeConst;
+       fontset_t* fontset;
 } ViewInfo;
 
 extern ViewInfo *view;