preparing for textfont dict in GVC_t

diff --git a/lib/gvc/gvcext.h b/lib/gvc/gvcext.h
index 91b0ceb408dbae1555f30ad51fc7c3df3d7519c2..189c78739b06c4502b5e6d068afa02f3f7746ec1 100644 (file)
--- a/lib/gvc/gvcext.h
+++ b/lib/gvc/gvcext.h
@@ -53,6 +53,7 @@ extern "C" {
 #undef ELEM
 
     typedef struct GVJ_s GVJ_t;
+    typedef struct GVG_s GVG_t;
     typedef struct GVC_s GVC_t;
 
     typedef struct {

diff --git a/lib/gvc/gvcint.h b/lib/gvc/gvcint.h
index 340dd483cdbaf9b4c64db5c94a674db4e16c1c6c..3688f8ff7a6e7ceacc9659b8640e2414ed9a8689 100644 (file)
--- a/lib/gvc/gvcint.h
+++ b/lib/gvc/gvcint.h
@@ -20,6 +20,7 @@
 extern "C" {
 #endif
 
+#include "cdt.h"
 #include "gvcommon.h"
 #include "color.h"
 
@@ -55,8 +56,6 @@ extern "C" {
                                        or NULL if not yet loaded */
     };
 
-    typedef struct GVG_s GVG_t;
-
     struct GVG_s {
        GVC_t *gvc;     /* parent gvc */
        GVG_t *next;    /* next gvg in list */
@@ -92,6 +91,12 @@ extern "C" {
         /* externally provided write() displine */
        size_t (*write_fn) (GVJ_t *job, const char *s, size_t len);
 
+       /* fonts and textlayout */
+       Dtdisc_t textfont_disc;
+       Dt_t *textfont_dict;
+       gvplugin_active_textlayout_t textlayout; /* always use best avail for all jobs */
+//     void (*free_layout) (void *layout);   /* function for freeing layouts (mostly used by pango) */
+       
 /* FIXME - everything below should probably move to GVG_t */
 
        /* gvrender_config() */
@@ -101,7 +106,6 @@ extern "C" {
        graph_t *g;      /* current graph */
 
        /* gvrender_begin_job() */
-       gvplugin_active_textlayout_t textlayout;
        gvplugin_active_layout_t layout;
 
        char *graphname;        /* name from graph */