plug-ins/imagemap/imap_cern.y plug-ins/imagemap/imap_csim.y

2003-12-26  Sven Neumann  <sven@gimp.org>

	* plug-ins/imagemap/imap_cern.y
	* plug-ins/imagemap/imap_csim.y
	* plug-ins/imagemap/imap_ncsa.y
	* plug-ins/script-fu/script-fu-console.c
	* plug-ins/script-fu/script-fu-server.c: include gtk.h with angle
	brackets, not quotes.

	* plug-ins/imagemap/imap_cern_parse.[ch]
	* plug-ins/imagemap/imap_csim_parse.[ch]
	* plug-ins/imagemap/imap_ncsa_parse.[ch]: regenerated.

	* plug-ins/imagemap/Makefile.am: added y.tab.h (created by bison)
	to CLEANFILES.
This commit is contained in:
Sven Neumann 2003-12-26 02:27:13 +00:00 committed by Sven Neumann
parent 77a1e3c2a9
commit ed8b3bcb52
14 changed files with 3193 additions and 2246 deletions

View File

@ -1,3 +1,19 @@
2003-12-26 Sven Neumann <sven@gimp.org>
* plug-ins/imagemap/imap_cern.y
* plug-ins/imagemap/imap_csim.y
* plug-ins/imagemap/imap_ncsa.y
* plug-ins/script-fu/script-fu-console.c
* plug-ins/script-fu/script-fu-server.c: include gtk.h with angle
brackets, not quotes.
* plug-ins/imagemap/imap_cern_parse.[ch]
* plug-ins/imagemap/imap_csim_parse.[ch]
* plug-ins/imagemap/imap_ncsa_parse.[ch]: regenerated.
* plug-ins/imagemap/Makefile.am: added y.tab.h (created by bison)
to CLEANFILES.
2003-12-25 Sven Neumann <sven@gimp.org>
* app/core/gimpimagefile.c (gimp_imagefile_save_thumb): return

View File

@ -4,3 +4,4 @@ Makefile
_libs
.libs
imagemap
y.tab.h

View File

@ -149,6 +149,8 @@ LDADD = \
$(GTK_LIBS) \
$(INTLLIBS)
CLEANFILES = y.tab.h
## The following rules are not necessary for most users. They are
## only used by the maintainers who modify the symbols and grammar
## that are used for parsing the map files. These rules are very

View File

@ -22,10 +22,11 @@
*
*/
#include "config.h"
#include <math.h>
#include "gtk/gtk.h"
#include <gtk/gtk.h>
#include "imap_circle.h"
#include "imap_file.h"

File diff suppressed because it is too large Load Diff

View File

