Commit b4761763 authored by Kevin Cozens's avatar Kevin Cozens Committed by Kevin Cozens

Start lines with tabs instead of spaces.

2006-11-21  Kevin Cozens  <kcozens@cvs.gnome.org>

	* Makefile.am: Start lines with tabs instead of spaces.

	* tinyscheme/Makefile.am: Removed setting of USE_STRCASECMP.

	* tinyscheme/scheme-private.h: Added some function prototypes. Don't
	use USE_MACRO.

	* tinyscheme/scheme.h: Removed references to USE_STRCASECMP. Added
	SCHEME_EXPORT to prototype for scheme_set_input_port_file().

	* tinyscheme/scheme.c: Open files in binary mode. Added SCHEME_EXPORT
	to scheme_set_input_port_file() and scheme_set_output_port_file()
	declarations. Removed references to USE_STRCASECMP. Renamed stricmp()
	to utf8_stricmp and updated it to call g_utf8_strcasefold instead of
	g_utf8_strdown. Added #define to map stricmp to utf8_stricmp.

	* scripts/Makefile.am: Fixed ordering in lists.

	* scripts/grid-system.scm: Don't register in the menus since the
	script duplicates functionality of a better plug-in.

	* scripts/paste-as-brush.scm: Moved set! to let* block.
	* scripts/paste-as-pattern.scm: Added let* block to defined variables.
	* scripts/tiny-fu.init: Don't load script-fu-compat.init here.
	* scripts/ts-helloworld.scm: Don't translate strings in test scripts.
