clean out more CODEGEN bits - mostly comments

diff --git a/cmd/tools/.cvsignore b/cmd/tools/.cvsignore
index 301a7d49271fffbbaa19d3a9e96016856859b2cd..4a04a004987affd77dc98003a674a66dccd5a2d1 100644 (file)
--- a/cmd/tools/.cvsignore
+++ b/cmd/tools/.cvsignore
@@ -20,5 +20,10 @@ nop
 sccmap
 tred
 unflatten
+gml2gv
+gmlparse.[ch]
+gmlscan.c
+y.output
+y.tab.[ch]
 *.pdf
 CMakeFiles CMakeTmp CMakeFiles CMakeCache.txt cmake_install.cmake

diff --git a/config.h.old b/config.h.old
index 03f668f090fc2be2ba326a91617fa2f47a9a88cd..4471e9648ad79d4f13b258bc97669a6bcd0d664d 100644 (file)
--- a/config.h.old
+++ b/config.h.old
@@ -122,9 +122,6 @@
 /*******************************************************************/
 /* The following usually aren't changed.                           */
 /*******************************************************************/
-/* Define if you want the old codegens */
-#define WITH_CODEGENS 1
-
 /* Define if you don't want on-demand plugin loading */
 #define DISABLE_LTDL 1
 

diff --git a/config.iffe b/config.iffe
index fd14d8e6e658b7f7dfec4b3362f7b40a4fdc2ca5..81fcd85757a51ea010b1910d5d700e8287e5451a 100644 (file)
--- a/config.iffe
+++ b/config.iffe
@@ -234,9 +234,6 @@ cat{
 /*******************************************************************/
 /* The following usually aren't changed.                           */
 /*******************************************************************/
-/* Define if you want the old codegens */
-#define WITH_CODEGENS 1
-
 /* Define if you don't want on-demand plugin loading */
 #define DISABLE_LTDL 1
 

diff --git a/configure.ac b/configure.ac
index 067607892a9c39878b7c31ac99d84695ae3437a1..744c8154b6369f7683e80ca59c2ecc9098599bb3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -518,21 +518,6 @@ AM_PROG_LIBTOOL
 #AC_CHECK_LIB([xml2], [main])
 #AC_CHECK_LIB([z], [main])
 
-dnl -----------------------------------
-dnl old codegens
-
-AC_ARG_WITH(codegens,
-  [AS_HELP_STRING([--with-codegens=no],[use old codegens])],
-  [],[with_codegens=no])
-
-if test "x$with_codegens" = "xyes"; then
-  use_codegens="Yes"
-  AC_DEFINE(WITH_CODEGENS,1,[Define if you want the old codegens])
-else
-  use_codegens="No (disabled by default - deprecated)"
-fi
-AM_CONDITIONAL(WITH_CODEGENS, [test "x$use_codegens" = "xYes"])
-
 dnl -----------------------------------
 dnl ElectricFence support for debugging
 
@@ -3162,7 +3147,6 @@ echo "graphviz-$VERSION will be compiled with the following:"
 echo ""
 echo "options:"
 echo "  cgraph:        $use_cgraph"
-echo "  codegens:      $use_codegens"
 echo "  digcola:       $use_digcola"
 echo "  expat:         $use_expat"
 echo "  fontconfig:    $use_fontconfig"

diff --git a/doc/winbuild.html b/doc/winbuild.html
index 1f4df5c936e6135642f9fba7e5ccb85993901900..cd263bc8f3b0ce3c58b9c55d941815a4849f7fa6 100644 (file)
--- a/doc/winbuild.html
+++ b/doc/winbuild.html
@@ -72,7 +72,7 @@ export PANGOFLAGS="--with-fontconfig --with-fontconfiglibdir$FONTCONFIGLIBDIR --
 <LI> Change directory to $ROOT and run configure:<BR>
 <CODE>
 <PRE>
-./configure -C --prefix=$INSTALLROOT --without-gdk-pixbuf --with-mylibgd --disable-swig --without-x  --disable-tcl --without-ipsepcola --with-codegens --enable-shared --disable-static --with-freetype=$GTKDIR/lib --enable-ltdl $PANGOFLAGS --without-gtk --without-gtkgl
+./configure -C --prefix=$INSTALLROOT --without-gdk-pixbuf --with-mylibgd --disable-swig --without-x  --disable-tcl --without-ipsepcola --enable-shared --disable-static --with-freetype=$GTKDIR/lib --enable-ltdl $PANGOFLAGS --without-gtk --without-gtkgl
 
 </PRE>
 </CODE>

diff --git a/graphs/directed/Makefile.am b/graphs/directed/Makefile.am
index 5232db4371076e908f1d321c914639ca4efc7a2d..507dd604bb1102133fb1fafaf3d407683bc953ec 100644 (file)
--- a/graphs/directed/Makefile.am
+++ b/graphs/directed/Makefile.am
@@ -19,9 +19,6 @@ EXTRA_DIST = $(GRAPHS)
 
 CLEANFILES = core *.gv.* *.png .xvpics/* 
 
-# CODEGEN_FORMATS = -Tdia -Thpgl -Tmif -Tmp -Tpic -Tpcl -Tvtx
-CODEGEN_FORMATS = 
-
 test:
        $(top_builddir)/cmd/dot/dot \
                -Tcanon -Tgv -Tplain -Tplain-ext -Txdot \
@@ -30,7 +27,7 @@ test:
                -Tpng:cairo -Tpng:gd -Tpng:cairo:gd -Tpng:cairo:cairo -Tpng:gd:gd \
                -Tps -Tps2 -Tps:lasi -Tps:cairo -Tpdf \
                -Tsvg -Tsvg:cairo -Tsvgz -Tvrml \
-               $(CODEGEN_FORMATS) -O $(GRAPHS) 
+               -O $(GRAPHS) 
 ins_test:
        dot \
                 -Tcanon -Tgv -Tplain -Tplain-ext -Txdot \
@@ -39,7 +36,7 @@ ins_test:
                -Tpng:cairo -Tpng:gd -Tpng:cairo:gd -Tpng:cairo:cairo -Tpng:gd:gd \
                 -Tps -Tps2 -Tps:lasi -Tps:cairo -Tpdf \
                 -Tsvg -Tsvg:cairo -Tsvgz -Tvrml \
-                $(CODEGEN_FORMATS) -O $(GRAPHS) 
+                -O $(GRAPHS) 
 
 #      for i in $(GRAPHS); do \
 #              echo "dot $$i"; \

diff --git a/graphs/undirected/Makefile.am b/graphs/undirected/Makefile.am
index fe90e3544a6673a0294d6ec95cb573b7d911752f..e1845c49887086721a6b84769dd426648b25d0f8 100644 (file)
--- a/graphs/undirected/Makefile.am
+++ b/graphs/undirected/Makefile.am
@@ -11,9 +11,6 @@ EXTRA_DIST = $(GRAPHS)
 
 CLEANFILES = core *.gv.* *.png .xvpics/* 
 
-# CODEGEN_FORMATS = -Tdia -Thpgl -Tmif -Tmp -Tpic -Tpcl -Tvtx
-CODEGEN_FORMATS =
-
 test:
        $(top_builddir)/cmd/dot/dot -Kneato \
                -Tcanon -Tgv -Tplain -Tplain-ext -Txdot \
@@ -21,7 +18,7 @@ test:
                -Tjpg -Tpdf -Tfig -Tgif -Tpng \
                -Tps -Tps2 -Tps:lasi -Tps:cairo -Tpdf \
                -Tsvg -Tsvg:cairo -Tsvgz -Tvrml \
-               $(CODEGEN_FORMATS) -O $(GRAPHS) 
+               -O $(GRAPHS) 
 
 #      for i in $(GRAPHS); do \
 #              echo "neato $$i"; \

diff --git a/lib/common/Makefile.old b/lib/common/Makefile.old
index bae88716a5477a19f3ffd91622595ebfa89d8c05..d69630f64cb69009d1c78659d4e03f500b531c18 100644 (file)
--- a/lib/common/Makefile.old
+++ b/lib/common/Makefile.old
@@ -23,14 +23,11 @@ NOINST_HDRS = render.h utils.h memory.h \
        geomprocs.h colorprocs.h const.h macros.h pointset.h
 NOINST_GENERATED_HDRS = colortbl.h htmltable.h  htmlparse.h htmllex.h 
 
-GD_CODEGENS = 
-CODEGENS = $(GD_CODEGENS) diagen.o hpglgen.o mifgen.o mpgen.o picgen.o vtxgen.o 
-
 OBJS = arrows.o colxlate.o fontmetrics.o \
        args.o memory.o globals.o htmllex.o htmlparse.o htmltable.o input.o \
        pointset.o postproc.o routespl.o splines.o psusershape.o \
        timing.o labels.o ns.o shapes.o utils.o geom.o \
-       output.o emit.o $(CODEGENS)
+       output.o emit.o
 
 libcommon.a : $(OBJS)
        $(RM) libcommon.a

diff --git a/lib/common/htmltable.c b/lib/common/htmltable.c
index 7685c7e65484534ede42069931637ac4ab71bddd..03fff1f9187295eceaed3d40f2ab53b352802224 100644 (file)
--- a/lib/common/htmltable.c
+++ b/lib/common/htmltable.c
@@ -17,7 +17,7 @@
 
 /* Implementation of HTML-like tables.
  * 
- * The CodeGen graphics model, especially with integral coodinates, is
+ * The (now purged) CodeGen graphics model, especially with integral coodinates, is
  * not adequate to handle this as we would like. In particular, it is
  * difficult to handle notions of adjacency and correct rounding to pixels.
  * For example, if 2 adjacent boxes bb1.UR.x == bb2.LL.x, the rectangles
@@ -173,14 +173,9 @@ emit_htextparas(GVJ_t* job, int nparas, htextpara_t* paras, pointf p,
            tl.layout = ti->layout;
            tl.width = ti->size;
            tl.height = paras[i].lfsize;
-
            tl.just = 'l';
+
            p_.x = p.x;
-#if 0
-/* or */
-           tl.just = 'c';
-           p_.x = p.x + (ti->size/2.0);
-#endif
            gvrender_textpara(job, p_, &tl);
            p.x += ti->size;
             ti++;

diff --git a/lib/common/htmltable.h b/lib/common/htmltable.h
index 4a35db18e25ccb2fce58cb70751a206fc08e2e4b..b62eee0df04dea2f2e18d4e48ac0cc0b65461c12 100644 (file)
--- a/lib/common/htmltable.h
+++ b/lib/common/htmltable.h
@@ -60,7 +60,7 @@ extern "C" {
      * This translation is done when libexpat scans the input.
      */
        
-       /* atomic unit of text emitted using a single htmlfont_t */
+    /* atomic unit of text emitted using a single htmlfont_t */
     typedef struct {
        char *str;
        PostscriptAlias *postscript_alias;
@@ -70,7 +70,7 @@ extern "C" {
        double size, yoffset_layout, yoffset_centerline;
     } textitem_t;
        
-       /* line of textitems_t */
+    /* line of textitems_t */
     typedef struct {
        textitem_t *items;
        short nitems;

diff --git a/lib/common/input.c b/lib/common/input.c
index d2f3ebacc88b97907213f7a29228242d6d41f3e7..da11276b17465e35ed7979d2a097b3b973e67c3a 100644 (file)
--- a/lib/common/input.c
+++ b/lib/common/input.c
@@ -246,9 +246,9 @@ void dotneato_args_initialize(GVC_t * gvc, int argc, char **argv)
            gvc->common.info[1], gvc->common.info[2]);
     }
 
-    /* configure for available plugins and codegens */
-               /* needs to know if "dot -c" is set (gvc->common.config) */
-               /* must happen before trying to select any plugins */
+    /* configure for available plugins */
+    /* needs to know if "dot -c" is set (gvc->common.config) */
+    /* must happen before trying to select any plugins */
     gvconfig(gvc, gvc->common.config);
     if (gvc->common.config)
        exit (0);

diff --git a/lib/common/sources.cmake b/lib/common/sources.cmake
index 3648f55160696ab6ede54ac3d7434a969f222bb6..9981ae659d51a3dcd81a1e66d81a3b60678005c6 100644 (file)
--- a/lib/common/sources.cmake
+++ b/lib/common/sources.cmake
@@ -66,17 +66,6 @@ SET(common_base_SRCS
        ${common_SRCDIR}/emit.c
 )
 
-SET(common_codegen_SRCS
-       ${common_SRCDIR}/diagen.c
-       ${common_SRCDIR}/figgen.c
-       ${common_SRCDIR}/hpglgen.c
-       ${common_SRCDIR}/mifgen.c
-       ${common_SRCDIR}/mpgen.c
-       ${common_SRCDIR}/picgen.c
-       ${common_SRCDIR}/vtxgen.c
-       ${common_SRCDIR}/xdgen.c
-)
-
 set(common_generated_SRCS
        ${common_SRCDIR}/colortbl.h
        ${common_SRCDIR}/htmlparse.h
@@ -86,6 +75,5 @@ set(common_generated_SRCS
 
 set(common_SRCS
        ${common_base_SRCS}
-       ${common_codegen_SRCS}
        ${common_generated_SRCS}
 )

diff --git a/lib/common/types.h b/lib/common/types.h
index d65823d5396ed7a7b50969e4fb5d8d5e91d0b370..a5a0d51893eff4e0e52b37864f56fb3f76dcaf8b 100644 (file)
--- a/lib/common/types.h
+++ b/lib/common/types.h
@@ -193,7 +193,7 @@ extern "C" {
        boolean usershape;
     } shape_desc;
 
-#include "usershape.h"         /* usershapes needed by gvc even w/o CODEGENS */
+#include "usershape.h"         /* usershapes needed by gvc */
 
     typedef struct nodequeue {
        node_t **store, **limit, **head, **tail;

diff --git a/lib/common/utils.c b/lib/common/utils.c
index b3f32dd6642b23273901a43b56a460eefb79a7ee..195ca9b8e451486245379025e70a2f8611a6fc8d 100644 (file)
--- a/lib/common/utils.c
+++ b/lib/common/utils.c
@@ -585,7 +585,7 @@ int test_toggle()
 void common_init_node_opt(node_t * n, int shape_init_flag)
 {
     char *str;
-       ND_width(n) =
+    ND_width(n) =
        late_double(n, N_width, DEFAULT_NODEWIDTH, MIN_NODEWIDTH);
     ND_height(n) =
        late_double(n, N_height, DEFAULT_NODEHEIGHT, MIN_NODEHEIGHT);

diff --git a/lib/gvc/gvc.c b/lib/gvc/gvc.c
index b10834f65983497eebd36b02a76f86f7c2864542..a1dcd96a1911415d00e5edbfa9601ad264abc6fe 100644 (file)
--- a/lib/gvc/gvc.c
+++ b/lib/gvc/gvc.c
@@ -38,7 +38,7 @@ GVC_t *gvContext(void)
 #endif
     /* default to no builtins, demand loading enabled */
     gvc = gvNEWcontext(NULL, TRUE);
-    gvconfig(gvc, FALSE); /* configure for available plugins and codegens */
+    gvconfig(gvc, FALSE); /* configure for available plugins */
     return gvc;
 }
 
@@ -53,7 +53,7 @@ GVC_t *gvContextPlugins(const lt_symlist_t *builtins, int demand_loading)
     agattr(NULL, AGNODE, "label", NODENAME_ESC);
 #endif
     gvc = gvNEWcontext(builtins, demand_loading);
-    gvconfig(gvc, FALSE); /* configure for available plugins and codegens */
+    gvconfig(gvc, FALSE); /* configure for available plugins */
     return gvc;
 }
 

diff --git a/lib/gvc/gvcint.h b/lib/gvc/gvcint.h
index 201149c69e278524bba7534421dccf6ad32d293a..8c2b88b24e2629ab365bb5d775b3dcc901d2b23f 100644 (file)
--- a/lib/gvc/gvcint.h
+++ b/lib/gvc/gvcint.h
@@ -49,12 +49,11 @@ extern "C" {
     };
 
     struct gvplugin_available_s {
-       gvplugin_available_t *next;       /* next plugin in linked list, or NULL */
-       const char *typestr;             /* type string, e.g. "png" or "ps" */
-       int quality;             /* programmer assigned quality
-                                       ranking within type (+ve or -ve int)
-                                       - codegens have quality = 0 */
-       gvplugin_package_t *package;   /* details of library containing plugin */
+       gvplugin_available_t *next;     /* next plugin in linked list, or NULL */
+       const char *typestr;            /* type string, e.g. "png" or "ps" */
+       int quality;                    /* Programmer assigned quality ranking within type (+ve or -ve int).
+                                       First implementation of type should be given "0" quality */
+       gvplugin_package_t *package;    /* details of library containing plugin */
        gvplugin_installed_t *typeptr;  /* pointer to jumptable for plugin,
                                        or NULL if not yet loaded */
     };

diff --git a/lib/gvc/gvplugin.h b/lib/gvc/gvplugin.h
index df8a4459f7365736e2e4c243a43e16d0977d6932..126497e35a4a10fc43a0b63ac136999f28c910e9 100644 (file)
--- a/lib/gvc/gvplugin.h
+++ b/lib/gvc/gvplugin.h
@@ -28,7 +28,7 @@ extern "C" {
 /* 
  * Terminology:
  *
- *    package         - e.g. libgvplugin_cairo.so, or table of codegen builtins.
+ *    package         - e.g. libgvplugin_cairo.so
  *       api         - e.g. render
  *          type      - e.g. "png", "ps"
  */
@@ -36,7 +36,6 @@ extern "C" {
     typedef struct {
        int id;         /* an id that is only unique within a package 
                        of plugins of the same api.
-                       A codegen id is unique in in the set of codegens.
                        A renderer-type such as "png" in the cairo package
                        has an id that is different from the "ps" type
                        in the same package */

diff --git a/lib/gvpr/.cvsignore b/lib/gvpr/.cvsignore
index 37e3beedbfcf8df15cf4aab7ce7eea651a774d32..3ceaa1813feba310332244d4f22d24c69a7a5309 100644 (file)
--- a/lib/gvpr/.cvsignore
+++ b/lib/gvpr/.cvsignore
@@ -2,6 +2,8 @@
 *.lo
 .deps
 .libs
+gdefs.h
+mkdefs
 Makefile
 Makefile.in
 *.pdf

diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index 6cac0b08ab33b1a66a5f07391aef0151e1b7e3ba..466c88fa033f19786459b41b266a03bc29b9469a 100644 (file)
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -43,7 +43,7 @@ if WITH_LIBGD
 GDTCLFT = $(top_srcdir)/tclpkg/gdtclft/gdtclft.c
 endif
 
-libtcldot_la_SOURCES = tcldot.c no_builtins.c $(CODEGENS) $(GDTCLFT)
+libtcldot_la_SOURCES = tcldot.c no_builtins.c $(GDTCLFT)
 libtcldot_la_CPPFLAGS = $(AM_CPPFLAGS) -DDEMAND_LOADING=1
 libtcldot_la_LDFLAGS = -no-undefined 
 
@@ -65,7 +65,7 @@ endif
 
 libtcldot_la_LIBADD += $(LIBGEN_LIBS) $(ICONV_LIBS) $(MATH_LIBS)
 
-libtcldot_builtin_la_SOURCES = tcldot.c tcldot_builtins.c $(CODEGENS) $(GDTCLFT)
+libtcldot_builtin_la_SOURCES = tcldot.c tcldot_builtins.c $(GDTCLFT)
 libtcldot_builtin_la_CPPFLAGS = $(AM_CPPFLAGS) -DDEMAND_LOADING=1
 libtcldot_builtin_la_LDFLAGS =
 

diff --git a/tclpkg/tcldot/tcldot.c b/tclpkg/tcldot/tcldot.c
index 3d2a3335dcf7d7a7636f5589fa67480b56323d59..64a851f464c9d924de7b19d6359bed31c5960017 100644 (file)
--- a/tclpkg/tcldot/tcldot.c
+++ b/tclpkg/tcldot/tcldot.c
@@ -1729,7 +1729,7 @@ int Tcldot_Init(Tcl_Interp * interp)
     /* create a GraphViz Context and pass a pointer to it in clientdata */
     gvc = gvNEWcontext(lt_preloaded_symbols, DEMAND_LOADING);
 
-    /* configure for available plugins and codegens */
+    /* configure for available plugins */
     gvconfig(gvc, FALSE);
 
 #ifndef TCLOBJ

diff --git a/windows/bin/runconf.sh b/windows/bin/runconf.sh
index c68f35722b8d1e2ad9070417fa9324805e08d74e..fd778d2af3ea420a63eca3ab13abb5fe855690ed 100644 (file)
--- a/windows/bin/runconf.sh
+++ b/windows/bin/runconf.sh
@@ -46,5 +46,5 @@ do
 esac
 done
 
-echo ./configure -C --prefix=$INSTALLROOT $GDKPIXBUF --with-mylibgd --disable-swig --without-x  --without-tclsh --without-ipsepcola --with-codegens $SHAREFLAGS --with-freetype=$GTKDIR/lib $LTDLFLAGS $PANGOFLAGS
-./configure -C --prefix=$INSTALLROOT $GDKPIXBUF --with-mylibgd --disable-swig --without-x  --without-tclsh --without-ipsepcola --with-codegens $SHAREFLAGS --with-freetype=$GTKDIR/lib $LTDLFLAGS $PANGOFLAGS
+echo ./configure -C --prefix=$INSTALLROOT $GDKPIXBUF --with-mylibgd --disable-swig --without-x  --without-tclsh --without-ipsepcola $SHAREFLAGS --with-freetype=$GTKDIR/lib $LTDLFLAGS $PANGOFLAGS
+./configure -C --prefix=$INSTALLROOT $GDKPIXBUF --with-mylibgd --disable-swig --without-x  --without-tclsh --without-ipsepcola $SHAREFLAGS --with-freetype=$GTKDIR/lib $LTDLFLAGS $PANGOFLAGS