@ -1,18 +1,75 @@
typedef union {
/* A Bison parser, made by GNU Bison 1.875a. */
/* Skeleton parser for Yacc-like parsing with Bison,
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
/* As a special exception, when this file is copied by Bison into a
Bison output file, you may use that output file without restriction.
This special exception was added by the Free Software Foundation
in version 1.24 of Bison. */
/* Tokens. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
/* Put the tokens into the symbol table, so that GDB and other debuggers
know about them. */
enum yytokentype {
RECTANGLE = 258,
POLYGON = 259,
CIRCLE = 260,
DEFAULT = 261,
AUTHOR = 262,
DESCRIPTION = 263,
BEGIN_COMMENT = 264,
FLOAT = 265,
COMMENT = 266,
LINK = 267
};
#endif
#define RECTANGLE 258
#define POLYGON 259
#define CIRCLE 260
#define DEFAULT 261
#define AUTHOR 262
#define DESCRIPTION 263
#define BEGIN_COMMENT 264
#define FLOAT 265
#define COMMENT 266
#define LINK 267
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
#line 46 "imap_cern.y"
typedef union YYSTYPE {
int val;
double value;
char id[256];
} YYSTYPE;
#define RECTANGLE 257
#define POLYGON 258
#define CIRCLE 259
#define DEFAULT 260
#define AUTHOR 261
#define DESCRIPTION 262
#define BEGIN_COMMENT 263
#define FLOAT 264
#define COMMENT 265
#define LINK 266
/* Line 1240 of yacc.c. */
#line 67 "y.tab.h"
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
#endif
extern YYSTYPE cern_lval;

View File

@ -22,10 +22,12 @@
*
*/
#include "config.h"
#include <stdlib.h>
#include <string.h>
#include "gtk/gtk.h"
#include <gtk/gtk.h>
#include "imap_circle.h"
#include "imap_file.h"

File diff suppressed because it is too large Load Diff

View File

@ -1,43 +1,107 @@
#ifndef BISON_Y_TAB_H
# define BISON_Y_TAB_H
/* A Bison parser, made by GNU Bison 1.875a. */
#ifndef YYSTYPE
typedef union {
/* Skeleton parser for Yacc-like parsing with Bison,
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
/* As a special exception, when this file is copied by Bison into a
Bison output file, you may use that output file without restriction.
This special exception was added by the Free Software Foundation
in version 1.24 of Bison. */
/* Tokens. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
/* Put the tokens into the symbol table, so that GDB and other debuggers
know about them. */
enum yytokentype {
IMG = 258,
SRC = 259,
WIDTH = 260,
HEIGHT = 261,
BORDER = 262,
USEMAP = 263,
START_MAP = 264,
END_MAP = 265,
NAME = 266,
AREA = 267,
SHAPE = 268,
COORDS = 269,
ALT = 270,
HREF = 271,
NOHREF = 272,
TARGET = 273,
ONMOUSEOVER = 274,
ONMOUSEOUT = 275,
ONFOCUS = 276,
ONBLUR = 277,
AUTHOR = 278,
DESCRIPTION = 279,
BEGIN_COMMENT = 280,
END_COMMENT = 281,
FLOAT = 282,
STRING = 283
};
#endif
#define IMG 258
#define SRC 259
#define WIDTH 260
#define HEIGHT 261
#define BORDER 262
#define USEMAP 263
#define START_MAP 264
#define END_MAP 265
#define NAME 266
#define AREA 267
#define SHAPE 268
#define COORDS 269
#define ALT 270
#define HREF 271
#define NOHREF 272
#define TARGET 273
#define ONMOUSEOVER 274
#define ONMOUSEOUT 275
#define ONFOCUS 276
#define ONBLUR 277
#define AUTHOR 278
#define DESCRIPTION 279
#define BEGIN_COMMENT 280
#define END_COMMENT 281
#define FLOAT 282
#define STRING 283
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
#line 49 "imap_csim.y"
typedef union YYSTYPE {
int val;
double value;
char id[256];
} yystype;
# define YYSTYPE yystype
} YYSTYPE;
/* Line 1240 of yacc.c. */
#line 99 "y.tab.h"
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
#endif
# define IMG 257
# define SRC 258
# define WIDTH 259
# define HEIGHT 260
# define BORDER 261
# define USEMAP 262
# define START_MAP 263
# define END_MAP 264
# define NAME 265
# define AREA 266
# define SHAPE 267
# define COORDS 268
# define ALT 269
# define HREF 270
# define NOHREF 271
# define TARGET 272
# define ONMOUSEOVER 273
# define ONMOUSEOUT 274
# define ONFOCUS 275
# define ONBLUR 276
# define AUTHOR 277
# define DESCRIPTION 278
# define BEGIN_COMMENT 279
# define END_COMMENT 280
# define FLOAT 281
# define STRING 282
extern YYSTYPE csim_lval;
#endif /* not BISON_Y_TAB_H */

View File

@ -22,9 +22,11 @@
*
*/
#include "config.h"
#include <math.h>
#include "gtk/gtk.h"
#include <gtk/gtk.h>
#include "imap_circle.h"
#include "imap_file.h"

File diff suppressed because it is too large Load Diff

View File

@ -1,19 +1,77 @@
typedef union {
/* A Bison parser, made by GNU Bison 1.875a. */
/* Skeleton parser for Yacc-like parsing with Bison,
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
/* As a special exception, when this file is copied by Bison into a
Bison output file, you may use that output file without restriction.
This special exception was added by the Free Software Foundation
in version 1.24 of Bison. */
/* Tokens. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
/* Put the tokens into the symbol table, so that GDB and other debuggers
know about them. */
enum yytokentype {
RECTANGLE = 258,
POLYGON = 259,
CIRCLE = 260,
DEFAULT = 261,
AUTHOR = 262,
TITLE = 263,
DESCRIPTION = 264,
BEGIN_COMMENT = 265,
FLOAT = 266,
LINK = 267,
COMMENT = 268
};
#endif
#define RECTANGLE 258
#define POLYGON 259
#define CIRCLE 260
#define DEFAULT 261
#define AUTHOR 262
#define TITLE 263
#define DESCRIPTION 264
#define BEGIN_COMMENT 265
#define FLOAT 266
#define LINK 267
#define COMMENT 268
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
#line 46 "imap_ncsa.y"
typedef union YYSTYPE {
int val;
double value;
char id[256];
} YYSTYPE;
#define RECTANGLE 257
#define POLYGON 258
#define CIRCLE 259
#define DEFAULT 260
#define AUTHOR 261
#define TITLE 262
#define DESCRIPTION 263
#define BEGIN_COMMENT 264
#define FLOAT 265
#define LINK 266
#define COMMENT 267
/* Line 1240 of yacc.c. */
#line 69 "y.tab.h"
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
#endif
extern YYSTYPE ncsa_lval;

View File

@ -27,8 +27,8 @@
#endif
#include <sys/stat.h>
#include "gdk/gdkkeysyms.h"
#include "gtk/gtk.h"
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
#include "libgimp/gimp.h"
#include "libgimp/gimpui.h"

View File

@ -16,6 +16,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <glib.h> /* For G_OS_WIN32 */
#ifndef G_OS_WIN32
@ -34,18 +36,17 @@
#include <arpa/inet.h>
#include <netdb.h>
#include "config.h"
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif /* HAVE_SYS_SELECT_H */
#include <gtk/gtk.h>
#include "libgimp/gimp.h"
#include "libgimp/gimpui.h"
#include "script-fu-intl.h"
#include "gtk/gtk.h"
#include "siod-wrapper.h"
#include "script-fu-server.h"