parent 45f35d6c
2006-11-21 Kevin Cozens <kcozens@cvs.gnome.org>
* Makefile.am: Start lines with tabs instead of spaces.
* tinyscheme/Makefile.am: Removed setting of USE_STRCASECMP.
* tinyscheme/scheme-private.h: Added some function prototypes. Don't
use USE_MACRO.
* tinyscheme/scheme.h: Removed references to USE_STRCASECMP. Added
SCHEME_EXPORT to prototype for scheme_set_input_port_file().
* tinyscheme/scheme.c: Open files in binary mode. Added SCHEME_EXPORT
to scheme_set_input_port_file() and scheme_set_output_port_file()
declarations. Removed references to USE_STRCASECMP. Renamed stricmp()
to utf8_stricmp and updated it to call g_utf8_strcasefold instead of
g_utf8_strdown. Added #define to map stricmp to utf8_stricmp.
* scripts/Makefile.am: Fixed ordering in lists.
* scripts/grid-system.scm: Don't register in the menus since the
script duplicates functionality of a better plug-in.
* scripts/paste-as-brush.scm: Moved set! to let* block.
* scripts/paste-as-pattern.scm: Added let* block to defined variables.
* scripts/tiny-fu.init: Don't load script-fu-compat.init here.
* scripts/ts-helloworld.scm: Don't translate strings in test scripts.
2006-11-18 Kevin Cozens <kcozens@cvs.gnome.org>
* tiny-fu/ts-wrapper.c (marshall_proc_db_call): Set return_val before
......
## Process this file with automake to produce Makefile.in
SUBDIRS = \
po \
ftx \
re \
tinyscheme \
tiny-fu \
scripts
po \
ftx \
re \
tinyscheme \
tiny-fu \
scripts
EXTRA_DIST = \
AUTHORS \
ChangeLog \
COPYING \
MAINTAINERS \
NEWS \
TODO \
autogen.sh \
debug-tiny-fu.txt \
intltool-extract.in \
intltool-merge.in \
intltool-update.in
AUTHORS \
ChangeLog \
COPYING \
MAINTAINERS \
NEWS \
TODO \
autogen.sh \
debug-tiny-fu.txt \
intltool-extract.in \
intltool-merge.in \
intltool-update.in
DISTCLEANFILES = \
intltool-extract \
intltool-merge \
intltool-update
intltool-extract \
intltool-merge \
intltool-update
......@@ -5,113 +5,113 @@ SUBDIRS = images
scriptdatadir = $(GIMP_DATADIR)/scripts
scripts = \
tiny-fu.init \
script-fu-compat.init \
3d-outline.scm \
3dTruchet.scm \
add-bevel.scm \
addborder.scm \
alien-glow-arrow.scm \
alien-glow-bar.scm \
alien-glow-bullet.scm \
alien-glow-button.scm \
alien-glow-logo.scm \
alien-neon-logo.scm \
basic1-logo.scm \
basic2-logo.scm \
beveled-button.scm \
beveled-pattern-arrow.scm \
beveled-pattern-bullet.scm \
beveled-pattern-button.scm \
beveled-pattern-heading.scm \
beveled-pattern-hrule.scm \
blend-anim.scm \
blended-logo.scm \
bovinated-logo.scm \
burn-in-anim.scm \
camo.scm \
carved-logo.scm \
carve-it.scm \
chalk.scm \
chip-away.scm \
chrome-it.scm \
chrome-logo.scm \
circuit.scm \
clothify.scm \
coffee.scm \
comic-logo.scm \
contactsheet.scm \
coolmetal-logo.scm \
copy-visible.scm \
crystal-logo.scm \
distress-selection.scm \
drop-shadow.scm \
erase-rows.scm \
fade-outline.scm \
flatland.scm \
font-map.scm \
frosty-logo.scm \
fuzzyborder.scm \
gimp-headers.scm \
gimp-labels.scm \
glossy.scm \
glowing-logo.scm \
gradient-bevel-logo.scm \
gradient-example.scm \
grid-system.scm \
guides-from-selection.scm \
guides-new-percent.scm \
guides-new.scm \
guides-remove-all.scm \
hsv-graph.scm \
i26-gunya2.scm \
land.scm \
lava.scm \
line-nova.scm \
mkbrush.scm \
neon-logo.scm \
news-text.scm \
old-photo.scm \
paste-as-brush.scm \
paste-as-pattern.scm \
perspective-shadow.scm \
predator.scm \
pupi-button.scm \
rendermap.scm \
reverse-layers.scm \
ripply-anim.scm \
round-corners.scm \
selection-round.scm \
select-to-brush.scm \
select-to-image.scm \
select-to-pattern.scm \
slide.scm \
sota-chrome-logo.scm \
speed-text.scm \
sphere.scm \
spinning-globe.scm \
spyrogimp.scm \
starburst-logo.scm \
starscape-logo.scm \
swirltile.scm \
swirly-pattern.scm \
text-circle.scm \
textured-logo.scm \
tileblur.scm \
tiny-fu-util.scm \
tiny-fu-set-cmap.scm \
title-header.scm \
t-o-p-logo.scm \
truchet.scm \
unsharp-mask.scm \
waves-anim.scm \
weave.scm \
web-browser.scm \
xach-effect.scm
tiny-fu.init \
script-fu-compat.init \
3d-outline.scm \
3dTruchet.scm \
add-bevel.scm \
addborder.scm \
alien-glow-arrow.scm \
alien-glow-bar.scm \
alien-glow-bullet.scm \
alien-glow-button.scm \
alien-glow-logo.scm \
alien-neon-logo.scm \
basic1-logo.scm \
basic2-logo.scm \
beveled-button.scm \
beveled-pattern-arrow.scm \
beveled-pattern-bullet.scm \
beveled-pattern-button.scm \
beveled-pattern-heading.scm \
beveled-pattern-hrule.scm \
blend-anim.scm \
blended-logo.scm \
bovinated-logo.scm \
burn-in-anim.scm \
camo.scm \
carve-it.scm \
carved-logo.scm \
chalk.scm \
chip-away.scm \
chrome-it.scm \
chrome-logo.scm \
circuit.scm \
clothify.scm \
coffee.scm \
comic-logo.scm \
contactsheet.scm \
coolmetal-logo.scm \
copy-visible.scm \
crystal-logo.scm \
distress-selection.scm \
drop-shadow.scm \
erase-rows.scm \
fade-outline.scm \
flatland.scm \
font-map.scm \
frosty-logo.scm \
fuzzyborder.scm \
gimp-headers.scm \
gimp-labels.scm \
glossy.scm \
glowing-logo.scm \
gradient-bevel-logo.scm \
gradient-example.scm \
grid-system.scm \
guides-from-selection.scm \
guides-new.scm \
guides-new-percent.scm \
guides-remove-all.scm \
hsv-graph.scm \
i26-gunya2.scm \
land.scm \
lava.scm \
line-nova.scm \
mkbrush.scm \
neon-logo.scm \
news-text.scm \
old-photo.scm \
paste-as-brush.scm \
paste-as-pattern.scm \
perspective-shadow.scm \
predator.scm \
pupi-button.scm \
rendermap.scm \
reverse-layers.scm \
ripply-anim.scm \
round-corners.scm \
select-to-brush.scm \
select-to-image.scm \
select-to-pattern.scm \
selection-round.scm \
slide.scm \
sota-chrome-logo.scm \
speed-text.scm \
sphere.scm \
spinning-globe.scm \
spyrogimp.scm \
starburst-logo.scm \
starscape-logo.scm \
swirltile.scm \
swirly-pattern.scm \
t-o-p-logo.scm \
text-circle.scm \
textured-logo.scm \
tileblur.scm \
tiny-fu-util.scm \
tiny-fu-set-cmap.scm \
title-header.scm \
truchet.scm \
unsharp-mask.scm \
waves-anim.scm \
weave.scm \
web-browser.scm \
xach-effect.scm
test_scripts = \
test-sphere.scm \
ts-helloworld.scm
test-sphere.scm \
ts-helloworld.scm
if TINY_FU_UNSTABLE
......
......@@ -93,5 +93,3 @@
SF-VALUE _"Y divisions" script-fu-grid-system-y-divides
)
(script-fu-menu-register "script-fu-grid-system"
"<Image>/Filters/Render/Pattern")
......@@ -25,6 +25,12 @@
(brush-image (car (gimp-edit-paste-as-new)))
(brush-draw (car (gimp-image-get-active-drawable brush-image)))
(type (car (gimp-drawable-type brush-draw)))
(path (string-append gimp-directory
"/brushes/"
filename
(number->string brush-image)
".gbr"))
)
(if (= type GRAYA-IMAGE)
......@@ -36,12 +42,6 @@
)
)
(set! path (string-append gimp-directory
"/brushes/"
filename
(number->string brush-image)
".gbr"))
(file-gbr-save RUN-NONINTERACTIVE
brush-image brush-draw path path
spacing name)
......
......@@ -20,15 +20,15 @@
(define (script-fu-paste-as-pattern name filename)
(set! pattern-image (car (gimp-edit-paste-as-new)))
(set! pattern-draw (car (gimp-image-get-active-drawable pattern-image)))
(set! path (string-append gimp-directory
(let* (
(pattern-image (car (gimp-edit-paste-as-new)))
(pattern-draw (car (gimp-image-get-active-drawable pattern-image)))
(path (string-append gimp-directory
"/patterns/"
filename
(number->string pattern-image)
".pat"))
)
(file-pat-save RUN-NONINTERACTIVE
pattern-image pattern-draw path path
......
This diff is collapsed.
This diff is collapsed.
......@@ -50,16 +50,16 @@
)
(script-fu-register "script-fu-helloworld"
_"Hello World"
"_Hello World..."
"Creates an image with a user specified text string."
"Kevin Cozens <kcozens@interlog.com>"
"Kevin Cozens"
"February 29, 2004"
""
SF-STRING _"Text string" "Hello, World!"
SF-FONT _"Font" "Sans"
SF-ADJUSTMENT _"Font size (pixels)" '(100 2 1000 1 10 0 1)
SF-COLOR _"Color" '(0 0 0)
SF-STRING "Text string" "Hello, World!"
SF-FONT "Font" "Sans"
SF-ADJUSTMENT "Font size (pixels)" '(100 2 1000 1 10 0 1)
SF-COLOR "Color" '(0 0 0)
)
(script-fu-menu-register "script-fu-helloworld"
......
......@@ -6,7 +6,6 @@ AM_CFLAGS = \
-DUSE_MATH=1 \
-DUSE_ASCII_NAMES=0 \
-DUSE_STRLWR=0 \
-DUSE_STRCASECMP=1 \
-I$(top_srcdir) \
$(GIMP_CFLAGS)
......
......@@ -45,20 +45,20 @@ enum scheme_types {
#define arraylength(p) ((p)->_object._array._length)
#define arraytype(p) ((p)->_object._array._type)
enum array_type {
array_int32=0,
array_int16=1,
array_int8=2,
array_float=3,
array_string=4
enum array_type {
array_int32=0,
array_int16=1,
array_int8=2,
array_float=3,
array_string=4
};
enum scheme_port_kind {
port_free=0,
port_file=1,
port_string=2,
port_input=16,
port_output=32
enum scheme_port_kind {
port_free=0,
port_file=1,
port_string=2,
port_input=16,
port_output=32
};
typedef struct port {
......@@ -180,19 +180,19 @@ void *ext_data; /* For the benefit of foreign functions */
long gensym_cnt;
struct scheme_interface *vptr;
void *dump_base; /* pointer to base of allocated dump stack */
int dump_size; /* number of frames allocated for dump stack */
void *dump_base; /* pointer to base of allocated dump stack */
int dump_size; /* number of frames allocated for dump stack */
gunichar backchar;
int bc_flag;
};
/* operator code */
enum scheme_opcodes {
#define _OP_DEF(A,B,C,D,E,OP) OP,
#include "opdefines.h"
OP_MAXDEFINED
};
enum scheme_opcodes {
#define _OP_DEF(A,B,C,D,E,OP) OP,
#include "opdefines.h"
OP_MAXDEFINED
};
#define cons(sc,a,b) _cons(sc,a,b,0)
......@@ -206,7 +206,9 @@ long ivalue(pointer p);
double rvalue(pointer p);
int is_integer(pointer p);
int is_real(pointer p);
int is_array(pointer p);
int is_character(pointer p);
int string_length(pointer p);
gunichar charvalue(pointer p);
int is_vector(pointer p);
......@@ -227,9 +229,7 @@ int is_proc(pointer p);
int is_foreign(pointer p);
char *syntaxname(pointer p);
int is_closure(pointer p);
#ifdef USE_MACRO
int is_macro(pointer p);
#endif
pointer closure_code(pointer p);
pointer closure_env(pointer p);
......
......@@ -72,16 +72,15 @@
# include <malloc.h>
#endif /* macintosh */
#ifndef USE_STRCASECMP
#define stricmp g_utf8_collate
#else
static int stricmp(const char *s1, const char *s2)
#define stricmp utf8_stricmp
static int utf8_stricmp(const char *s1, const char *s2)
{
char *s1a, *s2a;
int result;
s1a = g_utf8_strdown(s1, -1);
s2a = g_utf8_strdown(s2, -1);
s1a = g_utf8_strcasefold(s1, -1);
s2a = g_utf8_strcasefold(s2, -1);
result = g_utf8_collate(s1a, s2a);
......@@ -89,7 +88,6 @@ static int stricmp(const char *s1, const char *s2)
g_free(s2a);
return result;
}
#endif
#define min(a, b) ((a <= b) ? a : b)
......@@ -1391,7 +1389,7 @@ static void finalize_cell(scheme *sc, pointer a) {
/* ========== Routines for Reading ========== */
static int file_push(scheme *sc, const char *fname) {
FILE *fin=fopen(fname,"r");
FILE *fin=fopen(fname,"rb");
if(fin!=0) {
sc->file_i++;
sc->load_stack[sc->file_i].kind=port_file|port_input;
......@@ -1425,11 +1423,11 @@ static port *port_rep_from_filename(scheme *sc, const char *fn, int prop) {
char *rw;
port *pt;
if(prop==(port_input|port_output)) {
rw="a+";
rw="a+b";
} else if(prop==port_output) {
rw="w";
rw="wb";
} else {
rw="r";
rw="rb";
}
f=fopen(fn,rw);
if(f==0) {
......@@ -4718,7 +4716,7 @@ int scheme_init_custom_alloc(scheme *sc, func_alloc malloc, func_dealloc free) {
return !sc->no_memory;
}
void scheme_set_input_port_file(scheme *sc, FILE *fin) {
SCHEME_EXPORT void scheme_set_input_port_file(scheme *sc, FILE *fin) {
sc->inport=port_from_file(sc,fin,port_input);
}
......@@ -4726,7 +4724,7 @@ void scheme_set_input_port_string(scheme *sc, char *start, char *past_the_end) {
sc->inport=port_from_string(sc,start,past_the_end,port_input);
}
void scheme_set_output_port_file(scheme *sc, FILE *fout) {
SCHEME_EXPORT void scheme_set_output_port_file(scheme *sc, FILE *fout) {
sc->outport=port_from_file(sc,fout,port_output);
}
......
......@@ -16,7 +16,6 @@
#ifndef _MSC_VER
# define SCHEME_EXPORT
#else
# define USE_STRCASECMP 0
# define USE_STRLWR 0
# ifdef _SCHEME_SOURCE
# define SCHEME_EXPORT __declspec(dllexport)
......@@ -81,10 +80,6 @@
# define USE_COLON_HOOK 1
#endif
#ifndef USE_STRCASECMP /* stricmp for Unix */
# define USE_STRCASECMP 0
#endif
#ifndef USE_STRLWR
# define USE_STRLWR 1
#endif
......@@ -121,7 +116,7 @@ SCHEME_EXPORT scheme *scheme_init_new_custom_alloc(func_alloc malloc, func_deall
SCHEME_EXPORT int scheme_init(scheme *sc);
SCHEME_EXPORT int scheme_init_custom_alloc(scheme *sc, func_alloc, func_dealloc);
SCHEME_EXPORT void scheme_deinit(scheme *sc);
void scheme_set_input_port_file(scheme *sc, FILE *fin);
SCHEME_EXPORT void scheme_set_input_port_file(scheme *sc, FILE *fin);
void scheme_set_input_port_string(scheme *sc, char *start, char *past_the_end);
SCHEME_EXPORT void scheme_set_output_port_file(scheme *sc, FILE *fin);
void scheme_set_output_port_string(scheme *sc, char *start, char *past_the_end);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment