move stuff around

diff --git a/lib/inkpot/Makefile.old b/lib/inkpot/Makefile.am
similarity index 100%
rename from lib/inkpot/Makefile.old
rename to lib/inkpot/Makefile.am

diff --git a/lib/inkpot/inkpot_define.h b/lib/inkpot/inkpot_define.h
deleted file mode 100644 (file)
index 0ad2da5..0000000
--- a/lib/inkpot/inkpot_define.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $Id$ $Revision$ */
-/* vim:set shiftwidth=4 ts=8: */
-
-/***********************************************************
- *      This software is part of the graphviz package      *
- *                http://www.graphviz.org/                 *
- *                                                         *
- *            Copyright (c) 1994-2008 AT&T Corp.           *
- *                and is licensed under the                *
- *            Common Public License, Version 1.0           *
- *                      by AT&T Corp.                      *
- *                                                         *
- *        Information and Software Systems Research        *
- *              AT&T Research, Florham Park NJ             *
- **********************************************************/
-
-typedef unsigned int   IDX_STRINGS;
-#define SZT_STRINGS 79
-#define SZL_STRINGS 6
-
-typedef unsigned short MSK_SCHEMES_NAME;
-typedef unsigned char  IDX_SCHEMES_NAME;
-#define SZT_SCHEMES_NAME 3
-
-typedef unsigned char  IDX_SCHEMES_INDEX;
-#define SZT_SCHEMES_INDEX 2
-
-typedef unsigned int   IDX_NAMES;
-#define SZT_NAMES 11
-
-typedef unsigned char  IDX_NAME_ALTS;
-#define SZT_NAME_ALTS 2
-
-typedef unsigned int   IDX_MRU_CACHE;
-#define SZT_MRU_CACHE 4
-
-typedef unsigned int   IDX_IXVALUES;
-#define SZT_IXVALUES 7
-typedef unsigned int   IDX_TONAMES;
-#define SZT_TONAMES 7
-
-typedef unsigned int   IDX_VALUES;
-#define SZT_VALUES 7
-#define SZT_NONAME_VALUES 4

diff --git a/lib/inkpot/inkpot_name_table.h b/lib/inkpot/inkpot_name_table.h
deleted file mode 100644 (file)
index 0d6a151..0000000
--- a/lib/inkpot/inkpot_name_table.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* $Id$ $Revision$ */
-/* vim:set shiftwidth=4 ts=8: */
-
-/***********************************************************
- *      This software is part of the graphviz package      *
- *                http://www.graphviz.org/                 *
- *                                                         *
- *            Copyright (c) 1994-2008 AT&T Corp.           *
- *                and is licensed under the                *
- *            Common Public License, Version 1.0           *
- *                      by AT&T Corp.                      *
- *                                                         *
- *        Information and Software Systems Research        *
- *              AT&T Research, Florham Park NJ             *
- **********************************************************/
-
-const char TAB_STRINGS[SZT_STRINGS] = {
-       "french\0"
-       "svg\0"
-       "x11\0" 
-       "black\0"
-       "bleu\0"
-       "blue\0"
-       "green\0"
-       "jaune\0"
-       "red\0" 
-       "rouge\0"
-       "vert\0"
-       "yellow\0"
-       "white\0"
-       "xxx\0"
-       "yyy\0"
-};
-
-inkpot_scheme_name_t TAB_SCHEMES_NAME[SZT_SCHEMES_NAME] = { /* schemes of named colors */
-       {  0, },  /* french */
-       {  7, },  /* svg */
-       { 11, },  /* x11 */
-};
-
-inkpot_scheme_index_t TAB_SCHEMES_INDEX[SZT_SCHEMES_INDEX] = { /* schemes of indexed colors */
-       { 71, 0, }, /* xxx */
-       { 75, 5, }, /* yyy */
-};
-
-inkpot_name_t TAB_NAMES[SZT_NAMES] = { /* Must be LC_ALL=C sort'ed by name with each alt */
-       { 15, 0, 0x6, /* black */  0,  /* black */         }, /* 0  */
-       { 21, 1, 0x1, /* bleu */   1,  /* bleu, blue */    }, /* 1  */
-       { 26, 1, 0x6, /* blue */   2,                      }, /* 2  */
-       { 31, 2, 0x6, /* green */  3,  /* green, vert */   }, /* 3  */
-       { 37, 5, 0x1, /* jaune */  7,                      }, /* 4  */
-       { 43, 3, 0x6, /* red */    5,  /* red, rouge */    }, /* 5  */
-       { 47, 3, 0x1, /* rouge */  6,                      }, /* 6  */
-       { 53, 2, 0x1, /* vert */   10, /* yellow(alt1) */  }, /* 7  */
-       { 65, 6, 0x6, /* white */  4,  /* jaune, yellow */ }, /* 8  */
-       { 58, 5, 0x4, /* yellow */ 9,                      }, /* 9  */
-/* alt1 */
-       { 58, 4, 0x2, /* yellow */ 8,  /* white */         }, /* 10 */
-};
-
-IDX_NAMES TAB_NAME_ALTS[SZT_NAME_ALTS] = {
-       0, 10,
-};
-
-IDX_TONAMES TAB_TONAMES[SZT_TONAMES] = {
-        0,   /* black */
-       1,   /* bleu, blue */
-       3,   /* green, vert */
-       5,   /* red, rouge */
-       7,   /* yellow (svg) */
-       8,   /* yellow (x11), jaune */
-       10,  /* white */
-};
-
-IDX_VALUES TAB_IXVALUES[SZT_IXVALUES] = {
-        7, 8, 9, 10, 1,  /* xxx */
-       0, 6,            /* yyy */
-};
-
-

