From: ellson Date: Mon, 6 Oct 2008 16:43:57 +0000 (+0000) Subject: some renaming X-Git-Tag: LAST_LIBGRAPH~32^2~3209 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=402bb08affa372c4b2157a2ade3899c05d0b72f8;p=graphviz some renaming --- diff --git a/lib/inkpot/inkpot_lib.tcl b/lib/inkpot/inkpot_lib.tcl index da8b3c34c..c3701e141 100755 --- a/lib/inkpot/inkpot_lib.tcl +++ b/lib/inkpot/inkpot_lib.tcl @@ -4,7 +4,7 @@ set comments 1 set target_line_length 60 set indent " " -set preamble "/*\n * DO NOT EDIT !!\n *\n * The files:\n *\tinkpot_define.h\n *\tinkpot_value_table.h\n *\tinkpot_scheme_table.h\n * are generated as a matched set.\n */\n" +set preamble "/*\n * DO NOT EDIT !!\n *\n * The files:\n *\tinkpot_lib_define.h\n *\tinkpot_lib_value.h\n *\tinkpot_lib_scheme.h\n * are generated as a matched set.\n */\n" if {! $argc} {exit} @@ -55,8 +55,8 @@ foreach {lib} $argv { } } -#------------------------------------------------- write inkpot_value_table.h -set f [open inkpot_value_table.h w] +#------------------------------------------------- write inkpot_lib_value.h +set f [open inkpot_lib_value.h w] puts $f $preamble # generate TAB_VALUES_24 @@ -90,8 +90,8 @@ tab_finalize "};\n" close $f -#------------------------------------------------- write inkpot_scheme_table.h -set f [open inkpot_scheme_table.h w] +#------------------------------------------------- write inkpot_lib_scheme.h +set f [open inkpot_lib_scheme.h w] puts $f $preamble # generate TAB_STRINGS @@ -312,8 +312,8 @@ tab_finalize "};\n" close $f -#------------------------------------------------- write inkpot_define.h -set f [open inkpot_define.h w] +#------------------------------------------------- write inkpot_lib_define.h +set f [open inkpot_lib_define.h w] puts $f $preamble set SZT_VALUES_24 [expr 3*$SZT_VALUES] diff --git a/lib/inkpot/inkpot_scheme.c b/lib/inkpot/inkpot_scheme.c index a8dcf3966..cc1a4b9e7 100644 --- a/lib/inkpot/inkpot_scheme.c +++ b/lib/inkpot/inkpot_scheme.c @@ -22,11 +22,11 @@ #include "inkpot.h" -#include "inkpot_define.h" +#include "inkpot_lib_define.h" #include "inkpot_value.h" #include "inkpot_scheme.h" #include "inkpot_xlate.h" -#include "inkpot_scheme_table.h" +#include "inkpot_lib_scheme.h" static size_t inkpot_writer (void *closure, const char *data, size_t length) { diff --git a/lib/inkpot/inkpot_value.c b/lib/inkpot/inkpot_value.c index b7744894d..ecb2f2c62 100644 --- a/lib/inkpot/inkpot_value.c +++ b/lib/inkpot/inkpot_value.c @@ -19,9 +19,9 @@ #include #include "inkpot.h" -#include "inkpot_define.h" +#include "inkpot_lib_define.h" #include "inkpot_value.h" -#include "inkpot_value_table.h" +#include "inkpot_libi_value.h" inkpot_status_t inkpot_value_set ( inkpot_values_t *values, inkpot_value_t *value ) { diff --git a/lib/inkpot/test/inkpot_define.h b/lib/inkpot/test/inkpot_define.h deleted file mode 100644 index bad79ca10..000000000 --- a/lib/inkpot/test/inkpot_define.h +++ /dev/null @@ -1,59 +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 * - **********************************************************/ - -#define SZT_COLOR_STRINGS 57 -#define SZL_COLOR_STRINGS 6 -typedef unsigned int IDX_COLOR_STRINGS; - -#define SZT_SCHEME_STRINGS 23 -#define SZL_SCHEME_STRINGS 6 -typedef unsigned int IDX_SCHEME_STRINGS; - -#define SZT_SCHEMES 3 -typedef unsigned short MSK_SCHEMES; -typedef unsigned char IDX_SCHEMES; - -#define SZT_SCHEMES_INDEX 2 -typedef unsigned char IDX_SCHEMES_INDEX; - -#define SZT_NAMES 10 -typedef unsigned int IDX_NAMES; - -#define SZT_ALTS 2 -typedef unsigned char IDX_ALTS; - -#define SZT_IXVALUES 7 -typedef unsigned int IDX_IXVALUES; - -#define SZT_VALUE_TO 7 -typedef unsigned int IDX_VALUE_TO; - -#define SZT_TO_NAMES 11 -typedef unsigned int IDX_TO_NAMES; - - -#define SZT_VALUES 7 -typedef unsigned char IDX_VALUES; - -#define SZT_VALUES_64 7 -typedef unsigned char IDX_VALUES_64; - -#define SZT_VALUES_24 21 -typedef unsigned char IDX_VALUES_24; - -#define SZT_NONAME_VALUES 4 -#define SZT_NONAME_VALUES_64 4 -#define SZT_NONAME_VALUES_24 12 diff --git a/lib/inkpot/test/inkpot_scheme_table.h b/lib/inkpot/test/inkpot_scheme_table.h deleted file mode 100644 index 700555b76..000000000 --- a/lib/inkpot/test/inkpot_scheme_table.h +++ /dev/null @@ -1,90 +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_COLOR_STRINGS[SZT_COLOR_STRINGS] = { - "black\0" - "bleu\0" - "blue\0" - "green\0" - "jaune\0" - "red\0" - "rouge\0" - "vert\0" - "white\0" - "yellow\0" -}; - -const char TAB_SCHEME_STRINGS[SZT_SCHEME_STRINGS] = { - "french\0" - "svg\0" - "x11\0" - "xxx\0" - "yyy\0" -}; - -inkpot_scheme_name_t TAB_SCHEMES[SZT_SCHEMES] = { /* schemes of named colors */ - { 0, }, /* french */ - { 7, }, /* svg */ - { 11, }, /* x11 */ -}; - -inkpot_scheme_index_t TAB_SCHEMES_INDEX[SZT_SCHEMES_INDEX] = { /* schemes of indexed colors */ - { 15, 0, }, /* xxx */ - { 19, 5, }, /* yyy */ -}; - -inkpot_name_t TAB_NAMES[SZT_NAMES] = { /* Must be LC_ALL=C sort'ed by name with each alt */ - { 0, 0, 0x6, }, /* black */ - { 6, 1, 0x1, }, /* bleu */ - { 11, 1, 0x6, }, /* blue */ - { 16, 2, 0x6, }, /* green */ - { 22, 5, 0x1, }, /* jaune */ - { 28, 3, 0x6, }, /* red */ - { 32, 3, 0x1, }, /* rouge */ - { 38, 2, 0x1, }, /* vert */ - { 43, 6, 0x6, }, /* white */ - { 50, 0, 0, }, /* yellow (w. alts) */ -}; - -inkpot_name_t TAB_ALTS[SZT_ALTS] = { - { 1, 5, 0x4, }, /* yellow (x11) */ - { 0, 4, 0x2, }, /* yellow (svg) */ -}; - -IDX_VALUE_TO TAB_VALUE_TO[SZT_VALUE_TO] = { - 0, /* black */ - 1, /* bleu, blue */ - 3, /* green, vert */ - 5, /* red, rouge */ - 7, /* yellow (svg) */ - 8, /* yellow (x11), jaune */ - 10, /* white */ -}; - -IDX_NAMES TAB_TO_NAMES[SZT_TO_NAMES] = { - 0, /* black */ - 1, 2, /* bleu, blue */ - 3, 7, /* green, vert */ - 5, 6, /* red, rouge */ - 9, /* yellow(alt1) */ - 4, 9, /* jaune, yellow */ - 8, /* white */ -}; - -IDX_VALUES TAB_IXVALUES[SZT_IXVALUES] = { - 7, 8, 9, 10, 1, /* xxx */ - 0, 6, /* yyy */ -}; diff --git a/lib/inkpot/test/inkpot_value_table.h b/lib/inkpot/test/inkpot_value_table.h deleted file mode 100644 index 620183b23..000000000 --- a/lib/inkpot/test/inkpot_value_table.h +++ /dev/null @@ -1,49 +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_64[SZT_VALUES_64] = { - 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_64[SZT_NONAME_VALUES_64] = { - 0x000000008000ffff, - 0x00000000a400ffff, - 0x00000000c800ffff, - 0x00000000ea00ffff, -}; - -unsigned char TAB_VALUES_24[SZT_VALUES_24] = { - 0, 0, 0, /* black */ - 0, 0, 255, /* bleu, blue */ - 0, 255, 0, /* green, vert */ - 255, 0, 0, /* red, rouge */ - 255, 192, 0, /* yellow (svg) */ - 255, 255, 255, /* yellow (x11), jaune */ - 255, 255, 255, /* white */ -}; - -unsigned char TAB_NONAME_VALUES_24[SZT_NONAME_VALUES_24] = { - 0, 0, 128, - 0, 0, 160, - 0, 0, 192, - 0, 0, 224, -};