diff --git a/lib/inkpot/inkpot_scheme.c b/lib/inkpot/inkpot_scheme.c
index a251684d757dd785397d7bf077b47398939ec4e2..50b1806489a5a79c496bbae410089b80221fdd8f 100644 (file)
--- a/lib/inkpot/inkpot_scheme.c
+++ b/lib/inkpot/inkpot_scheme.c
@@ -21,11 +21,12 @@
 #include <assert.h>
 
 #include "inkpot.h"
+
 #include "inkpot_define.h"
 #include "inkpot_value.h"
-#include "inkpot_struct.h"
-#include "inkpot_name_table.h"
+#include "inkpot_scheme.h"
 #include "inkpot_xlate.h"
+#include "inkpot_table.h"
 
 static size_t inkpot_writer (void *closure, const char *data, size_t length)
 {

diff --git a/lib/inkpot/inkpot_struct.h b/lib/inkpot/inkpot_scheme.h
similarity index 100%
rename from lib/inkpot/inkpot_struct.h
rename to lib/inkpot/inkpot_scheme.h

diff --git a/lib/inkpot/inkpot_value.c b/lib/inkpot/inkpot_value.c
index df322b6495c26774af10c3237351a8ebcc8772db..90b0dadc02dd7399800b327af12cdfb3fd6ed85f 100644 (file)
--- a/lib/inkpot/inkpot_value.c
+++ b/lib/inkpot/inkpot_value.c
@@ -21,7 +21,6 @@
 #include "inkpot.h"
 #include "inkpot_define.h"
 #include "inkpot_value.h"
-#include "inkpot_value_table.h"
 
 inkpot_status_t inkpot_value_set ( inkpot_values_t *values, inkpot_value_t *value )
 {

diff --git a/lib/inkpot/inkpot_value_table.h b/lib/inkpot/inkpot_value_table.h
deleted file mode 100644 (file)
index 0c8a410..0000000
--- a/lib/inkpot/inkpot_value_table.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* $Id$ $Revision$ */
-/* vim:set shiftwidth=4 ts=8: */
-
-/***********************************************************
- *      This software is part of the graphviz package      *
- *                http://www.graphviz.org/                 *
- *                                                         *
- *            Copyright (c) 1994-2008 AT&T Corp.           *
- *                and is licensed under the                *
- *            Common Public License, Version 1.0           *
- *                      by AT&T Corp.                      *
- *                                                         *
- *        Information and Software Systems Research        *
- *              AT&T Research, Florham Park NJ             *
- **********************************************************/
-
-unsigned long TAB_VALUES[SZT_VALUES] = {
-    0x000000000000ffff,  /* black */
-    0x00000000ffffffff,  /* bleu, blue */
-    0x0000ffff0000ffff,  /* green, vert */
-    0xffff00000000ffff,  /* red, rouge */
-    0xffffcf000000ffff,  /* yellow (svg) */
-    0xffffffff0000ffff,  /* yellow (x11), jaune */
-    0xffffffffffffffff,  /* white */
-}; 
-
-unsigned long TAB_NONAME_VALUES[SZT_NONAME_VALUES] = {
-    0x000000008000ffff,
-    0x00000000a400ffff,
-    0x00000000c800ffff,
-    0x00000000ea00ffff,
-};