diff --git a/ChangeLog b/ChangeLog index 7dfe62915a..e7761eadf7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Nov 14 20:15:46 CET 1998 Marc Lehmann + + * plug-ins/script-fu/scripts/*: removed the image + argument from functions that no longer need it. + Sat Nov 14 20:02:31 GMT 1998 Austin Donnelly * app/rect_select.c: deal with zero-size selections correctly (ie, @@ -29,7 +34,7 @@ Fri Nov 13 16:48:10 CET 1998 Marc Lehmann app/pencil.c app/paintbrush.c, app/perspective_tool.c, app/posterize.c, rotate_tool.c app/scale_tool.c, app/shear_tool.c, app/text_tool.c, app/threshold.c: - + API-mega-break-it-all patch part one: removed the unnecessary PDB_IMAGE argument from many functions. @@ -39,7 +44,7 @@ Fri Nov 13 16:48:10 CET 1998 Marc Lehmann * app/parasite_cmds.c, libgimp/parasite.[ch], * libgimp/gimp.c, libgimp/gimpprotocol.c * tiff.c, gif.c, script-fu.c: removed all references to - parasite_error() and parasite_is_error(). Enable the + parasite_error() and parasite_is_error(). Enable the passing of null parasites in the pdb. Return a copy of the parasite instead of the orginal in all pdb functions. @@ -60,7 +65,7 @@ Wed Nov 11 02:27:46 CET 1998 Marc Lehmann Tue Nov 10 23:44:07 MET 1998 Sven Neumann * libgimp/gimpmatrix.[ch] - * app/transform_core.c: minimal speedup + * app/transform_core.c: minimal speedup * app/scale_tool.c: Use transform_core_do() for scaling too. This gives a consistent behaviour regarding the corrective transform @@ -72,8 +77,8 @@ Mon Nov 9 16:20:33 MET 1998 Sven Neumann position * plug-ins/script-fu/script-fu-scripts.c - * plug-ins/script-fu/scripts/test-sphere.scm: small cosmetic fixes - + * plug-ins/script-fu/scripts/test-sphere.scm: small cosmetic fixes + Sun Nov 8 17:51:52 PST 1998 Manish Singh * Makefile.am @@ -92,20 +97,20 @@ Sun Nov 8 17:51:52 PST 1998 Manish Singh 1998-11-08 Raja R Harinath * configure.in (sendmail_path): Prefer /usr/sbin/sendmail to - /usr/lib/sendmail. + /usr/lib/sendmail. 1998-11-07 Jay Cox * libgimp/{gimp.h, gimpchannel.c, gimpdrawable.c, gimplayer.c}: export the tattoo functions to the plug-ins - - * libgimp/gserialize.c, libgimp/gserialize.h: new files for + + * libgimp/gserialize.c, libgimp/gserialize.h: new files for serializing structures - + * main.c: test the gserialize functions - + * gimpsignal.h: declare gimp_sigtype_* as extern - + Thu Nov 5 16:42:21 PST 1998 Manish Singh * Makefile.am: added MAINTAINERS to EXTRA_DIST @@ -142,12 +147,12 @@ Thu Nov 5 16:42:21 PST 1998 Manish Singh Thu Nov 5 21:55:46 GMT 1998 Andy Thomas - * app/gradient.c + * app/gradient.c * app/gradient_select.c Changes due to gtk+ updates. Clist have been changed recently - in gtk which required changes to source code. These changes - have only been tested with the gtk version that introduced these + in gtk which required changes to source code. These changes + have only been tested with the gtk version that introduced these changes. (so lets get all those updates going...) Wed Nov 4 11:24:55 EST 1998 Adrian Likins @@ -157,7 +162,7 @@ Wed Nov 4 11:24:55 EST 1998 Adrian Likins Wed Nov 4 22:23:18 GMT 1998 Andy Thomas - * app/gradient.c + * app/gradient.c * app/Makefile.am New files @@ -200,7 +205,7 @@ Sun Nov 1 21:20:04 1998 Austin Donnelly Sat Oct 31 21:47:14 GMT 1998 Andy Thomas * app/gradient.c - + Fixed for problems with renaming + fix for interactions between editor and gradient selection popups. @@ -226,14 +231,14 @@ Sat Oct 31 14:57:40 GMT 1998 Andy Thomas * libgimp/gimpgradientmenu.c New gradient selector widget (smaller than the editor). This can now - be controlled via the PDB. + be controlled via the PDB. New widget which gives easy way to do gradient selections. This new widget is used by script-fu (see the test->sphere script). gradient.c needs to be split up (source is almost already split I will complete this RSN). - + Sat Oct 31 01:37:23 CET 1998 Marc Lehmann * configure.in: make perl use the GLIB_CFLAGS/LIBS vars properly. @@ -241,7 +246,7 @@ Sat Oct 31 01:37:23 CET 1998 Marc Lehmann Tue Oct 6 11:07:56 CEST 1998 Marc Lehmann * app/drawable_cmds.c: corrected documentation for gimp_drawable_fill. - + Fri Oct 30 01:53:56 1998 Jay Cox (jaycox@earthlink.net) * app/parasitelist.c @@ -313,17 +318,17 @@ Fri Oct 23 00:58:37 CEST 1998 Marc Lehmann Thu Oct 22 20:28:18 CEST 1998 Marc Lehmann New directory tree plug-ins/perl/* - + The gimp-perl extension: many, many new files and directories (see plug-ins/perl/MANIFEST for a list). - + It uses a private ChangeLog in plug-ins/perl/Changes. - + * configure.in, plug-ins/Makefile.am, INSTALL: changed to accomodate the new extension. - + * config.h.in: added HAVE_VSNPRINTF, removed duplicate HAVE_VPRINTF. - + Thu Oct 22 04:35:43 PDT 1998 Manish Singh * plug-ins/checkerboard/checkerboard.c: fixed a buglet that @@ -352,7 +357,7 @@ Thu Oct 22 02:30:38 PDT 1998 Manish Singh Wed Oct 21 23:37:01 BST 1998 Andy Thomas - Fixed a problem in gradient.c where if a gradient was selected + Fixed a problem in gradient.c where if a gradient was selected via the PDB and the editor has not been displayed on the screen gimp would crash. @@ -368,12 +373,12 @@ Wed Oct 21 22:38:07 BST 1998 Andy Thomas * plug-ins/script-fu/scripts/glossy.scm * plug-ins/script-fu/scripts/test-sphere.scm * plug-ins/script-fu/scripts/textured-logo.scm - + These scripts use new script-fu type * plug-ins/gfig/gfig.c - Redid yosh fix since I broke backwards compat. in + Redid yosh fix since I broke backwards compat. in gimp_interactive_selection_brush(). Wed Oct 21 20:15:14 CEST 1998 Marc Lehmann @@ -389,7 +394,7 @@ Tue Oct 20 18:34:38 PDT 1998 Manish Singh Mr. Tootums knows! Tue Oct 20 23:20:40 BST 1998 Andy Thomas - + * app/brush_select.h * app/brush_select.c * app/internal_procs.c @@ -406,8 +411,8 @@ Tue Oct 20 23:20:40 BST 1998 Andy Thomas New file libgimp/gimpbrushmneu.c. - Brush dialog can now be fully controlled via the PDB. New widget (not - true widget) type added to libgimpui (gimp_brush_select_widget()). + Brush dialog can now be fully controlled via the PDB. New widget (not + true widget) type added to libgimpui (gimp_brush_select_widget()). Plugins should easily be able to control & select brushes. Script-fu updated to use new widget. See the test script for example. @@ -446,9 +451,9 @@ Wed Oct 14 17:46:15 EDT 1998 Adrian Likins * app/*, po/de.po, de/POTFILES.in, libgimp/gimpintl.h: Lots of ii8n stuff here and some additions to the de.po. Applied gimp-egger-981005-1 ,gimp-egger-981006-1, - gimp-egger-981007-1, gimp-egger-981008-1, + gimp-egger-981007-1, gimp-egger-981008-1, gimp-egger-981009-1.patch, gimp-egger-981010-1.patch. - Patches provided by Daniel Egger + Patches provided by Daniel Egger * plug-in/guillotine/guillotine.c: added the coordinates of the split images from the original image to the title. @@ -457,7 +462,7 @@ Wed Oct 14 17:46:15 EDT 1998 Adrian Likins * plug-in/script-fu/scripts/neon-logo.scm, perspective-shadow.scm, predator.scm,rendermap.scm, ripply-anim.scm, select_to_image.scm,swirltile.scm, - xach-effect.scm: updated scripts to use new script-fu stuff + xach-effect.scm: updated scripts to use new script-fu stuff Wed Oct 14 22:58:04 BST 1998 Austin Donnelly @@ -533,7 +538,7 @@ Tue Oct 13 00:27:21 BST 1998 Andy Thomas Mon Oct 12 10:25:05 EEST 1998 Tuomas Kuosmanen - * plug-ins/MapObject/mapobject_main.c: changed the + * plug-ins/MapObject/mapobject_main.c: changed the location in the menus - appears now under Filters->Map instead of Filters->Distort @@ -636,7 +641,7 @@ Mon Oct 6 21:51:00 CST 1998 Seth Burgess type to sensible ones, gave second paramter a .type Mon Oct 5 01:08:11 CST 1998 Seth Burgess - + * app/layer_cmds.c: Changed "is_floating_sel" from PDB_CHANNEL to PDB_INT32 @@ -646,14 +651,14 @@ Mon Oct 5 01:08:11 CST 1998 Seth Burgess * plug-ins/script-fu/scripts/gradient-bevel-logo.scm * plug-ins/script-fu/scripts/pupi-button.scm: removed extra paramters from some function calls that - didn't break script-fu but were wrong anyway. + didn't break script-fu but were wrong anyway. Many thanks to Marc Lehman for reporting these. More to come. - + Mon Oct 5 23:56:09 EEST 1998 Lauri Alanko * po/fr.po: fixed a compile-halting typo - + Mon Oct 5 16:18:08 EDT 1998 Matthew Wilson * app/channels_dialog.c: fixed assignment in g_return_if_fail diff --git a/plug-ins/script-fu/scripts/3d-outline.scm b/plug-ins/script-fu/scripts/3d-outline.scm index 3b02b17fea..22d46b5025 100644 --- a/plug-ins/script-fu/scripts/3d-outline.scm +++ b/plug-ins/script-fu/scripts/3d-outline.scm @@ -34,8 +34,8 @@ (gimp-image-resize img width height 0 0) (gimp-image-add-layer img pattern 1) (gimp-image-add-layer img bg-layer 2) - (gimp-edit-fill img bg-layer) - (gimp-edit-clear img pattern) + (gimp-edit-fill bg-layer) + (gimp-edit-clear pattern) (gimp-layer-set-preserve-trans text-layer FALSE) (plug-in-gauss-iir 1 img text-layer outline-blur-radius TRUE TRUE) @@ -48,22 +48,22 @@ (gimp-selection-all img) (gimp-patterns-set-pattern text-pattern) - (gimp-bucket-fill img pattern PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) + (gimp-bucket-fill pattern PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) (plug-in-bump-map noninteractive img pattern layer2 110.0 45.0 4 0 0 0 0 TRUE FALSE 0) (set! pattern-mask (car (gimp-layer-create-mask pattern ALPHA-MASK))) (gimp-image-add-layer-mask img pattern pattern-mask) (gimp-selection-all img) - (gimp-edit-copy img layer3) - (set! floating_sel (car (gimp-edit-paste img pattern-mask 0))) + (gimp-edit-copy layer3) + (set! floating_sel (car (gimp-edit-paste pattern-mask 0))) (gimp-floating-sel-anchor floating_sel) (gimp-image-remove-layer-mask img pattern APPLY) - (gimp-invert img layer3) + (gimp-invert layer3) (plug-in-gauss-iir 1 img layer3 shadow-blur-radius TRUE TRUE) - (gimp-channel-ops-offset img layer3 0 1 s-offset-x s-offset-y) + (gimp-channel-ops-offset layer3 0 1 s-offset-x s-offset-y) (gimp-layer-set-visible layer2 FALSE) (gimp-layer-set-visible pattern TRUE) @@ -72,7 +72,7 @@ (gimp-palette-set-background old-bg) (gimp-palette-set-foreground old-fg) (gimp-image-enable-undo img) - (gimp-display-new img))) + (gimp-display-new img))) (script-fu-register "script-fu-3d-outline-logo" "/Xtns/Script-Fu/Logos/3D Outline" diff --git a/plug-ins/script-fu/scripts/3dTruchet.scm b/plug-ins/script-fu/scripts/3dTruchet.scm index eaf646b21e..04fd72e786 100644 --- a/plug-ins/script-fu/scripts/3dTruchet.scm +++ b/plug-ins/script-fu/scripts/3dTruchet.scm @@ -29,8 +29,8 @@ (gimp-ellipse-select img (- cx rx) (- cy ry) (+ rx rx ) (+ ry ry ) op aa feather frad)) (define (use-tile img drawable height width img2 drawable2 xoffset yoffset) - (gimp-edit-copy img2 drawable2) - (let ((floating-sel (car (gimp-edit-paste img drawable FALSE)))) + (gimp-edit-copy drawable2) + (let ((floating-sel (car (gimp-edit-paste drawable FALSE)))) (gimp-layer-set-offsets floating-sel xoffset yoffset) (gimp-floating-sel-anchor floating-sel) ) @@ -46,11 +46,11 @@ (gimp-selection-all img) (gimp-palette-set-background backcolor) - (gimp-edit-fill img drawable1) + (gimp-edit-fill drawable1) (let* ( (tempSize (* size 3)) - (temp-img (car (gimp-image-new tempSize tempSize RGB))) + (temp-img (car (gimp-image-new tempSize tempSize RGB))) (temp-draw (car (gimp-layer-new temp-img tempSize tempSize RGB_IMAGE "Jabar" 100 NORMAL))) (temp-draw2 (car (gimp-layer-new temp-img tempSize tempSize RGB_IMAGE "Jabar" 100 NORMAL)))) @@ -58,8 +58,8 @@ (gimp-image-add-layer temp-img temp-draw 0) (gimp-image-add-layer temp-img temp-draw2 0) (gimp-palette-set-background backcolor) - (gimp-edit-fill temp-img temp-draw) - (gimp-edit-fill temp-img temp-draw2) + (gimp-edit-fill temp-draw) + (gimp-edit-fill temp-draw2) ;weird aint it (gimp-palette-set-background begincolor) @@ -70,7 +70,7 @@ (center-ellipse temp-img (* size 2) (* size 2) outer-radius outer-radius ADD TRUE FALSE 0) (center-ellipse temp-img (* size 2) (* size 2) inner-radius inner-radius SUB TRUE FALSE 0) - (gimp-blend temp-img temp-draw FG-BG-RGB NORMAL SHAPEBURST-ANGULAR 100 0 FALSE supersample 3 .2 size size (* size 2) (/ size 2) ) + (gimp-blend temp-draw FG-BG-RGB NORMAL SHAPEBURST-ANGULAR 100 0 FALSE supersample 3 .2 size size (* size 2) (/ size 2) ) (center-ellipse temp-img size (* size 2) outer-radius outer-radius REPLACE TRUE FALSE 0) (center-ellipse temp-img size (* size 2) inner-radius inner-radius SUB TRUE FALSE 0) @@ -78,7 +78,7 @@ (center-ellipse temp-img (* size 2) size outer-radius outer-radius ADD TRUE FALSE 0) (center-ellipse temp-img (* size 2) size inner-radius inner-radius SUB TRUE FALSE 0) ;(gimp-edit-fill temp-img temp-draw2) - (gimp-blend temp-img temp-draw2 FG-BG-RGB NORMAL SHAPEBURST-ANGULAR 100 0 FALSE supersample 3 .2 size size (* size 2) (* size 2) ) + (gimp-blend temp-draw2 FG-BG-RGB NORMAL SHAPEBURST-ANGULAR 100 0 FALSE supersample 3 .2 size size (* size 2) (* size 2) ) (gimp-selection-none temp-img) @@ -87,12 +87,12 @@ (gimp-selection-all temp-img) - (gimp-edit-copy temp-img temp-draw) - (let ((floating-sel (car (gimp-edit-paste img drawable2 FALSE)))) + (gimp-edit-copy temp-draw) + (let ((floating-sel (car (gimp-edit-paste drawable2 FALSE)))) (gimp-floating-sel-anchor floating-sel)) - (gimp-edit-copy temp-img temp-draw2) - (let ((floating-sel (car (gimp-edit-paste img drawable1 FALSE)))) + (gimp-edit-copy temp-draw2) + (let ((floating-sel (car (gimp-edit-paste drawable1 FALSE)))) (gimp-floating-sel-anchor floating-sel)) ;(let ((drawble (car (gimp-flip img drawable1 0))))) @@ -106,7 +106,7 @@ (define (script-fu-3dtruchet size thickness backcolor begincolor endcolor supersample xtiles ytiles) - (let* ( + (let* ( (width (* size xtiles)) (height (* size ytiles)) (img (car (gimp-image-new width height RGB))) @@ -115,7 +115,7 @@ (tiledraw1 (car (gimp-layer-new tile size size RGB "Johnson" 100 NORMAL))) (tiledraw2 (car (gimp-layer-new tile size size RGB "Cooper" 100 NORMAL))) (Xindex 0) - (Yindex 0) + (Yindex 0) ) (gimp-image-disable-undo img) @@ -128,8 +128,8 @@ ;just to look a little better (gimp-selection-all img) - (gimp-palette-set-background backcolor) - (gimp-edit-fill img layer-one) + (gimp-palette-set-background backcolor) + (gimp-edit-fill layer-one) (gimp-selection-none img) (create-tile tile tiledraw1 tiledraw2 size thickness backcolor begincolor endcolor supersample) diff --git a/plug-ins/script-fu/scripts/add-bevel.scm b/plug-ins/script-fu/scripts/add-bevel.scm index ac392b37b3..56a06bafb6 100644 --- a/plug-ins/script-fu/scripts/add-bevel.scm +++ b/plug-ins/script-fu/scripts/add-bevel.scm @@ -64,8 +64,8 @@ ; -(define (script-fu-add-bevel img - drawable +(define (script-fu-add-bevel img + drawable thickness work-on-copy keep-bump-layer) @@ -80,11 +80,11 @@ (width (car (gimp-drawable-width pic-layer))) (height (car (gimp-drawable-height pic-layer))) (old-bg (car (gimp-palette-get-background))) - (bump-layer (car (gimp-layer-new image - width - height + (bump-layer (car (gimp-layer-new image + width + height GRAY - "Bumpmap" + "Bumpmap" 100 NORMAL))) ) @@ -106,7 +106,7 @@ (set! bevelling-whole-image TRUE) ; ...so we can restore things properly, and crop. (gimp-image-resize image (+ width 2) (+ height 2) 1 1) (if (not (eq? 0 (car (gimp-drawable-has-alpha pic-layer)))) ; Wish I knew Scheme - (gimp-selection-layer-alpha image pic-layer) + (gimp-selection-layer-alpha pic-layer) (begin (gimp-selection-all image) ) @@ -131,13 +131,13 @@ (set! greyness (/ (* index 255) thickness)) (gimp-palette-set-background (list greyness greyness greyness)) ;(gimp-selection-feather image 1) ;Stop the slopey jaggies? - (gimp-bucket-fill image bump-layer BG-BUCKET-FILL NORMAL 100 0 FALSE 0 0) + (gimp-bucket-fill bump-layer BG-BUCKET-FILL NORMAL 100 0 FALSE 0 0) (gimp-selection-shrink image 1) (set! index (+ index 1)) ) ; Now the white interior (gimp-palette-set-background '(255 255 255)) - (gimp-bucket-fill image bump-layer BG-BUCKET-FILL NORMAL 100 0 FALSE 0 0) + (gimp-bucket-fill bump-layer BG-BUCKET-FILL NORMAL 100 0 FALSE 0 0) ;------------------------------------------------------------ ; @@ -177,7 +177,7 @@ (gimp-palette-set-background old-bg) (if (= bevelling-whole-image TRUE) (gimp-selection-none image) ; No selection to start with - (gimp-selection-load image select) + (gimp-selection-load select) ) ; If they started with a selection, they can Select->Invert then ; Edit->Clear for a cutout. @@ -213,4 +213,4 @@ SF-ADJUSTMENT "Thickness" "5" SF-TOGGLE "Work on copy" TRUE SF-TOGGLE "Keep bump layer" FALSE - ) + ) diff --git a/plug-ins/script-fu/scripts/addborder.scm b/plug-ins/script-fu/scripts/addborder.scm index 6fac140926..bee940ef75 100644 --- a/plug-ins/script-fu/scripts/addborder.scm +++ b/plug-ins/script-fu/scripts/addborder.scm @@ -109,8 +109,8 @@ ;Add this for debugging (verbose 4) (gimp-image-disable-undo img) (gimp-drawable-fill layer TRANS-IMAGE-FILL) - (gimp-image-resize img - width + (gimp-image-resize img + width height xsize ysize) @@ -122,7 +122,7 @@ 0 0 0.0) - (gimp-edit-fill img layer) + (gimp-edit-fill layer) (gimp-palette-set-background (adjcolour colour (/ dvalue 2))) (gimp-free-select img 10 @@ -131,7 +131,7 @@ 0 0 0.0) - (gimp-edit-fill img layer) + (gimp-edit-fill layer) (gimp-palette-set-background (adjcolour colour (- 0 (/ dvalue 2)))) (gimp-free-select img 10 @@ -141,7 +141,7 @@ 0 0.0) - (gimp-edit-fill img layer) + (gimp-edit-fill layer) (gimp-palette-set-background (adjcolour colour (- 0 dvalue))) (gimp-free-select img 10 @@ -151,7 +151,7 @@ 0 0.0) - (gimp-edit-fill img layer) + (gimp-edit-fill layer) (gimp-selection-none img) (gimp-image-add-layer img layer 0) (gimp-image-enable-undo img) diff --git a/plug-ins/script-fu/scripts/alien-glow-arrow.scm b/plug-ins/script-fu/scripts/alien-glow-arrow.scm index 69d2c3cef4..a9465c21a4 100644 --- a/plug-ins/script-fu/scripts/alien-glow-arrow.scm +++ b/plug-ins/script-fu/scripts/alien-glow-arrow.scm @@ -90,19 +90,19 @@ (gimp-image-add-layer img glow-layer -1) (gimp-image-add-layer img ruler-layer -1) - (gimp-edit-clear img glow-layer) - (gimp-edit-clear img ruler-layer) + (gimp-edit-clear glow-layer) + (gimp-edit-clear ruler-layer) (gimp-free-select img 6 big-arrow REPLACE TRUE FALSE 0) (gimp-palette-set-foreground '(103 103 103)) (gimp-palette-set-background '(0 0 0)) - (gimp-blend img ruler-layer FG-BG-RGB NORMAL SHAPEBURST-ANGULAR 100 0 REPEAT-NONE FALSE 0 0 0 0 size size) + (gimp-blend ruler-layer FG-BG-RGB NORMAL SHAPEBURST-ANGULAR 100 0 REPEAT-NONE FALSE 0 0 0 0 size size) (gimp-selection-grow img grow-amount) (gimp-palette-set-background glow-color) - (gimp-edit-fill img glow-layer) + (gimp-edit-fill glow-layer) (gimp-selection-none img) @@ -110,7 +110,7 @@ (plug-in-gauss-rle 1 img glow-layer blur-radius TRUE TRUE) (gimp-palette-set-background bg-color) - (gimp-edit-fill img bg-layer) + (gimp-edit-fill bg-layer) (gimp-palette-set-background old-bg) (gimp-palette-set-foreground old-fg) diff --git a/plug-ins/script-fu/scripts/alien-glow-bar.scm b/plug-ins/script-fu/scripts/alien-glow-bar.scm index a0e0d86fc8..7432ecbc3a 100644 --- a/plug-ins/script-fu/scripts/alien-glow-bar.scm +++ b/plug-ins/script-fu/scripts/alien-glow-bar.scm @@ -36,18 +36,18 @@ ; (gimp-layer-set-preserve-trans ruler-layer TRUE) (gimp-palette-set-background bg-color) - (gimp-edit-fill img bg-layer) - (gimp-edit-clear img glow-layer) - (gimp-edit-clear img ruler-layer) + (gimp-edit-fill bg-layer) + (gimp-edit-clear glow-layer) + (gimp-edit-clear ruler-layer) (gimp-rect-select img (/ height 2) (/ height 2) length height REPLACE FALSE 0) (gimp-palette-set-foreground '(79 79 79)) (gimp-palette-set-background '(0 0 0)) - (gimp-blend img ruler-layer FG-BG-RGB NORMAL SHAPEBURST-ANGULAR 100 0 REPEAT-NONE FALSE 0 0 0 0 height height) + (gimp-blend ruler-layer FG-BG-RGB NORMAL SHAPEBURST-ANGULAR 100 0 REPEAT-NONE FALSE 0 0 0 0 height height) (gimp-palette-set-background glow-color) (gimp-selection-grow img border) - (gimp-edit-fill img glow-layer) + (gimp-edit-fill glow-layer) (gimp-selection-none img) (plug-in-gauss-rle 1 img glow-layer 25 TRUE TRUE) diff --git a/plug-ins/script-fu/scripts/alien-glow-bullet.scm b/plug-ins/script-fu/scripts/alien-glow-bullet.scm index 41977e3cb7..4ef83bdd77 100644 --- a/plug-ins/script-fu/scripts/alien-glow-bullet.scm +++ b/plug-ins/script-fu/scripts/alien-glow-bullet.scm @@ -43,21 +43,21 @@ ; (gimp-layer-set-preserve-trans ruler-layer TRUE) (gimp-palette-set-background bg-color) - (gimp-edit-fill img bg-layer) - (gimp-edit-clear img glow-layer) - (gimp-edit-clear img bullet-layer) + (gimp-edit-fill bg-layer) + (gimp-edit-clear glow-layer) + (gimp-edit-clear bullet-layer) (center-ellipse img radius radius half-radius half-radius REPLACE TRUE FALSE 0) ; (gimp-rect-select img (/ height 2) (/ height 2) length height REPLACE FALSE 0) (gimp-palette-set-foreground '(90 90 90)) (gimp-palette-set-background '(0 0 0)) - (gimp-blend img bullet-layer FG-BG-RGB NORMAL RADIAL 100 0 REPEAT-NONE FALSE 0 0 blend-start blend-start (+ half-radius radius)(+ half-radius radius )) + (gimp-blend bullet-layer FG-BG-RGB NORMAL RADIAL 100 0 REPEAT-NONE FALSE 0 0 blend-start blend-start (+ half-radius radius)(+ half-radius radius )) - (gimp-palette-set-background glow-color) + (gimp-palette-set-background glow-color) (gimp-selection-grow img border) (gimp-selection-feather img border) - (gimp-edit-fill img glow-layer) + (gimp-edit-fill glow-layer) (gimp-selection-none img) (if (>= radius 16) (plug-in-gauss-rle 1 img glow-layer 25 TRUE TRUE) diff --git a/plug-ins/script-fu/scripts/alien-glow-button.scm b/plug-ins/script-fu/scripts/alien-glow-button.scm index 64f6f44ecd..7706536f74 100644 --- a/plug-ins/script-fu/scripts/alien-glow-button.scm +++ b/plug-ins/script-fu/scripts/alien-glow-button.scm @@ -36,8 +36,7 @@ (cadr (cddr extents))) (define (blend-bumpmap img drawable x1 y1 x2 y2) - (gimp-blend img - drawable + (gimp-blend drawable FG-BG-RGB DARKEN-ONLY LINEAR @@ -109,7 +108,7 @@ (gimp-image-add-layer img bg-layer -1) (gimp-palette-set-foreground '(0 0 0)) (gimp-palette-set-background bg-color) - (gimp-edit-fill img bg-layer) + (gimp-edit-fill bg-layer) (gimp-image-add-layer img glow-layer -1) ; Create text layer @@ -120,11 +119,11 @@ (gimp-rect-select img 0 0 img-width img-height REPLACE FALSE 0) (gimp-palette-set-foreground '(100 100 100)) (gimp-palette-set-background '(0 0 0)) - (gimp-blend img button-layer FG-BG-RGB NORMAL SHAPEBURST-ANGULAR 100 0 REPEAT-NONE FALSE 0 0 0 0 img-height img-width) - (gimp-edit-clear img glow-layer) + (gimp-blend button-layer FG-BG-RGB NORMAL SHAPEBURST-ANGULAR 100 0 REPEAT-NONE FALSE 0 0 0 0 img-height img-width) + (gimp-edit-clear glow-layer) (gimp-rect-select img (/ glow-radius 4) (/ glow-radius 4) (- img-width (/ glow-radius 2)) (- img-height (/ glow-radius 2)) REPLACE FALSE 0 ) (gimp-palette-set-background glow-color) - (gimp-edit-fill img glow-layer) + (gimp-edit-fill glow-layer) (gimp-selection-none img) (plug-in-gauss-rle 1 img glow-layer glow-radius TRUE TRUE) (gimp-palette-set-foreground text-color) diff --git a/plug-ins/script-fu/scripts/alien-glow-logo.scm b/plug-ins/script-fu/scripts/alien-glow-logo.scm index 1055499861..163486619b 100644 --- a/plug-ins/script-fu/scripts/alien-glow-logo.scm +++ b/plug-ins/script-fu/scripts/alien-glow-logo.scm @@ -19,17 +19,17 @@ (gimp-image-add-layer img glow-layer 1) (gimp-layer-set-preserve-trans text-layer TRUE) (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img bg-layer) - (gimp-edit-clear img glow-layer) - (gimp-selection-layer-alpha img text-layer) + (gimp-edit-fill bg-layer) + (gimp-edit-clear glow-layer) + (gimp-selection-layer-alpha text-layer) (gimp-selection-grow img grow) (gimp-selection-feather img feather) (gimp-palette-set-background glow-color) - (gimp-edit-fill img glow-layer) + (gimp-edit-fill glow-layer) (gimp-selection-none img) (gimp-palette-set-background '(0 0 0)) (gimp-palette-set-foreground '(79 79 79)) - (gimp-blend img text-layer FG-BG-RGB NORMAL SHAPEBURST-ANGULAR 100 0 REPEAT-NONE FALSE 0 0 0 0 1 1) + (gimp-blend text-layer FG-BG-RGB NORMAL SHAPEBURST-ANGULAR 100 0 REPEAT-NONE FALSE 0 0 0 0 1 1) (gimp-layer-set-name text-layer text) (gimp-palette-set-background old-bg) (gimp-palette-set-foreground old-fg) diff --git a/plug-ins/script-fu/scripts/asc2img.scm b/plug-ins/script-fu/scripts/asc2img.scm index a3cbf66616..6f264a843c 100644 --- a/plug-ins/script-fu/scripts/asc2img.scm +++ b/plug-ins/script-fu/scripts/asc2img.scm @@ -24,10 +24,10 @@ ; Define the function: -(define (script-fu-asc-2-img inFile - inFont - inFontSize - inTextColor +(define (script-fu-asc-2-img inFile + inFont + inFontSize + inTextColor inTrans inBackColor inBufferAmount @@ -38,43 +38,43 @@ - (set! theLayer (car (gimp-layer-new theImage - 10 - 10 + (set! theLayer (car (gimp-layer-new theImage + 10 + 10 RGBA_IMAGE "layer 1" - 100 + 100 NORMAL) ) ) (gimp-palette-set-background inBackColor) (gimp-layer-set-name theLayer "Background") (gimp-image-add-layer theImage theLayer 0) -(script-fu-asc-2-img-layer theImage theLayer inFile inFont inFontSize +(script-fu-asc-2-img-layer theImage theLayer inFile inFont inFontSize inTextColor inBufferAmount inFlatten) (set! theBuffer (* inFontSize (/ inBufferAmount 100) ) ) (set! theImageWidth (+ theImageWidth theBuffer theBuffer )) (set! theImageHeight (+ theImageHeight theBuffer theBuffer )) - (gimp-image-resize theImage - theImageWidth - theImageHeight - theBuffer + (gimp-image-resize theImage + theImageWidth + theImageHeight + theBuffer theBuffer) - (gimp-layer-resize theLayer - theImageWidth - theImageHeight - theBuffer + (gimp-layer-resize theLayer + theImageWidth + theImageHeight + theBuffer theBuffer) (gimp-selection-all theImage) - (if (= inTrans TRUE) - (gimp-edit-clear theImage theLayer) - (gimp-edit-fill theImage theLayer) + (if (= inTrans TRUE) + (gimp-edit-clear theLayer) + (gimp-edit-fill theLayer) ) (gimp-selection-none theImage) - (if (= inFlatten TRUE) + (if (= inFlatten TRUE) (gimp-image-merge-visible-layers theImage 0) () ) @@ -90,10 +90,10 @@ (define (script-fu-asc-2-img-layer inImage inLayer - inFile - inFont - inFontSize - inTextColor + inFile + inFont + inFontSize + inTextColor inFlatten) (set! theImage inImage) @@ -123,15 +123,15 @@ (not (equal? () theChar)) ) ) - (cond ( (equal? theChar "\t") - (set! theChar " ") - (if (= allspaces TRUE) - (set! theIndent (+ theIndent 8)) - ()) + (cond ( (equal? theChar "\t") + (set! theChar " ") + (if (= allspaces TRUE) + (set! theIndent (+ theIndent 8)) + ()) ) - ( (equal? theChar " ") - (if (= allspaces TRUE) - (set! theIndent (+ theIndent 1)) + ( (equal? theChar " ") + (if (= allspaces TRUE) + (set! theIndent (+ theIndent 1)) ()) ) (TRUE (set! allspaces FALSE)) @@ -147,30 +147,30 @@ ) () (begin (set! theData (cons theLine theData)) - (set! theIndentList + (set! theIndentList (cons theIndent theIndentList)) ) ) ) - (set! theText (car (gimp-text-fontname theImage - -1 - 0 - 0 + (set! theText (car (gimp-text-fontname theImage + -1 + 0 + 0 "X" - 0 + 0 TRUE inFontSize - PIXELS + PIXELS inFont))) (set! theCharWidth (car (gimp-drawable-width theText) )) - (gimp-edit-cut theImage theText) + (gimp-edit-cut theText) (set! theImageHeight 0) (set! theImageWidth 0) - (cjg-add-text (reverse theData) - (reverse theIndentList) - inFont + (cjg-add-text (reverse theData) + (reverse theIndentList) + inFont inFontSize) (if (= inFlatten TRUE) (gimp-image-merge-visible-layers theImage 0) @@ -184,29 +184,29 @@ (gimp-displays-flush) ) -(define (cjg-add-text inData inIndentList inFont inFontSize) - (if (equal? () inData) +(define (cjg-add-text inData inIndentList inFont inFontSize) + (if (equal? () inData) () (let ((theLine (car inData)) (theIndent (car inIndentList))) (if (equal? "" theLine) () - (begin - (set! theText (car (gimp-text-fontname theImage - -1 - 0 - 0 - (string-append " " theLine) + (begin + (set! theText (car (gimp-text-fontname theImage + -1 0 - TRUE + 0 + (string-append " " theLine) + 0 + TRUE inFontSize PIXELS inFont))) (set! theLineHeight (car (gimp-drawable-height theText) ) ) - (gimp-layer-set-offsets theText - (* theCharWidth theIndent) - (+ theImageHeight + (gimp-layer-set-offsets theText + (* theCharWidth theIndent) + (+ theImageHeight (- inFontSize theLineHeight))) - (set! theImageWidth (max + (set! theImageWidth (max (+ (car (gimp-drawable-width theText) ) (* theCharWidth theIndent)) theImageWidth )) @@ -217,8 +217,8 @@ (gimp-layer-set-name theText theLine) ) ) - (set! theImageHeight - (+ theImageHeight inFontSize)) + (set! theImageHeight + (+ theImageHeight inFontSize)) (cjg-add-text (cdr inData) (cdr inIndentList) inFont inFontSize))) ) diff --git a/plug-ins/script-fu/scripts/basic1-logo.scm b/plug-ins/script-fu/scripts/basic1-logo.scm index 5653836c8f..1f9a7ba727 100644 --- a/plug-ins/script-fu/scripts/basic1-logo.scm +++ b/plug-ins/script-fu/scripts/basic1-logo.scm @@ -16,17 +16,17 @@ (gimp-image-add-layer img bg-layer 2) (gimp-palette-set-background text-color) (gimp-layer-set-preserve-trans text-layer TRUE) - (gimp-edit-fill img text-layer) + (gimp-edit-fill text-layer) (gimp-palette-set-background bg-color) - (gimp-edit-fill img bg-layer) - (gimp-edit-clear img shadow-layer) - (gimp-selection-layer-alpha img text-layer) + (gimp-edit-fill bg-layer) + (gimp-edit-clear shadow-layer) + (gimp-selection-layer-alpha text-layer) (gimp-palette-set-background '(0 0 0)) (gimp-selection-feather img 7.5) - (gimp-edit-fill img shadow-layer) + (gimp-edit-fill shadow-layer) (gimp-selection-none img) (gimp-palette-set-foreground '(255 255 255)) - (gimp-blend img text-layer FG-BG-RGB MULTIPLY RADIAL 100 20 REPEAT-NONE FALSE 0 0 0 0 width height) + (gimp-blend text-layer FG-BG-RGB MULTIPLY RADIAL 100 20 REPEAT-NONE FALSE 0 0 0 0 width height) (gimp-layer-translate shadow-layer 3 3) (gimp-layer-set-name text-layer text) (gimp-palette-set-background old-bg) diff --git a/plug-ins/script-fu/scripts/basic2-logo.scm b/plug-ins/script-fu/scripts/basic2-logo.scm index 27c513bebf..d3d9da6aaf 100644 --- a/plug-ins/script-fu/scripts/basic2-logo.scm +++ b/plug-ins/script-fu/scripts/basic2-logo.scm @@ -27,20 +27,20 @@ (gimp-image-add-layer img highlight-layer 1) (gimp-palette-set-background text-color) (gimp-layer-set-preserve-trans text-layer TRUE) - (gimp-edit-fill img text-layer) - (gimp-edit-clear img shadow-layer) + (gimp-edit-fill text-layer) + (gimp-edit-clear shadow-layer) (gimp-palette-set-background (color-highlight text-color)) (gimp-layer-set-preserve-trans highlight-layer TRUE) - (gimp-edit-fill img highlight-layer) + (gimp-edit-fill highlight-layer) (gimp-palette-set-background bg-color) (gimp-drawable-fill bg-layer BG-IMAGE-FILL) - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) (gimp-palette-set-background '(0 0 0)) (gimp-selection-feather img 7.5) - (gimp-edit-fill img shadow-layer) + (gimp-edit-fill shadow-layer) (gimp-selection-none img) (gimp-palette-set-foreground '(255 255 255)) - (gimp-blend img text-layer FG-BG-RGB MULTIPLY RADIAL 100 20 REPEAT-NONE FALSE 0 0 0 0 width height) + (gimp-blend text-layer FG-BG-RGB MULTIPLY RADIAL 100 20 REPEAT-NONE FALSE 0 0 0 0 width height) (gimp-layer-translate shadow-layer 3 3) (gimp-layer-translate highlight-layer -2 -2) (gimp-layer-set-name text-layer text) diff --git a/plug-ins/script-fu/scripts/beveled-button.scm b/plug-ins/script-fu/scripts/beveled-button.scm index 305807a010..5ab0b9d71d 100644 --- a/plug-ins/script-fu/scripts/beveled-button.scm +++ b/plug-ins/script-fu/scripts/beveled-button.scm @@ -33,8 +33,7 @@ (cadr (cddr extents))) (define (blend-bumpmap img drawable x1 y1 x2 y2) - (gimp-blend img - drawable + (gimp-blend drawable FG-BG-RGB DARKEN-ONLY LINEAR @@ -104,7 +103,7 @@ (gimp-image-add-layer img bumpmap -1) (gimp-palette-set-foreground '(0 0 0)) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img bumpmap) + (gimp-edit-fill bumpmap) (gimp-rect-select img 0 0 bevel-width img-height REPLACE FALSE 0) (blend-bumpmap img bumpmap 0 0 (- bevel-width 1) 0) @@ -125,8 +124,7 @@ (gimp-image-add-layer img gradient -1) (gimp-palette-set-foreground ul-color) (gimp-palette-set-background lr-color) - (gimp-blend img - gradient + (gimp-blend gradient FG-BG-RGB NORMAL LINEAR diff --git a/plug-ins/script-fu/scripts/beveled-pattern-arrow.scm b/plug-ins/script-fu/scripts/beveled-pattern-arrow.scm index 2cd425fbf0..d6d1f42de6 100644 --- a/plug-ins/script-fu/scripts/beveled-pattern-arrow.scm +++ b/plug-ins/script-fu/scripts/beveled-pattern-arrow.scm @@ -83,29 +83,29 @@ ; Create pattern layer (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img background) + (gimp-edit-fill background) (gimp-patterns-set-pattern pattern) - (gimp-bucket-fill img background PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) + (gimp-bucket-fill background PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) ; Create bumpmap layer - (gimp-edit-fill img bumpmap) + (gimp-edit-fill bumpmap) (gimp-palette-set-background '(127 127 127)) (gimp-rect-select img 1 1 (- size 2) (- size 2) REPLACE FALSE 0) - (gimp-edit-fill img bumpmap) + (gimp-edit-fill bumpmap) (gimp-palette-set-background '(255 255 255)) (gimp-rect-select img 2 2 (- size 4) (- size 4) REPLACE FALSE 0) - (gimp-edit-fill img bumpmap) + (gimp-edit-fill bumpmap) (gimp-palette-set-background '(127 127 127)) (gimp-free-select img 6 big-arrow REPLACE TRUE FALSE 0) - (gimp-edit-fill img bumpmap) + (gimp-edit-fill bumpmap) (gimp-palette-set-background '(0 0 0)) (gimp-free-select img 6 med-arrow REPLACE TRUE FALSE 0) - (gimp-edit-fill img bumpmap) + (gimp-edit-fill bumpmap) (gimp-selection-none img) @@ -116,11 +116,11 @@ ; Darken arrow (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img bumpmap) + (gimp-edit-fill bumpmap) (gimp-palette-set-background '(192 192 192)) (gimp-free-select img 6 small-arrow REPLACE TRUE FALSE 0) - (gimp-edit-fill img bumpmap) + (gimp-edit-fill bumpmap) (gimp-selection-none img) diff --git a/plug-ins/script-fu/scripts/beveled-pattern-bullet.scm b/plug-ins/script-fu/scripts/beveled-pattern-bullet.scm index d558d038bd..cfce8cd831 100644 --- a/plug-ins/script-fu/scripts/beveled-pattern-bullet.scm +++ b/plug-ins/script-fu/scripts/beveled-pattern-bullet.scm @@ -32,21 +32,21 @@ ; Create pattern layer (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img background) + (gimp-edit-fill background) (gimp-patterns-set-pattern pattern) - (gimp-bucket-fill img background PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) + (gimp-bucket-fill background PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) ; Create bumpmap layer - (gimp-edit-fill img bumpmap) + (gimp-edit-fill bumpmap) (gimp-palette-set-background '(127 127 127)) (gimp-ellipse-select img 1 1 (- diameter 2) (- diameter 2) REPLACE TRUE FALSE 0) - (gimp-edit-fill img bumpmap) + (gimp-edit-fill bumpmap) (gimp-palette-set-background '(255 255 255)) (gimp-ellipse-select img 2 2 (- diameter 4) (- diameter 4) REPLACE TRUE FALSE 0) - (gimp-edit-fill img bumpmap) + (gimp-edit-fill bumpmap) (gimp-selection-none img) @@ -59,7 +59,7 @@ (gimp-palette-set-background '(0 0 0)) (gimp-ellipse-select img 0 0 diameter diameter REPLACE TRUE FALSE 0) (gimp-selection-invert img) - (gimp-edit-clear img background) + (gimp-edit-clear background) (gimp-selection-none img) (gimp-image-set-active-layer img background) diff --git a/plug-ins/script-fu/scripts/beveled-pattern-button.scm b/plug-ins/script-fu/scripts/beveled-pattern-button.scm index 251f01edd6..45c98f64b8 100644 --- a/plug-ins/script-fu/scripts/beveled-pattern-button.scm +++ b/plug-ins/script-fu/scripts/beveled-pattern-button.scm @@ -66,21 +66,21 @@ ; Create pattern layer (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img background) + (gimp-edit-fill background) (gimp-patterns-set-pattern pattern) - (gimp-bucket-fill img background PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) + (gimp-bucket-fill background PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) ; Create bumpmap layer - (gimp-edit-fill img bumpmap) + (gimp-edit-fill bumpmap) (gimp-palette-set-background '(127 127 127)) (gimp-rect-select img 1 1 (- width 2) (- height 2) REPLACE FALSE 0) - (gimp-edit-fill img bumpmap) + (gimp-edit-fill bumpmap) (gimp-palette-set-background '(255 255 255)) (gimp-rect-select img 2 2 (- width 4) (- height 4) REPLACE FALSE 0) - (gimp-edit-fill img bumpmap) + (gimp-edit-fill bumpmap) (gimp-selection-none img) @@ -92,7 +92,7 @@ (gimp-palette-set-background text-color) (gimp-layer-set-preserve-trans textl TRUE) - (gimp-edit-fill img textl) + (gimp-edit-fill textl) (gimp-layer-set-offsets textl xpadding diff --git a/plug-ins/script-fu/scripts/beveled-pattern-heading.scm b/plug-ins/script-fu/scripts/beveled-pattern-heading.scm index 6a3f109cbf..7f69a7bbd6 100644 --- a/plug-ins/script-fu/scripts/beveled-pattern-heading.scm +++ b/plug-ins/script-fu/scripts/beveled-pattern-heading.scm @@ -43,23 +43,23 @@ ; Create pattern layer (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img background) + (gimp-edit-fill background) (gimp-patterns-set-pattern pattern) - (gimp-bucket-fill img background PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) + (gimp-bucket-fill background PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) ; Create bumpmap layer - (gimp-edit-fill img bumpmap) + (gimp-edit-fill bumpmap) (gimp-palette-set-background '(127 127 127)) - (gimp-selection-layer-alpha img textl) + (gimp-selection-layer-alpha textl) (gimp-selection-shrink img 1) - (gimp-edit-fill img bumpmap) + (gimp-edit-fill bumpmap) (gimp-palette-set-background '(255 255 255)) - (gimp-selection-layer-alpha img textl) + (gimp-selection-layer-alpha textl) (gimp-selection-shrink img 2) - (gimp-edit-fill img bumpmap) + (gimp-edit-fill bumpmap) (gimp-selection-none img) @@ -70,9 +70,9 @@ ; Clean up (gimp-palette-set-background '(0 0 0)) - (gimp-selection-layer-alpha img textl) + (gimp-selection-layer-alpha textl) (gimp-selection-invert img) - (gimp-edit-clear img background) + (gimp-edit-clear background) (gimp-selection-none img) (gimp-image-set-active-layer img background) diff --git a/plug-ins/script-fu/scripts/beveled-pattern-hrule.scm b/plug-ins/script-fu/scripts/beveled-pattern-hrule.scm index 816b05324d..3ea90ed3b6 100644 --- a/plug-ins/script-fu/scripts/beveled-pattern-hrule.scm +++ b/plug-ins/script-fu/scripts/beveled-pattern-hrule.scm @@ -32,21 +32,21 @@ ; Create pattern layer (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img background) + (gimp-edit-fill background) (gimp-patterns-set-pattern pattern) - (gimp-bucket-fill img background PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) + (gimp-bucket-fill background PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) ; Create bumpmap layer - (gimp-edit-fill img bumpmap) + (gimp-edit-fill bumpmap) (gimp-palette-set-background '(127 127 127)) (gimp-rect-select img 1 1 (- width 2) (- height 2) REPLACE FALSE 0) - (gimp-edit-fill img bumpmap) + (gimp-edit-fill bumpmap) (gimp-palette-set-background '(255 255 255)) (gimp-rect-select img 2 2 (- width 4) (- height 4) REPLACE FALSE 0) - (gimp-edit-fill img bumpmap) + (gimp-edit-fill bumpmap) (gimp-selection-none img) diff --git a/plug-ins/script-fu/scripts/blend-anim.scm b/plug-ins/script-fu/scripts/blend-anim.scm index f21532f492..c1ae29750e 100644 --- a/plug-ins/script-fu/scripts/blend-anim.scm +++ b/plug-ins/script-fu/scripts/blend-anim.scm @@ -63,7 +63,7 @@ (if (= looped TRUE) ; add a copy of the lowest blend layer on top - (let* ((copy (car (gimp-layer-copy + (let* ((copy (car (gimp-layer-copy (aref layer-array (- num-layers 2)) TRUE)))) (gimp-image-add-layer image copy 0) (set! layers (gimp-image-get-layers image)) @@ -75,7 +75,7 @@ ; make all layers invisible and check for sizes (let* ((min-offset-x width) (min-offset-y height) - (layer-count slots)) + (layer-count slots)) (gimp-layer-set-visible bg-layer FALSE) (while (> layer-count -1) (let* ((layer (aref layer-array layer-count)) @@ -90,11 +90,11 @@ (set! max-width (max max-width layer-width)) (set! max-height (max max-height layer-height)) (set! min-offset-x (min min-offset-x layer-offset-x)) - (set! min-offset-y (min min-offset-y layer-offset-y)) + (set! min-offset-y (min min-offset-y layer-offset-y)) (set! layer-count (- layer-count 1)))) - (set! offset-x (- (car (gimp-drawable-offsets bg-layer)) + (set! offset-x (- (car (gimp-drawable-offsets bg-layer)) min-offset-x)) - (set! offset-y (- (cadr (gimp-drawable-offsets bg-layer)) + (set! offset-y (- (cadr (gimp-drawable-offsets bg-layer)) min-offset-y))) ; create intermediate frames by merging copies of adjascent layers @@ -128,33 +128,33 @@ (+ layer-height (* blur 2)) blur blur) - (plug-in-gauss-rle 1 - image - upper-copy - blur + (plug-in-gauss-rle 1 + image + upper-copy + blur TRUE TRUE) (set! blur (- max-blur blur)) (gimp-layer-set-preserve-trans lower-copy FALSE) - (set! layer-width (car (gimp-drawable-width + (set! layer-width (car (gimp-drawable-width lower-copy))) - (set! layer-height (car (gimp-drawable-height + (set! layer-height (car (gimp-drawable-height lower-copy))) (gimp-layer-resize lower-copy (+ layer-width (* blur 2)) (+ layer-height (* blur 2)) blur blur) - (plug-in-gauss-rle 1 - image - lower-copy - blur + (plug-in-gauss-rle 1 + image + lower-copy + blur TRUE TRUE))) - (gimp-layer-resize bg-copy + (gimp-layer-resize bg-copy max-width max-height offset-x offset-y) - (let* ((merged-layer (car (gimp-image-merge-visible-layers + (let* ((merged-layer (car (gimp-image-merge-visible-layers image CLIP-TO-IMAGE)))) (gimp-layer-set-visible merged-layer FALSE)) (set! frame-count (- frame-count 1)))) @@ -164,22 +164,22 @@ ; with copies of the background layer (let* ((layer-count 0)) (while (< layer-count slots) - (let* ((orig-layer (aref layer-array layer-count)) + (let* ((orig-layer (aref layer-array layer-count)) (bg-copy (car (gimp-layer-copy bg-layer TRUE)))) - (gimp-image-add-layer image - bg-copy + (gimp-image-add-layer image + bg-copy (* layer-count (+ frames 1))) - (multi-raise-layer image - orig-layer + (multi-raise-layer image + orig-layer (+ (* (- slots layer-count) frames) 1)) (gimp-layer-set-visible orig-layer TRUE) (gimp-layer-set-visible bg-copy TRUE) - (gimp-layer-resize bg-copy + (gimp-layer-resize bg-copy max-width max-height offset-x offset-y) - (let* ((merged-layer (car (gimp-image-merge-visible-layers + (let* ((merged-layer (car (gimp-image-merge-visible-layers image CLIP-TO-IMAGE)))) (gimp-layer-set-visible merged-layer FALSE)) (set! layer-count (+ layer-count 1))))) @@ -197,8 +197,8 @@ (layer-count (- num-result-layers 1))) (while (> layer-count -1) (let* ((layer (aref result-layer-array layer-count)) - (name (string-append "Frame " - (number->string + (name (string-append "Frame " + (number->string (- num-result-layers layer-count) 10)))) (gimp-layer-set-visible layer TRUE) (gimp-layer-set-name layer name) @@ -213,7 +213,7 @@ (gimp-displays-flush)) (gimp-message "Blend Animation needs at least three source layers")))) -(script-fu-register "script-fu-blend-anim" +(script-fu-register "script-fu-blend-anim" "/Script-Fu/Animators/Blend" "Blend two or more layers over a background, so that an animation can be saved" diff --git a/plug-ins/script-fu/scripts/blended-logo.scm b/plug-ins/script-fu/scripts/blended-logo.scm index 3ad55e3074..2724380854 100644 --- a/plug-ins/script-fu/scripts/blended-logo.scm +++ b/plug-ins/script-fu/scripts/blended-logo.scm @@ -32,39 +32,39 @@ (gimp-image-add-layer img drop-shadow-layer 1) (gimp-image-add-layer img text-shadow-layer 0) (gimp-selection-none img) - (gimp-edit-clear img text-shadow-layer) - (gimp-edit-clear img drop-shadow-layer) + (gimp-edit-clear text-shadow-layer) + (gimp-edit-clear drop-shadow-layer) (gimp-palette-set-background text-color) (gimp-layer-set-preserve-trans text-layer TRUE) - (gimp-edit-fill img text-layer) + (gimp-edit-fill text-layer) (gimp-palette-set-background bg-color) (gimp-drawable-fill shadow-layer BG-IMAGE-FILL) (gimp-rect-select img b-size-2 b-size-2 (- width b-size) (- height b-size) REPLACE TRUE b-size-2) (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img shadow-layer) - (gimp-selection-layer-alpha img text-layer) + (gimp-edit-fill shadow-layer) + (gimp-selection-layer-alpha text-layer) (gimp-image-add-layer-mask img text-shadow-layer tsl-layer-mask) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img tsl-layer-mask) + (gimp-edit-fill tsl-layer-mask) (gimp-selection-feather img f-size) (gimp-palette-set-background '(63 63 63)) - (gimp-edit-fill img drop-shadow-layer) + (gimp-edit-fill drop-shadow-layer) (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img text-shadow-layer) + (gimp-edit-fill text-shadow-layer) (gimp-palette-set-foreground '(255 255 255)) - (gimp-blend img text-shadow-layer FG-BG-RGB NORMAL SHAPEBURST-ANGULAR 100 0 REPEAT-NONE FALSE 0 0 0 0 1 1) + (gimp-blend text-shadow-layer FG-BG-RGB NORMAL SHAPEBURST-ANGULAR 100 0 REPEAT-NONE FALSE 0 0 0 0 1 1) (gimp-selection-none img) (gimp-palette-set-foreground blend-fg) (gimp-palette-set-background blend-bg) - (gimp-blend img blend-layer blend-mode NORMAL LINEAR 100 0 REPEAT-NONE FALSE 0 0 0 0 width 0) + (gimp-blend blend-layer blend-mode NORMAL LINEAR 100 0 REPEAT-NONE FALSE 0 0 0 0 width 0) (gimp-layer-translate text-layer (- b-size-2) (- b-size-2)) (gimp-layer-translate blend-layer (- b-size) (- b-size)) (gimp-layer-translate text-shadow-layer (- ts-size) (- ts-size)) (gimp-layer-translate drop-shadow-layer ds-size ds-size) - (gimp-selection-layer-alpha img blend-layer) + (gimp-selection-layer-alpha blend-layer) (gimp-image-add-layer-mask img drop-shadow-layer dsl-layer-mask) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img dsl-layer-mask) + (gimp-edit-fill dsl-layer-mask) (gimp-image-remove-layer-mask img drop-shadow-layer APPLY) (gimp-selection-none img) (gimp-layer-set-name text-layer text) diff --git a/plug-ins/script-fu/scripts/bovinated-logo.scm b/plug-ins/script-fu/scripts/bovinated-logo.scm index f128cee759..d6f4f20265 100644 --- a/plug-ins/script-fu/scripts/bovinated-logo.scm +++ b/plug-ins/script-fu/scripts/bovinated-logo.scm @@ -35,31 +35,31 @@ (gimp-image-add-layer img blur-layer 1) (gimp-selection-all img) - (gimp-edit-fill img bg-layer) + (gimp-edit-fill bg-layer) (gimp-selection-none img) (gimp-layer-set-preserve-trans blur-layer TRUE) (gimp-palette-set-background '(255 255 255)) (gimp-selection-all img) - (gimp-edit-fill img blur-layer) - (gimp-edit-clear img blur-layer) + (gimp-edit-fill blur-layer) + (gimp-edit-clear blur-layer) (gimp-palette-set-background '(191 191 191)) (gimp-selection-none img) (gimp-layer-set-preserve-trans blur-layer FALSE) - (gimp-selection-layer-alpha img text-layer) - (gimp-edit-fill img blur-layer) + (gimp-selection-layer-alpha text-layer) + (gimp-edit-fill blur-layer) (plug-in-gauss-rle 1 img blur-layer 5.0 1 1) (gimp-selection-none img) (gimp-layer-set-preserve-trans text-layer TRUE) (gimp-selection-all img) (plug-in-solid-noise 1 img text-layer 0 0 23 1 16.0 4.0) - (gimp-brightness-contrast img text-layer 0 127) + (gimp-brightness-contrast text-layer 0 127) (gimp-selection-none img) (gimp-layer-set-preserve-trans text-layer FALSE) (gimp-layer-set-name text-layer text) (plug-in-bump-map 1 img text-layer blur-layer 135 50 10 0 0 0 30 TRUE FALSE 0) (gimp-layer-set-offsets blur-layer 5 5) - (gimp-invert img blur-layer) + (gimp-invert blur-layer) (gimp-layer-set-opacity blur-layer 50.0) (gimp-image-set-active-layer img text-layer) (gimp-palette-set-background old-bg) diff --git a/plug-ins/script-fu/scripts/camo.scm b/plug-ins/script-fu/scripts/camo.scm index 5f089d29f8..438576f0a1 100644 --- a/plug-ins/script-fu/scripts/camo.scm +++ b/plug-ins/script-fu/scripts/camo.scm @@ -41,36 +41,36 @@ (plug-in-solid-noise TRUE theImage thickLayer 1 0 (rand 65536) 1 inGrain inGrain) (plug-in-solid-noise TRUE theImage thinLayer 1 0 (rand 65536) 1 inGrain inGrain) - (gimp-threshold theImage thickLayer 127 255) - (gimp-threshold theImage thinLayer 145 255) + (gimp-threshold thickLayer 127 255) + (gimp-threshold thinLayer 145 255) (set! theBlur (- 16 inGrain)) (gimp-palette-set-background inColor2) - (gimp-by-color-select theImage thickLayer '(0 0 0) 127 REPLACE TRUE FALSE 0 FALSE) - (gimp-edit-clear theImage thickLayer) + (gimp-by-color-select thickLayer '(0 0 0) 127 REPLACE TRUE FALSE 0 FALSE) + (gimp-edit-clear thickLayer) (gimp-selection-invert theImage) - (gimp-edit-fill theImage thickLayer) + (gimp-edit-fill thickLayer) (gimp-selection-none theImage) - (if (= inSmooth TRUE) + (if (= inSmooth TRUE) (script-fu-tile-blur theImage thickLayer theBlur TRUE TRUE FALSE) () ) (gimp-palette-set-background inColor3) - (gimp-by-color-select theImage thinLayer '(0 0 0) 127 REPLACE TRUE FALSE 0 FALSE) - (gimp-edit-clear theImage thinLayer) + (gimp-by-color-select thinLayer '(0 0 0) 127 REPLACE TRUE FALSE 0 FALSE) + (gimp-edit-clear thinLayer) (gimp-selection-invert theImage) - (gimp-edit-fill theImage thinLayer) + (gimp-edit-fill thinLayer) (gimp-selection-none theImage) - (if (= inSmooth TRUE) + (if (= inSmooth TRUE) (script-fu-tile-blur theImage thinLayer (/ theBlur 2) TRUE TRUE FALSE) () ) - (if (= inFlatten TRUE) + (if (= inFlatten TRUE) (gimp-image-flatten theImage) () ) diff --git a/plug-ins/script-fu/scripts/carve-it.scm b/plug-ins/script-fu/scripts/carve-it.scm index 7144539956..da6af83706 100644 --- a/plug-ins/script-fu/scripts/carve-it.scm +++ b/plug-ins/script-fu/scripts/carve-it.scm @@ -23,7 +23,7 @@ (* (sqrt val) scale)) (define (calculate-inset-gamma img layer) - (let* ((stats (gimp-histogram img layer 0 0 255)) + (let* ((stats (gimp-histogram layer 0 0 255)) (mean (car stats))) (cond ((< mean 127) (+ 1.0 (* 0.5 (/ (- 127 mean) 127.0)))) ((>= mean 127) (- 1.0 (* 0.5 (/ (- mean 127) 127.0))))))) @@ -31,11 +31,11 @@ (define (copy-layer-carve-it dest-image dest-drawable source-image source-drawable) (gimp-selection-all dest-image) - (gimp-edit-clear dest-image dest-drawable) + (gimp-edit-clear dest-drawable) (gimp-selection-none dest-image) (gimp-selection-all source-image) - (gimp-edit-copy source-image source-drawable) - (let ((floating-sel (car (gimp-edit-paste dest-image dest-drawable FALSE)))) + (gimp-edit-copy source-drawable) + (let ((floating-sel (car (gimp-edit-paste dest-drawable FALSE)))) (gimp-floating-sel-anchor floating-sel))) @@ -79,29 +79,29 @@ (old-brush (car (gimp-brushes-get-brush)))) (gimp-image-disable-undo img) (gimp-selection-all img) - (gimp-edit-clear img inset-layer) - (gimp-edit-clear img layer1) + (gimp-edit-clear inset-layer) + (gimp-edit-clear layer1) (gimp-selection-none img) (copy-layer-carve-it img layer1 bg-image bg-layer) - (gimp-edit-clear img inset-layer) + (gimp-edit-clear inset-layer) - (gimp-edit-copy mask-img mask-drawable) + (gimp-edit-copy mask-drawable) (gimp-image-add-channel img mask 0) (gimp-image-add-layer img layer1 0) (plug-in-tile 1 img layer1 width height FALSE) - (set! mask-fs (car (gimp-edit-paste img mask FALSE))) + (set! mask-fs (car (gimp-edit-paste mask FALSE))) (gimp-floating-sel-anchor mask-fs) (if (= carve-white FALSE) - (gimp-invert img mask)) + (gimp-invert mask)) (set! mask-fat (car (gimp-channel-copy mask))) (gimp-image-add-channel img mask-fat 0) - (gimp-selection-load img mask-fat) + (gimp-selection-load mask-fat) (gimp-brushes-set-brush (carve-brush brush-size)) (gimp-palette-set-foreground '(255 255 255)) - (gimp-edit-stroke img mask-fat) + (gimp-edit-stroke mask-fat) (gimp-selection-none img) (set! mask-emboss (car (gimp-channel-copy mask-fat))) @@ -110,32 +110,32 @@ (plug-in-emboss 1 img mask-emboss 315.0 45.0 7 TRUE) (gimp-palette-set-background '(180 180 180)) - (gimp-selection-load img mask-fat) + (gimp-selection-load mask-fat) (gimp-selection-invert img) - (gimp-edit-fill img mask-emboss) - (gimp-selection-load img mask) - (gimp-edit-fill img mask-emboss) + (gimp-edit-fill mask-emboss) + (gimp-selection-load mask) + (gimp-edit-fill mask-emboss) (gimp-selection-none img) (set! mask-highlight (car (gimp-channel-copy mask-emboss))) (gimp-image-add-channel img mask-highlight 0) - (gimp-levels img mask-highlight 0 180 255 1.0 0 255) + (gimp-levels mask-highlight 0 180 255 1.0 0 255) (set! mask-shadow mask-emboss) - (gimp-levels img mask-shadow 0 0 180 1.0 0 255) + (gimp-levels mask-shadow 0 0 180 1.0 0 255) - (gimp-edit-copy img mask-shadow) - (set! shadow-layer (car (gimp-edit-paste img layer1 FALSE))) + (gimp-edit-copy mask-shadow) + (set! shadow-layer (car (gimp-edit-paste layer1 FALSE))) (gimp-floating-sel-to-layer shadow-layer) (gimp-layer-set-mode shadow-layer MULTIPLY) - (gimp-edit-copy img mask-highlight) - (set! highlight-layer (car (gimp-edit-paste img shadow-layer FALSE))) + (gimp-edit-copy mask-highlight) + (set! highlight-layer (car (gimp-edit-paste shadow-layer FALSE))) (gimp-floating-sel-to-layer highlight-layer) (gimp-layer-set-mode highlight-layer SCREEN) - (gimp-edit-copy img mask) - (set! cast-shadow-layer (car (gimp-edit-paste img highlight-layer FALSE))) + (gimp-edit-copy mask) + (set! cast-shadow-layer (car (gimp-edit-paste highlight-layer FALSE))) (gimp-floating-sel-to-layer cast-shadow-layer) (gimp-layer-set-mode cast-shadow-layer MULTIPLY) (gimp-layer-set-opacity cast-shadow-layer 75) @@ -144,21 +144,21 @@ (set! csl-mask (car (gimp-layer-create-mask cast-shadow-layer BLACK-MASK))) (gimp-image-add-layer-mask img cast-shadow-layer csl-mask) - (gimp-selection-load img mask) + (gimp-selection-load mask) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img csl-mask) + (gimp-edit-fill csl-mask) (set! inset-layer (car (gimp-layer-copy layer1 TRUE))) (gimp-image-add-layer img inset-layer 1) (set! il-mask (car (gimp-layer-create-mask inset-layer BLACK-MASK))) (gimp-image-add-layer-mask img inset-layer il-mask) - (gimp-selection-load img mask) + (gimp-selection-load mask) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img il-mask) + (gimp-edit-fill il-mask) (gimp-selection-none img) (gimp-selection-none bg-image) - (gimp-levels img inset-layer 0 0 255 inset-gamma 0 255) + (gimp-levels inset-layer 0 0 255 inset-gamma 0 255) (gimp-image-remove-channel img mask) (gimp-image-remove-channel img mask-fat) (gimp-image-remove-channel img mask-highlight) diff --git a/plug-ins/script-fu/scripts/carved-logo.scm b/plug-ins/script-fu/scripts/carved-logo.scm index 3169ca98de..22ea9b4b97 100644 --- a/plug-ins/script-fu/scripts/carved-logo.scm +++ b/plug-ins/script-fu/scripts/carved-logo.scm @@ -18,7 +18,7 @@ (* (sqrt val) scale)) (define (calculate-inset-gamma img layer) - (let* ((stats (gimp-histogram img layer 0 0 255)) + (let* ((stats (gimp-histogram layer 0 0 255)) (mean (car stats))) (cond ((< mean 127) (+ 1.0 (* 0.5 (/ (- 127 mean) 127.0)))) ((>= mean 127) (- 1.0 (* 0.5 (/ (- mean 127) 127.0))))))) @@ -54,27 +54,27 @@ (gimp-layer-set-preserve-trans mask-layer TRUE) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img mask-layer) + (gimp-edit-fill mask-layer) (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img mask) + (gimp-edit-fill mask) (plug-in-tile 1 img layer1 width height FALSE) (gimp-image-add-channel img mask 0) - (gimp-edit-copy img mask-layer) - (set! mask-fs (car (gimp-edit-paste img mask FALSE))) + (gimp-edit-copy mask-layer) + (set! mask-fs (car (gimp-edit-paste mask FALSE))) (gimp-floating-sel-anchor mask-fs) (if (= carve-raised TRUE) - (gimp-invert img mask)) + (gimp-invert mask)) (gimp-image-remove-layer img mask-layer) (set! mask-fat (car (gimp-channel-copy mask))) (gimp-image-add-channel img mask-fat 0) - (gimp-selection-load img mask-fat) + (gimp-selection-load mask-fat) (gimp-brushes-set-brush (carve-brush brush-size)) (gimp-palette-set-foreground '(255 255 255)) - (gimp-edit-stroke img mask-fat) + (gimp-edit-stroke mask-fat) (gimp-selection-none img) (set! mask-emboss (car (gimp-channel-copy mask-fat))) @@ -83,32 +83,32 @@ (plug-in-emboss 1 img mask-emboss 315.0 45.0 7 TRUE) (gimp-palette-set-background '(180 180 180)) - (gimp-selection-load img mask-fat) + (gimp-selection-load mask-fat) (gimp-selection-invert img) - (gimp-edit-fill img mask-emboss) - (gimp-selection-load img mask) - (gimp-edit-fill img mask-emboss) + (gimp-edit-fill mask-emboss) + (gimp-selection-load mask) + (gimp-edit-fill mask-emboss) (gimp-selection-none img) (set! mask-highlight (car (gimp-channel-copy mask-emboss))) (gimp-image-add-channel img mask-highlight 0) - (gimp-levels img mask-highlight 0 180 255 1.0 0 255) + (gimp-levels mask-highlight 0 180 255 1.0 0 255) (set! mask-shadow mask-emboss) - (gimp-levels img mask-shadow 0 0 180 1.0 0 255) + (gimp-levels mask-shadow 0 0 180 1.0 0 255) - (gimp-edit-copy img mask-shadow) - (set! shadow-layer (car (gimp-edit-paste img layer1 FALSE))) + (gimp-edit-copy mask-shadow) + (set! shadow-layer (car (gimp-edit-paste layer1 FALSE))) (gimp-floating-sel-to-layer shadow-layer) (gimp-layer-set-mode shadow-layer MULTIPLY) - (gimp-edit-copy img mask-highlight) - (set! highlight-layer (car (gimp-edit-paste img shadow-layer FALSE))) + (gimp-edit-copy mask-highlight) + (set! highlight-layer (car (gimp-edit-paste shadow-layer FALSE))) (gimp-floating-sel-to-layer highlight-layer) (gimp-layer-set-mode highlight-layer SCREEN) - (gimp-edit-copy img mask) - (set! cast-shadow-layer (car (gimp-edit-paste img highlight-layer FALSE))) + (gimp-edit-copy mask) + (set! cast-shadow-layer (car (gimp-edit-paste highlight-layer FALSE))) (gimp-floating-sel-to-layer cast-shadow-layer) (gimp-layer-set-mode cast-shadow-layer MULTIPLY) (gimp-layer-set-opacity cast-shadow-layer 75) @@ -117,21 +117,21 @@ (set! csl-mask (car (gimp-layer-create-mask cast-shadow-layer BLACK-MASK))) (gimp-image-add-layer-mask img cast-shadow-layer csl-mask) - (gimp-selection-load img mask) + (gimp-selection-load mask) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img csl-mask) + (gimp-edit-fill csl-mask) (set! inset-layer (car (gimp-layer-copy layer1 TRUE))) (gimp-image-add-layer img inset-layer 1) (set! il-mask (car (gimp-layer-create-mask inset-layer BLACK-MASK))) (gimp-image-add-layer-mask img inset-layer il-mask) - (gimp-selection-load img mask) + (gimp-selection-load mask) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img il-mask) + (gimp-edit-fill il-mask) (gimp-selection-none img) - (gimp-levels img inset-layer 0 0 255 inset-gamma 0 255) + (gimp-levels inset-layer 0 0 255 inset-gamma 0 255) (gimp-image-remove-channel img mask) (gimp-image-remove-channel img mask-fat) diff --git a/plug-ins/script-fu/scripts/chalk.scm b/plug-ins/script-fu/scripts/chalk.scm index 7add2f6730..31a1913dcd 100644 --- a/plug-ins/script-fu/scripts/chalk.scm +++ b/plug-ins/script-fu/scripts/chalk.scm @@ -36,8 +36,8 @@ (gimp-image-add-layer img bg-layer 1) (gimp-palette-set-background bg-color) - (gimp-edit-fill img bg-layer) - (gimp-edit-clear img text-layer) + (gimp-edit-fill bg-layer) + (gimp-edit-clear text-layer) ; is there any other way to do this? ; the sobel edge detect won't work with the methods in other scripts @@ -51,12 +51,12 @@ (plug-in-ripple 1 img text-layer 27 2 0 0 0 TRUE TRUE) (plug-in-ripple 1 img text-layer 27 2 1 0 0 TRUE TRUE) (plug-in-sobel 1 img text-layer TRUE TRUE TRUE) - (gimp-levels img text-layer 0 0 120 3.5 0 255) + (gimp-levels text-layer 0 0 120 3.5 0 255) ; work-around for sobel edge detect screw-up (why does this happen?) ; the top line of the image has some garbage instead of the bgcolor (gimp-rect-select img 0 0 width 1 ADD FALSE 0) - (gimp-edit-clear img text-layer) + (gimp-edit-clear text-layer) (gimp-selection-none img) (gimp-layer-set-preserve-trans text-layer TRUE) diff --git a/plug-ins/script-fu/scripts/chip-away.scm b/plug-ins/script-fu/scripts/chip-away.scm index afd4fbe8d3..082886e62f 100644 --- a/plug-ins/script-fu/scripts/chip-away.scm +++ b/plug-ins/script-fu/scripts/chip-away.scm @@ -57,22 +57,22 @@ (gimp-selection-all img) (if (= bg-fill TRUE) - (gimp-bucket-fill img bg-layer 2 NORMAL 100 255 FALSE 1 1) - (gimp-edit-fill img bg-layer)) + (gimp-bucket-fill bg-layer 2 NORMAL 100 255 FALSE 1 1) + (gimp-edit-fill bg-layer)) (gimp-selection-all img) - (gimp-edit-clear img bump-layer) + (gimp-edit-clear bump-layer) (gimp-selection-none img) - (gimp-selection-layer-alpha img text-layer) - (gimp-edit-fill img bump-layer) - (gimp-bucket-fill img text-layer 2 NORMAL 100 255 FALSE 1 1) + (gimp-selection-layer-alpha text-layer) + (gimp-edit-fill bump-layer) + (gimp-bucket-fill text-layer 2 NORMAL 100 255 FALSE 1 1) (gimp-selection-none img) (gimp-image-add-layer img bump-layer 1) (gimp-layer-set-preserve-trans bump-layer FALSE) (plug-in-spread 1 img bump-layer spread-amount spread-amount) - (gimp-selection-layer-alpha img bump-layer) + (gimp-selection-layer-alpha bump-layer) (plug-in-gauss-rle 1 img bump-layer blur-amount TRUE TRUE) (gimp-selection-none img) @@ -85,11 +85,11 @@ (begin (let* ((shadow-layer (car (gimp-layer-new img width height RGBA_IMAGE "Shadow layer" 100 NORMAL)))) (gimp-selection-all img) - (gimp-edit-clear img shadow-layer) + (gimp-edit-clear shadow-layer) (gimp-selection-none img) - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img shadow-layer) + (gimp-edit-fill shadow-layer) (gimp-selection-none img) (plug-in-gauss-rle 1 img shadow-layer 5 TRUE TRUE) (gimp-image-add-layer img shadow-layer 1) diff --git a/plug-ins/script-fu/scripts/chrome-it.scm b/plug-ins/script-fu/scripts/chrome-it.scm index 8cd73aeedb..d86395c153 100644 --- a/plug-ins/script-fu/scripts/chrome-it.scm +++ b/plug-ins/script-fu/scripts/chrome-it.scm @@ -54,11 +54,11 @@ (define (copy-layer-chrome-it dest-image dest-drawable source-image source-drawable) (gimp-selection-all dest-image) - (gimp-edit-clear dest-image dest-drawable) + (gimp-edit-clear dest-drawable) (gimp-selection-none dest-image) (gimp-selection-all source-image) - (gimp-edit-copy source-image source-drawable) - (let ((floating-sel (car (gimp-edit-paste dest-image dest-drawable FALSE)))) + (gimp-edit-copy source-drawable) + (let ((floating-sel (car (gimp-edit-paste dest-drawable FALSE)))) (gimp-floating-sel-anchor floating-sel))) (define (script-fu-sota-chrome-it mask-img mask-drawable chrome-saturation @@ -98,31 +98,31 @@ (gimp-image-add-layer img layer3 0) (gimp-image-add-layer img layer2 0) - (gimp-edit-copy mask-img mask-drawable) - (set! mask-fs (car (gimp-edit-paste img mask FALSE))) + (gimp-edit-copy mask-drawable) + (set! mask-fs (car (gimp-edit-paste mask FALSE))) (gimp-floating-sel-anchor mask-fs) (if (= carve-white FALSE) - (gimp-invert img mask)) + (gimp-invert mask)) (gimp-palette-set-background '(255 255 255)) (gimp-selection-none img) - (gimp-edit-fill img layer2) - (gimp-edit-fill img layer3) - (gimp-edit-clear img shadow) + (gimp-edit-fill layer2) + (gimp-edit-fill layer3) + (gimp-edit-clear shadow) (gimp-layer-set-visible bg-layer FALSE) (gimp-layer-set-visible shadow FALSE) - (gimp-selection-load img mask) + (gimp-selection-load mask) (gimp-palette-set-background '(0 0 0)) (gimp-selection-translate img offx1 offy1) (gimp-selection-feather img feather) - (gimp-edit-fill img layer2) + (gimp-edit-fill layer2) (gimp-selection-translate img (* 2 offx2) (* 2 offy2)) - (gimp-edit-fill img layer3) + (gimp-edit-fill layer3) (gimp-selection-none img) (set! layer2 (car (gimp-image-merge-visible-layers img CLIP-TO-IMAGE))) - (gimp-invert img layer2) + (gimp-invert layer2) (copy-layer-chrome-it img layer1 banding-img banding-layer) (gimp-image-delete banding-img) @@ -131,40 +131,40 @@ (plug-in-gauss-iir 1 img layer1 10 TRUE TRUE) (gimp-layer-set-opacity layer1 50) (set! layer1 (car (gimp-image-merge-visible-layers img CLIP-TO-IMAGE))) - (gimp-curves-spline img layer1 0 18 (spline-chrome-it)) + (gimp-curves-spline layer1 0 18 (spline-chrome-it)) (set! layer-mask (car (gimp-layer-create-mask layer1 BLACK-MASK))) (gimp-image-add-layer-mask img layer1 layer-mask) - (gimp-selection-load img mask) + (gimp-selection-load mask) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img layer-mask) + (gimp-edit-fill layer-mask) (set! layer2 (car (gimp-layer-copy layer1 TRUE))) (gimp-image-add-layer img layer2 0) (gimp-brushes-set-brush (brush brush-size)) (gimp-palette-set-foreground '(255 255 255)) - (gimp-edit-stroke img layer-mask) + (gimp-edit-stroke layer-mask) (gimp-palette-set-background '(0 0 0)) (gimp-selection-feather img (* feather 1.5)) (gimp-selection-translate img (* 2.5 offx1) (* 2.5 offy1)) - (gimp-edit-fill img shadow) + (gimp-edit-fill shadow) (gimp-selection-all img) (gimp-patterns-set-pattern "Marble #1") - (gimp-bucket-fill img bg-layer PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) + (gimp-bucket-fill bg-layer PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) (gimp-selection-none img) (gimp-convert-rgb img) - (gimp-color-balance img layer1 0 TRUE (shadows (rval hc)) (shadows (gval hc)) (shadows (bval hc))) - (gimp-color-balance img layer1 1 TRUE (midtones (rval hc)) (midtones (gval hc)) (midtones (bval hc))) - (gimp-color-balance img layer1 2 TRUE (highlights (rval hc)) (highlights (gval hc)) (highlights (bval hc))) + (gimp-color-balance layer1 0 TRUE (shadows (rval hc)) (shadows (gval hc)) (shadows (bval hc))) + (gimp-color-balance layer1 1 TRUE (midtones (rval hc)) (midtones (gval hc)) (midtones (bval hc))) + (gimp-color-balance layer1 2 TRUE (highlights (rval hc)) (highlights (gval hc)) (highlights (bval hc))) - (gimp-color-balance img layer2 0 TRUE (shadows (rval cc)) (shadows (gval cc)) (shadows (bval cc))) - (gimp-color-balance img layer2 1 TRUE (midtones (rval cc)) (midtones (gval cc)) (midtones (bval cc))) - (gimp-color-balance img layer2 2 TRUE (highlights (rval cc)) (highlights (gval cc)) (highlights (bval cc))) - (gimp-hue-saturation img layer2 0 0 chrome-lightness chrome-saturation) + (gimp-color-balance layer2 0 TRUE (shadows (rval cc)) (shadows (gval cc)) (shadows (bval cc))) + (gimp-color-balance layer2 1 TRUE (midtones (rval cc)) (midtones (gval cc)) (midtones (bval cc))) + (gimp-color-balance layer2 2 TRUE (highlights (rval cc)) (highlights (gval cc)) (highlights (bval cc))) + (gimp-hue-saturation layer2 0 0 chrome-lightness chrome-saturation) (gimp-layer-set-visible shadow TRUE) (gimp-layer-set-visible bg-layer TRUE) diff --git a/plug-ins/script-fu/scripts/chrome-logo.scm b/plug-ins/script-fu/scripts/chrome-logo.scm index 6dc816d1d5..e42cf6a84f 100644 --- a/plug-ins/script-fu/scripts/chrome-logo.scm +++ b/plug-ins/script-fu/scripts/chrome-logo.scm @@ -28,35 +28,35 @@ (gimp-image-add-layer img layer1 1) (gimp-palette-set-background '(255 255 255)) (gimp-selection-none img) - (gimp-edit-fill img layer1) - (gimp-edit-fill img layer2) - (gimp-edit-fill img layer3) - (gimp-edit-clear img shadow) - (gimp-selection-layer-alpha img text-layer) + (gimp-edit-fill layer1) + (gimp-edit-fill layer2) + (gimp-edit-fill layer3) + (gimp-edit-clear shadow) + (gimp-selection-layer-alpha text-layer) (gimp-layer-set-visible text-layer FALSE) (gimp-layer-set-visible shadow FALSE) (gimp-layer-set-visible background FALSE) (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img layer1) + (gimp-edit-fill layer1) (gimp-selection-translate img offx1 offy1) (gimp-selection-feather img feather) - (gimp-edit-fill img layer2) + (gimp-edit-fill layer2) (gimp-selection-translate img (* 2 offx2) (* 2 offy2)) - (gimp-edit-fill img layer3) + (gimp-edit-fill layer3) (gimp-selection-none img) (set! layer1 (car (gimp-image-merge-visible-layers img CLIP-TO-IMAGE))) - (gimp-invert img layer1) + (gimp-invert layer1) (gimp-image-add-layer-mask img layer1 layer-mask) - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) (gimp-palette-set-background '(255 255 255)) (gimp-selection-feather img feather) - (gimp-edit-fill img layer-mask) + (gimp-edit-fill layer-mask) (gimp-palette-set-background '(0 0 0)) (gimp-selection-translate img offx1 offy1) - (gimp-edit-fill img shadow) + (gimp-edit-fill shadow) (gimp-selection-none img) (gimp-palette-set-background bg-color) - (gimp-edit-fill img background) + (gimp-edit-fill background) (gimp-image-remove-layer img text-layer) (gimp-layer-set-visible shadow TRUE) (gimp-layer-set-visible background TRUE) diff --git a/plug-ins/script-fu/scripts/circuit.scm b/plug-ins/script-fu/scripts/circuit.scm index ce8be48077..e2716aee94 100644 --- a/plug-ins/script-fu/scripts/circuit.scm +++ b/plug-ins/script-fu/scripts/circuit.scm @@ -49,10 +49,10 @@ (if (= (car (gimp-selection-is-empty image)) TRUE) (begin - (gimp-selection-layer-alpha image drawable) + (gimp-selection-layer-alpha drawable) (set! active-selection (car (gimp-selection-save image))) (set! from-selection FALSE)) - (begin + (begin (set! from-selection TRUE) (set! active-selection (car (gimp-selection-save image))))) @@ -64,22 +64,22 @@ (if (= seperate-layer TRUE) (begin - (set! effect-layer (car (gimp-layer-new image - select-width - select-height - type + (set! effect-layer (car (gimp-layer-new image + select-width + select-height + type "effect layer" - 100 + 100 NORMAL))) (gimp-layer-set-offsets effect-layer select-offset-x select-offset-y) (gimp-image-add-layer image effect-layer -1) (gimp-selection-none image) - (gimp-edit-clear image effect-layer) - (gimp-selection-load image active-selection) - (gimp-edit-copy image drawable) + (gimp-edit-clear effect-layer) + (gimp-selection-load active-selection) + (gimp-edit-copy drawable) - (let ((floating-sel (car (gimp-edit-paste image effect-layer FALSE)))) + (let ((floating-sel (car (gimp-edit-paste effect-layer FALSE)))) (gimp-floating-sel-anchor floating-sel) ) (gimp-image-set-active-layer image effect-layer ))) @@ -91,18 +91,17 @@ (gimp-palette-set-foreground '(0 0 0)) (gimp-palette-set-foreground '(14 14 14)))) - (gimp-selection-load image active-selection) + (gimp-selection-load active-selection) (plug-in-maze 1 image active-layer 5 5 TRUE 0 seed 57 1) - (plug-in-oilify 1 image active-layer mask-size 0) + (plug-in-oilify 1 image active-layer mask-size 0) (plug-in-edge 1 image active-layer 2 1) - (gimp-desaturate image active-layer) + (gimp-desaturate active-layer) - (if (and + (if (and (= remove-bg TRUE) (= seperate-layer TRUE) (begin (gimp-by-color-select - image active-layer '(0 0 0) 15 @@ -111,7 +110,7 @@ FALSE 10 FALSE) - (gimp-edit-clear image active-layer)))) + (gimp-edit-clear active-layer)))) (gimp-gradients-set-active old-gradient) (gimp-palette-set-background old-bg) diff --git a/plug-ins/script-fu/scripts/clothify.scm b/plug-ins/script-fu/scripts/clothify.scm index 1b9fe73d5b..e542aa579c 100644 --- a/plug-ins/script-fu/scripts/clothify.scm +++ b/plug-ins/script-fu/scripts/clothify.scm @@ -13,7 +13,7 @@ (layer-one (car (gimp-layer-new img width height RGB "X Dots" 100 NORMAL)))) (gimp-image-disable-undo img) - (gimp-edit-fill img layer-one) + (gimp-edit-fill layer-one) ; (gimp-edit-fill img layer-two) (gimp-image-add-layer img layer-one 0) diff --git a/plug-ins/script-fu/scripts/coffee.scm b/plug-ins/script-fu/scripts/coffee.scm index d88c7af993..2471d34dbd 100644 --- a/plug-ins/script-fu/scripts/coffee.scm +++ b/plug-ins/script-fu/scripts/coffee.scm @@ -27,25 +27,25 @@ (set! theNumber inNumber) (set! theSize (min theWidth theHeight) ) - (while (> theNumber 0) + (while (> theNumber 0) (set! theNumber (- theNumber 1)) - (set! theStain (car (gimp-layer-new theImage theSize theSize RGBA_IMAGE "Stain" 100 + (set! theStain (car (gimp-layer-new theImage theSize theSize RGBA_IMAGE "Stain" 100 (if (= inDark TRUE) DARKEN-ONLY NORMAL) ))) (gimp-image-add-layer theImage theStain 0) (gimp-selection-all theImage) - (gimp-edit-clear theImage theStain) + (gimp-edit-clear theStain) (let ((blobSize (/ (rand (- theSize 40)) (+ (rand 3) 1) ) ) ) - (gimp-ellipse-select theImage + (gimp-ellipse-select theImage (/ (- theSize blobSize) 2) (/ (- theSize blobSize) 2) blobSize blobSize REPLACE TRUE 0 FALSE) ) (script-fu-distress-selection theImage theStain (* (+ (rand 15) 1) (+ (rand 15) 1)) (/ theSize 25) 4 2 TRUE TRUE ) (gimp-gradients-set-active "Coffee") - (gimp-blend theImage theStain CUSTOM NORMAL SHAPEBURST-DIMPLED 100 0 REPEAT-NONE FALSE 0 0 0 0 0 0) + (gimp-blend theStain CUSTOM NORMAL SHAPEBURST-DIMPLED 100 0 REPEAT-NONE FALSE 0 0 0 0 0 0) (gimp-layer-set-offsets theStain (- (rand theWidth) (/ theSize 2)) (- (rand theHeight) (/ theSize 2)) theSize) ) (gimp-selection-none theImage) diff --git a/plug-ins/script-fu/scripts/color-cycling.scm b/plug-ins/script-fu/scripts/color-cycling.scm index ba3613f709..f37c25c8a5 100644 --- a/plug-ins/script-fu/scripts/color-cycling.scm +++ b/plug-ins/script-fu/scripts/color-cycling.scm @@ -49,8 +49,8 @@ ; ; -(define (script-fu-colorcycling-anim img - drawable +(define (script-fu-colorcycling-anim img + drawable num-frames startredstretch startgreenstretch @@ -142,14 +142,14 @@ (set! alienmap-layer (car (gimp-layer-copy source-layer TRUE))) (gimp-layer-set-preserve-trans alienmap-layer FALSE) (gimp-image-add-layer image alienmap-layer -1) - (set! layer-name (string-append "Frame " + (set! layer-name (string-append "Frame " (number->string - (- (+ num-frames 2) + (- (+ num-frames 2) remaining-frames) 10))) (gimp-layer-set-name alienmap-layer layer-name) (plug-in-alienmap 1 - image + image alienmap-layer redstretch greenstretch @@ -184,8 +184,8 @@ ) (gimp-layer-set-name source-layer "Frame 1") - (plug-in-alienmap 1 - image + (plug-in-alienmap 1 + image source-layer redstretch greenstretch @@ -209,7 +209,7 @@ (gimp-image-enable-undo image) (gimp-display-new image))) -(script-fu-register "script-fu-colorcycling-anim" +(script-fu-register "script-fu-colorcycling-anim" "/Script-Fu/Animators/Color Cycling" "Creates an animation with the help of the alienmap plug-in" "Daniel Cotting (cotting@mygale.org)" diff --git a/plug-ins/script-fu/scripts/comic-logo.scm b/plug-ins/script-fu/scripts/comic-logo.scm index 47f6c84c6f..2ea4362168 100644 --- a/plug-ins/script-fu/scripts/comic-logo.scm +++ b/plug-ins/script-fu/scripts/comic-logo.scm @@ -39,13 +39,13 @@ (gimp-layer-set-name black-layer "Black") (gimp-selection-all img) - (gimp-edit-fill img bg-layer) + (gimp-edit-fill bg-layer) (gimp-selection-none img) (gimp-layer-set-preserve-trans white-layer TRUE) (gimp-palette-set-background '(255 255 255)) (gimp-selection-all img) - (gimp-edit-fill img white-layer) + (gimp-edit-fill white-layer) (gimp-layer-set-preserve-trans white-layer FALSE) (plug-in-spread 1 img white-layer (* 3 ol-width) (* 3 ol-width)) (plug-in-gauss-rle 1 img white-layer (* 2 ol-width) 1 1) @@ -55,7 +55,7 @@ (gimp-palette-set-background '(0 0 0)) (gimp-layer-set-preserve-trans black-layer TRUE) (gimp-selection-all img) - (gimp-edit-fill img black-layer) + (gimp-edit-fill black-layer) (gimp-selection-none img) (gimp-layer-set-preserve-trans black-layer FALSE) (plug-in-gauss-rle 1 img black-layer ol-width 1 1) @@ -64,11 +64,11 @@ (gimp-gradients-set-active gradient) (gimp-layer-set-preserve-trans text-layer TRUE) (gimp-selection-all img) - (gimp-blend img text-layer CUSTOM NORMAL LINEAR 100 0 REPEAT-NONE FALSE 0 0 0 (* 2 border) 0 (- height border)) + (gimp-blend text-layer CUSTOM NORMAL LINEAR 100 0 REPEAT-NONE FALSE 0 0 0 (* 2 border) 0 (- height border)) (plug-in-noisify 1 img text-layer 0 0.20 0.20 0.20 0.20) (gimp-selection-none img) (gimp-layer-set-preserve-trans text-layer FALSE) - (gimp-brightness-contrast img text-layer 0 30) + (gimp-brightness-contrast text-layer 0 30) (plug-in-threshold-alpha 1 img text-layer 60) (gimp-layer-set-name text-layer text) (gimp-image-set-active-layer img text-layer) diff --git a/plug-ins/script-fu/scripts/coolmetal-logo.scm b/plug-ins/script-fu/scripts/coolmetal-logo.scm index c25c43b928..947d98a8c5 100644 --- a/plug-ins/script-fu/scripts/coolmetal-logo.scm +++ b/plug-ins/script-fu/scripts/coolmetal-logo.scm @@ -34,15 +34,15 @@ (gimp-layer-set-preserve-trans text-layer TRUE) (gimp-palette-set-background bg-color) - (gimp-edit-fill img bg-layer) - (gimp-edit-clear img reflect-layer) + (gimp-edit-fill bg-layer) + (gimp-edit-clear reflect-layer) (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img shadow-layer) + (gimp-edit-fill shadow-layer) (if (= seascape 1) (gimp-gradients-set-active "Horizon_2") (gimp-gradients-set-active "Horizon_1")) - (gimp-blend img text-layer CUSTOM NORMAL LINEAR 100 0 REPEAT-NONE FALSE 0 0 0 0 0 (+ height 5)) + (gimp-blend text-layer CUSTOM NORMAL LINEAR 100 0 REPEAT-NONE FALSE 0 0 0 0 0 (+ height 5)) (gimp-rect-select img 0 (- (/ height 2) feather) img-width (* 2 feather) REPLACE 0 0) (plug-in-gauss-iir 1 img text-layer smear TRUE TRUE) (gimp-selection-none img) @@ -50,23 +50,23 @@ (gimp-layer-translate text-layer 5 5) (gimp-layer-resize text-layer img-width img-height 5 5) - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) (set! channel (car (gimp-selection-save img))) (gimp-selection-shrink img shrink) (gimp-selection-invert img) (plug-in-gauss-rle 1 img channel feather TRUE TRUE) - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) (gimp-selection-invert img) (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img channel) + (gimp-edit-fill channel) (gimp-selection-none img) (plug-in-bump-map 1 img text-layer channel 135 45 depth 0 0 0 0 FALSE FALSE 0) - (gimp-selection-layer-alpha img text-layer) - (set! fs (car (gimp-selection-float img shadow-layer 0 0))) - (gimp-edit-clear img shadow-layer) - (gimp-perspective img fs FALSE + (gimp-selection-layer-alpha text-layer) + (set! fs (car (gimp-selection-float shadow-layer 0 0))) + (gimp-edit-clear shadow-layer) + (gimp-perspective fs FALSE (+ 5 (* 0.15 height)) (- height (* 0.15 height)) (+ 5 width (* 0.15 height)) (- height (* 0.15 height)) 5 height @@ -75,18 +75,18 @@ (plug-in-gauss-rle 1 img shadow-layer smear TRUE TRUE) (gimp-rect-select img 5 5 width height REPLACE FALSE 0) - (gimp-edit-copy img text-layer) - (set! fs (car (gimp-edit-paste img reflect-layer FALSE))) + (gimp-edit-copy text-layer) + (set! fs (car (gimp-edit-paste reflect-layer FALSE))) (gimp-floating-sel-anchor fs) - (gimp-scale img reflect-layer FALSE 0 0 width (* 0.85 height)) - (gimp-flip img reflect-layer 1) + (gimp-scale reflect-layer FALSE 0 0 width (* 0.85 height)) + (gimp-flip reflect-layer 1) (gimp-layer-set-offsets reflect-layer 5 (+ 3 height)) (set! layer-mask (car (gimp-layer-create-mask reflect-layer WHITE-MASK))) (gimp-image-add-layer-mask img reflect-layer layer-mask) (gimp-palette-set-foreground '(255 255 255)) (gimp-palette-set-background '(0 0 0)) - (gimp-blend img layer-mask FG-BG-RGB NORMAL LINEAR 100 0 REPEAT-NONE + (gimp-blend layer-mask FG-BG-RGB NORMAL LINEAR 100 0 REPEAT-NONE FALSE 0 0 0 (- (/ height 2)) 0 height) (gimp-image-remove-channel img channel) diff --git a/plug-ins/script-fu/scripts/copy-visible.scm b/plug-ins/script-fu/scripts/copy-visible.scm index 370b07e5aa..81e0935eed 100644 --- a/plug-ins/script-fu/scripts/copy-visible.scm +++ b/plug-ins/script-fu/scripts/copy-visible.scm @@ -36,7 +36,7 @@ (set! visi-array (cons-array num-layers)) (while (<= layer-count num-layers) (set! layer (aref layer-array (- num-layers layer-count))) - (aset visi-array (- num-layers layer-count) + (aset visi-array (- num-layers layer-count) (car (gimp-layer-get-visible layer))) (if (= TRUE (car (gimp-layer-get-visible layer))) (begin @@ -50,12 +50,12 @@ ; merge all visible layers (if (> num-visi-layers 1) (set! merged-layer (car (gimp-image-merge-visible-layers image EXPAND-AS-NECESSARY))) - (if (> num-visi-layers 0) + (if (> num-visi-layers 0) (set! merged-layer copy))) - (if (> num-visi-layers 0) + (if (> num-visi-layers 0) (begin - (gimp-edit-copy image merged-layer) + (gimp-edit-copy merged-layer) (gimp-image-remove-layer image merged-layer))) ; restore the layers visibilty @@ -70,7 +70,7 @@ (gimp-undo-push-group-end image) (gimp-displays-flush))) -(script-fu-register "script-fu-copy-visible" +(script-fu-register "script-fu-copy-visible" "/Edit/Copy Visible" "Copy the visible selction" "Sven Neumann (neumanns@uni-duesseldorf.de), Adrian Likins " diff --git a/plug-ins/script-fu/scripts/crystal-logo.scm b/plug-ins/script-fu/scripts/crystal-logo.scm index a9f59d0ee4..cb517c071a 100644 --- a/plug-ins/script-fu/scripts/crystal-logo.scm +++ b/plug-ins/script-fu/scripts/crystal-logo.scm @@ -52,11 +52,11 @@ (define (copy-layer-crystal dest-image dest-drawable source-image source-drawable) (gimp-selection-all dest-image) - (gimp-edit-clear dest-image dest-drawable) + (gimp-edit-clear dest-drawable) (gimp-selection-none dest-image) (gimp-selection-all source-image) - (gimp-edit-copy source-image source-drawable) - (let ((floating-sel (car (gimp-edit-paste dest-image dest-drawable FALSE)))) + (gimp-edit-copy source-drawable) + (let ((floating-sel (car (gimp-edit-paste dest-drawable FALSE)))) (gimp-floating-sel-anchor floating-sel))) (define (script-fu-crystal-logo chrome-factor text size font bg-img env-map) @@ -103,20 +103,20 @@ (gimp-image-add-layer img layer2 0) (gimp-palette-set-background '(255 255 255)) (gimp-selection-none img) - (gimp-edit-fill img layer2) - (gimp-edit-fill img layer3) + (gimp-edit-fill layer2) + (gimp-edit-fill layer3) (gimp-layer-set-visible text-layer FALSE) - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) (gimp-palette-set-background '(0 0 0)) (gimp-selection-translate img offx1 offy1) (gimp-selection-feather img feather) - (gimp-edit-fill img layer2) + (gimp-edit-fill layer2) (gimp-selection-translate img (* 2 offx2) (* 2 offy2)) - (gimp-edit-fill img layer3) + (gimp-edit-fill layer3) (gimp-selection-none img) (set! layer2 (car (gimp-image-merge-visible-layers img CLIP-TO-IMAGE))) - (gimp-invert img layer2) + (gimp-invert layer2) (copy-layer-crystal img layer1 banding-img banding-layer) (gimp-image-delete banding-img) @@ -125,22 +125,22 @@ (plug-in-gauss-iir 1 img layer1 10 TRUE TRUE) (gimp-layer-set-opacity layer1 50) (set! layer1 (car (gimp-image-merge-visible-layers img CLIP-TO-IMAGE))) - (gimp-curves-spline img layer1 0 18 (spline1)) + (gimp-curves-spline layer1 0 18 (spline1)) (set! layer-mask (car (gimp-layer-create-mask layer1 BLACK-MASK))) (gimp-image-add-layer-mask img layer1 layer-mask) - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img layer-mask) + (gimp-edit-fill layer-mask) (set! disp-map (car (gimp-selection-save img))) (gimp-brushes-set-brush (crystal-brush brush-size)) (gimp-palette-set-foreground '(0 0 0)) - (gimp-edit-stroke img disp-map) + (gimp-edit-stroke disp-map) (gimp-selection-none img) (plug-in-gauss-rle 1 img disp-map blur TRUE TRUE) - (gimp-levels img disp-map 0 0 255 1.0 96 255) + (gimp-levels disp-map 0 0 255 1.0 96 255) (if (= (car (gimp-drawable-color bg-layer)) 1) (gimp-convert-rgb img)) @@ -156,18 +156,18 @@ (plug-in-displace 1 img layer2 displace displace TRUE TRUE disp-map disp-map 0) (set! layer-mask2 (car (gimp-layer-create-mask layer2 BLACK-MASK))) (gimp-image-add-layer-mask img layer2 layer-mask2) - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img layer-mask2) + (gimp-edit-fill layer-mask2) (gimp-selection-none img) - (gimp-levels img layer2 0 0 200 1.5 50 255) + (gimp-levels layer2 0 0 200 1.5 50 255) (gimp-layer-set-mode layer1 OVERLAY) (plug-in-gauss-rle 1 img text-layer blur TRUE TRUE) (gimp-layer-set-preserve-trans text-layer TRUE) (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img text-layer) + (gimp-edit-fill text-layer) (gimp-layer-set-mode text-layer OVERLAY) (gimp-layer-translate text-layer offx1 offy1) diff --git a/plug-ins/script-fu/scripts/distress-selection.scm b/plug-ins/script-fu/scripts/distress-selection.scm index 81387ce7f6..b39bac2825 100644 --- a/plug-ins/script-fu/scripts/distress-selection.scm +++ b/plug-ins/script-fu/scripts/distress-selection.scm @@ -21,53 +21,53 @@ ; Define the function: -(define (script-fu-distress-selection inImage - inLayer +(define (script-fu-distress-selection inImage + inLayer inThreshold inSpread - inGranu + inGranu inSmooth inSmoothH inSmoothV ) (set! theImage inImage) - (set! theWidth (car (gimp-image-width inImage))) - (set! theHeight (car (gimp-image-height inImage))) + (set! theWidth (car (gimp-image-width inImage))) + (set! theHeight (car (gimp-image-height inImage))) (gimp-image-disable-undo theImage) - (set! theLayer (car (gimp-layer-new theImage - theWidth - theHeight - RGBA_IMAGE - "Distress Scratch Layer" - 100 + (set! theLayer (car (gimp-layer-new theImage + theWidth + theHeight + RGBA_IMAGE + "Distress Scratch Layer" + 100 NORMAL ) ) ) (gimp-image-add-layer theImage theLayer 0) (if (= TRUE (car (gimp-selection-is-empty theImage))) () - (gimp-edit-fill theImage theLayer) + (gimp-edit-fill theLayer) ) (gimp-selection-invert theImage) (if (= TRUE (car (gimp-selection-is-empty theImage))) () - (gimp-edit-clear theImage theLayer) + (gimp-edit-clear theLayer) ) (gimp-selection-invert theImage) (gimp-selection-none inImage) - (gimp-layer-scale theLayer - (/ theWidth inGranu) - (/ theHeight inGranu) + (gimp-layer-scale theLayer + (/ theWidth inGranu) + (/ theHeight inGranu) TRUE ) - (plug-in-spread TRUE - theImage - theLayer + (plug-in-spread TRUE + theImage + theLayer inSpread inSpread ) @@ -76,7 +76,7 @@ (gimp-layer-scale theLayer theWidth theHeight TRUE) (plug-in-threshold-alpha TRUE theImage theLayer inThreshold) (plug-in-gauss-iir TRUE theImage theLayer 1 TRUE TRUE) - (gimp-selection-layer-alpha theImage theLayer) + (gimp-selection-layer-alpha theLayer) (gimp-image-remove-layer theImage theLayer) ; (gimp-layer-delete theLayer) (gimp-image-enable-undo theImage) diff --git a/plug-ins/script-fu/scripts/distress_selection.scm b/plug-ins/script-fu/scripts/distress_selection.scm index 81387ce7f6..b39bac2825 100644 --- a/plug-ins/script-fu/scripts/distress_selection.scm +++ b/plug-ins/script-fu/scripts/distress_selection.scm @@ -21,53 +21,53 @@ ; Define the function: -(define (script-fu-distress-selection inImage - inLayer +(define (script-fu-distress-selection inImage + inLayer inThreshold inSpread - inGranu + inGranu inSmooth inSmoothH inSmoothV ) (set! theImage inImage) - (set! theWidth (car (gimp-image-width inImage))) - (set! theHeight (car (gimp-image-height inImage))) + (set! theWidth (car (gimp-image-width inImage))) + (set! theHeight (car (gimp-image-height inImage))) (gimp-image-disable-undo theImage) - (set! theLayer (car (gimp-layer-new theImage - theWidth - theHeight - RGBA_IMAGE - "Distress Scratch Layer" - 100 + (set! theLayer (car (gimp-layer-new theImage + theWidth + theHeight + RGBA_IMAGE + "Distress Scratch Layer" + 100 NORMAL ) ) ) (gimp-image-add-layer theImage theLayer 0) (if (= TRUE (car (gimp-selection-is-empty theImage))) () - (gimp-edit-fill theImage theLayer) + (gimp-edit-fill theLayer) ) (gimp-selection-invert theImage) (if (= TRUE (car (gimp-selection-is-empty theImage))) () - (gimp-edit-clear theImage theLayer) + (gimp-edit-clear theLayer) ) (gimp-selection-invert theImage) (gimp-selection-none inImage) - (gimp-layer-scale theLayer - (/ theWidth inGranu) - (/ theHeight inGranu) + (gimp-layer-scale theLayer + (/ theWidth inGranu) + (/ theHeight inGranu) TRUE ) - (plug-in-spread TRUE - theImage - theLayer + (plug-in-spread TRUE + theImage + theLayer inSpread inSpread ) @@ -76,7 +76,7 @@ (gimp-layer-scale theLayer theWidth theHeight TRUE) (plug-in-threshold-alpha TRUE theImage theLayer inThreshold) (plug-in-gauss-iir TRUE theImage theLayer 1 TRUE TRUE) - (gimp-selection-layer-alpha theImage theLayer) + (gimp-selection-layer-alpha theLayer) (gimp-image-remove-layer theImage theLayer) ; (gimp-layer-delete theLayer) (gimp-image-enable-undo theImage) diff --git a/plug-ins/script-fu/scripts/drop-shadow.scm b/plug-ins/script-fu/scripts/drop-shadow.scm index 3361cfd773..00bb37af11 100644 --- a/plug-ins/script-fu/scripts/drop-shadow.scm +++ b/plug-ins/script-fu/scripts/drop-shadow.scm @@ -34,10 +34,10 @@ ; idea to add alpha-support to add-shadow. -(define (script-fu-drop-shadow image - drawable - shadow-transl-x - shadow-transl-y +(define (script-fu-drop-shadow image + drawable + shadow-transl-x + shadow-transl-y shadow-blur shadow-color shadow-opacity @@ -58,9 +58,9 @@ (gimp-layer-add-alpha drawable) (if (= (car (gimp-selection-is-empty image)) TRUE) (begin - (gimp-selection-layer-alpha image drawable) + (gimp-selection-layer-alpha drawable) (set! from-selection FALSE)) - (begin + (begin (set! from-selection TRUE) (set! active-selection (car (gimp-selection-save image))))) @@ -84,67 +84,67 @@ (if (< (+ shadow-offset-x shadow-transl-x) 0) (begin - (set! image-offset-x (- 0 (+ shadow-offset-x + (set! image-offset-x (- 0 (+ shadow-offset-x shadow-transl-x))) (set! shadow-offset-x (- 0 shadow-transl-x)) (set! new-image-width (- new-image-width image-offset-x)))) (if (< (+ shadow-offset-y shadow-transl-y) 0) (begin - (set! image-offset-y (- 0 (+ shadow-offset-y + (set! image-offset-y (- 0 (+ shadow-offset-y shadow-transl-y))) (set! shadow-offset-y (- 0 shadow-transl-y)) (set! new-image-height (- new-image-height image-offset-y)))) - (if (> (+ (+ shadow-width shadow-offset-x) shadow-transl-x) + (if (> (+ (+ shadow-width shadow-offset-x) shadow-transl-x) new-image-width) - (set! new-image-width + (set! new-image-width (+ (+ shadow-width shadow-offset-x) shadow-transl-x))) - (if (> (+ (+ shadow-height shadow-offset-y) shadow-transl-y) + (if (> (+ (+ shadow-height shadow-offset-y) shadow-transl-y) new-image-height) (set! new-image-height (+ (+ shadow-height shadow-offset-y) shadow-transl-y))) (gimp-image-resize image - new-image-width - new-image-height - image-offset-x + new-image-width + new-image-height + image-offset-x image-offset-y))) - (set! shadow-layer (car (gimp-layer-new image - shadow-width - shadow-height + (set! shadow-layer (car (gimp-layer-new image + shadow-width + shadow-height type - "Drop-Shadow" + "Drop-Shadow" shadow-opacity NORMAL))) - (gimp-layer-set-offsets shadow-layer + (gimp-layer-set-offsets shadow-layer shadow-offset-x shadow-offset-y)) (gimp-drawable-fill shadow-layer TRANS-IMAGE-FILL) (gimp-palette-set-background shadow-color) - (gimp-edit-fill image shadow-layer) + (gimp-edit-fill shadow-layer) (gimp-selection-none image) (gimp-layer-set-preserve-trans shadow-layer FALSE) - (if (> shadow-blur 0) (plug-in-gauss-rle 1 - image - shadow-layer - shadow-blur - TRUE + (if (> shadow-blur 0) (plug-in-gauss-rle 1 + image + shadow-layer + shadow-blur + TRUE TRUE)) (gimp-image-add-layer image shadow-layer -1) (gimp-layer-translate shadow-layer shadow-transl-x shadow-transl-y) (if (= from-selection TRUE) (begin - (gimp-selection-load image active-selection) - (gimp-edit-clear image shadow-layer) + (gimp-selection-load active-selection) + (gimp-edit-clear shadow-layer) (gimp-image-remove-channel image active-selection))) - (if (and + (if (and (= (car (gimp-layer-is-floating-sel drawable)) 0) (= from-selection FALSE)) (gimp-image-raise-layer image drawable)) @@ -154,7 +154,7 @@ (gimp-image-enable-undo image) (gimp-displays-flush))) -(script-fu-register "script-fu-drop-shadow" +(script-fu-register "script-fu-drop-shadow" "/Script-Fu/Shadow/Drop-Shadow" "Add a drop-shadow of the current selection or alpha-channel" @@ -169,7 +169,7 @@ SF-VALUE "Blur Radius" "15" SF-COLOR "Color" '(0 0 0) SF-VALUE "Opacity" "80" - SF-TOGGLE "Allow Resizing" TRUE) + SF-TOGGLE "Allow Resizing" TRUE) diff --git a/plug-ins/script-fu/scripts/erase-rows.scm b/plug-ins/script-fu/scripts/erase-rows.scm index 12f2c3dda3..31c2b0b1db 100644 --- a/plug-ins/script-fu/scripts/erase-rows.scm +++ b/plug-ins/script-fu/scripts/erase-rows.scm @@ -8,7 +8,7 @@ (if (eq? orientation 'rows) (gimp-rect-select img 0 i width 1 REPLACE FALSE 0) (gimp-rect-select img i 0 1 height REPLACE FALSE 0)) - (gimp-edit-fill img drawable) + (gimp-edit-fill drawable) (loop (+ i 2) max)))))) (loop (if (eq? which 'even) 0 diff --git a/plug-ins/script-fu/scripts/fade-outline.scm b/plug-ins/script-fu/scripts/fade-outline.scm index 967117fa27..1a3e5be7e8 100644 --- a/plug-ins/script-fu/scripts/fade-outline.scm +++ b/plug-ins/script-fu/scripts/fade-outline.scm @@ -36,7 +36,7 @@ ; Define the main function: (define (script-fu-fade-outline inImage - inLayer + inLayer inBorderSize inApplyMask inClearUnselected @@ -46,7 +46,7 @@ (l-step (/ 25500 (+ inBorderSize 1))) (l-gray l-step) (l-old-bg-color (car (gimp-palette-get-background))) - (l-has-selection TRUE) + (l-has-selection TRUE) ) @@ -75,7 +75,7 @@ (if (= (car (gimp-selection-is-empty inImage)) TRUE) (begin (set! l-has-selection FALSE) - (gimp-selection-layer-alpha inImage inLayer) + (gimp-selection-layer-alpha inLayer) ) ) @@ -100,7 +100,7 @@ ) ) (gimp-palette-set-background (list (/ l-gray 100) (/ l-gray 100) (/ l-gray 100))) - (gimp-edit-fill inImage l-mask) + (gimp-edit-fill l-mask) (set! l-idx (+ l-idx 1)) (set! l-gray (+ l-gray l-step)) (gimp-selection-shrink inImage 1) @@ -127,7 +127,7 @@ (gimp-undo-push-group-end inImage) (gimp-displays-flush) ) - )) + )) ) diff --git a/plug-ins/script-fu/scripts/font-map.scm b/plug-ins/script-fu/scripts/font-map.scm index c3f65b5350..b43059723d 100644 --- a/plug-ins/script-fu/scripts/font-map.scm +++ b/plug-ins/script-fu/scripts/font-map.scm @@ -47,7 +47,7 @@ "Font List" 100 NORMAL)))) (gimp-image-disable-undo img) (gimp-image-add-layer img drawable 0) - (gimp-edit-fill img drawable) + (gimp-edit-fill drawable) (while font-list (set! font (car font-list)) @@ -70,4 +70,4 @@ SF-VALUE "Fonts" "'(\"Agate\" \"AlfredDrake\" \"Becker\" \"Blippo\" \"Bodoni\" \"Dragonwick\" \"Engraver\" \"Futura_Poster\" \"RoostHeavy\")" SF-ADJUSTMENT "Font Size (pixels)" '(32 2 1000 1 10 0 1) SF-VALUE "Border" "10" -) +) \ No newline at end of file diff --git a/plug-ins/script-fu/scripts/frosty-logo.scm b/plug-ins/script-fu/scripts/frosty-logo.scm index c7feeb6fe8..6c3bd7695f 100644 --- a/plug-ins/script-fu/scripts/frosty-logo.scm +++ b/plug-ins/script-fu/scripts/frosty-logo.scm @@ -27,44 +27,44 @@ (gimp-image-add-layer img shadow-layer 4) (gimp-image-add-layer img bg-layer 5) (gimp-selection-none img) - (gimp-edit-clear img sparkle-layer) - (gimp-edit-clear img matte-layer) - (gimp-edit-clear img shadow-layer) - (gimp-selection-layer-alpha img text-layer) + (gimp-edit-clear sparkle-layer) + (gimp-edit-clear matte-layer) + (gimp-edit-clear shadow-layer) + (gimp-selection-layer-alpha text-layer) (set! selection (car (gimp-selection-save img))) (gimp-selection-feather img border) (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img sparkle-layer) + (gimp-edit-fill sparkle-layer) (plug-in-noisify 1 img sparkle-layer FALSE 0.2 0.2 0.2 0.0) (plug-in-c-astretch 1 img sparkle-layer) (gimp-selection-none img) (plug-in-sparkle 1 img sparkle-layer 0.03 0.45 (/ (min width height) 2) 6 15) - (gimp-levels img sparkle-layer 1 0 255 0.2 0 255) - (gimp-levels img sparkle-layer 2 0 255 0.7 0 255) - (gimp-selection-layer-alpha img sparkle-layer) + (gimp-levels sparkle-layer 1 0 255 0.2 0 255) + (gimp-levels sparkle-layer 2 0 255 0.7 0 255) + (gimp-selection-layer-alpha sparkle-layer) (gimp-palette-set-foreground '(0 0 0)) (gimp-brushes-set-brush "Circle Fuzzy (11)") - (gimp-edit-stroke img matte-layer) + (gimp-edit-stroke matte-layer) (gimp-selection-feather img border) - (gimp-edit-fill img shadow-layer) + (gimp-edit-fill shadow-layer) (gimp-selection-none img) (gimp-palette-set-background bg-color) - (gimp-edit-fill img bg-layer) + (gimp-edit-fill bg-layer) (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img text-layer) + (gimp-edit-fill text-layer) (gimp-image-add-layer-mask img text-layer text-layer-mask) - (gimp-selection-load img selection) + (gimp-selection-load selection) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img text-layer-mask) + (gimp-edit-fill text-layer-mask) (gimp-selection-feather img border) (gimp-selection-translate img (/ border 2) (/ border 2)) - (gimp-edit-fill img text-layer) + (gimp-edit-fill text-layer) (gimp-image-remove-layer-mask img text-layer 0) - (gimp-selection-load img selection) + (gimp-selection-load selection) (gimp-brushes-set-brush "Circle Fuzzy (07)") (gimp-brushes-set-paint-mode BEHIND) (gimp-palette-set-foreground '(186 241 255)) - (gimp-edit-stroke img text-layer) + (gimp-edit-stroke text-layer) (gimp-selection-none img) (gimp-image-remove-channel img selection) (gimp-palette-set-foreground old-fg) diff --git a/plug-ins/script-fu/scripts/fuzzyborder.scm b/plug-ins/script-fu/scripts/fuzzyborder.scm index d8cbc5a68d..b1e1f77fbf 100644 --- a/plug-ins/script-fu/scripts/fuzzyborder.scm +++ b/plug-ins/script-fu/scripts/fuzzyborder.scm @@ -23,14 +23,14 @@ ; Define the function: -(define (script-fu-fuzzy-border inImage - inLayer - inColor - inSize - inBlur - inGranu - inShadow - inShadWeight +(define (script-fu-fuzzy-border inImage + inLayer + inColor + inSize + inBlur + inGranu + inShadow + inShadWeight inCopy inFlatten ) @@ -40,94 +40,94 @@ (car (gimp-channel-ops-duplicate inImage)) inImage) ) - (if (> (car (gimp-drawable-type inLayer)) + (if (> (car (gimp-drawable-type inLayer)) 1 ) (gimp-convert-rgb theImage) ) - (set! theWidth (car (gimp-image-width inImage))) - (set! theHeight (car (gimp-image-height inImage))) + (set! theWidth (car (gimp-image-width inImage))) + (set! theHeight (car (gimp-image-height inImage))) - (set! theLayer (car (gimp-layer-new theImage - theWidth - theHeight - RGBA_IMAGE - "layer 1" - 100 + (set! theLayer (car (gimp-layer-new theImage + theWidth + theHeight + RGBA_IMAGE + "layer 1" + 100 NORMAL ) ) ) (gimp-image-add-layer theImage theLayer 0) - (gimp-edit-clear theImage theLayer) + (gimp-edit-clear theLayer) (chris-color-edge theImage theLayer inColor inSize) - (gimp-layer-scale theLayer - (/ theWidth inGranu) - (/ theHeight inGranu) + (gimp-layer-scale theLayer + (/ theWidth inGranu) + (/ theHeight inGranu) TRUE ) - (plug-in-spread TRUE - theImage - theLayer - (/ inSize inGranu) + (plug-in-spread TRUE + theImage + theLayer + (/ inSize inGranu) (/ inSize inGranu) ) (chris-color-edge theImage theLayer inColor 1) (gimp-layer-scale theLayer theWidth theHeight TRUE) - (gimp-selection-layer-alpha theImage theLayer) + (gimp-selection-layer-alpha theLayer) (gimp-selection-invert theImage) - (gimp-edit-clear theImage theLayer) + (gimp-edit-clear theLayer) (gimp-selection-invert theImage) - (gimp-edit-clear theImage theLayer) + (gimp-edit-clear theLayer) (gimp-palette-set-background inColor) - (gimp-edit-fill theImage theLayer) + (gimp-edit-fill theLayer) (gimp-selection-none inImage) (chris-color-edge theImage theLayer inColor 1) - (if (= inBlur TRUE) + (if (= inBlur TRUE) (plug-in-gauss-rle TRUE theImage theLayer inSize TRUE TRUE) () ) - (if (= inShadow FALSE) + (if (= inShadow FALSE) () - (begin + (begin (gimp-selection-none inImage) - (gimp-image-add-layer theImage - (car (gimp-layer-copy theLayer + (gimp-image-add-layer theImage + (car (gimp-layer-copy theLayer FALSE - )) + )) 0 ) (gimp-layer-scale theLayer (- theWidth inSize) (- theHeight inSize) TRUE) - (gimp-desaturate theImage theLayer) - (gimp-brightness-contrast theImage theLayer 127 127) - (gimp-invert theImage theLayer) - (gimp-layer-resize theLayer - theWidth - theHeight - (/ inSize 2) + (gimp-desaturate theLayer) + (gimp-brightness-contrast theLayer 127 127) + (gimp-invert theLayer) + (gimp-layer-resize theLayer + theWidth + theHeight + (/ inSize 2) (/ inSize 2) ) - (plug-in-gauss-rle TRUE - theImage - theLayer - (/ inSize 2) - TRUE + (plug-in-gauss-rle TRUE + theImage + theLayer + (/ inSize 2) + TRUE TRUE ) (gimp-layer-set-opacity theLayer inShadWeight) ) ) - (if (= inFlatten TRUE) + (if (= inFlatten TRUE) (gimp-image-flatten theImage) () ) - (if (= inCopy TRUE) - (begin (gimp-image-clean-all theImage) + (if (= inCopy TRUE) + (begin (gimp-image-clean-all theImage) (gimp-display-new theImage) ) () @@ -140,7 +140,7 @@ (gimp-selection-shrink inImage inSize) (gimp-selection-invert inImage) (gimp-palette-set-background inColor) - (gimp-edit-fill theImage theLayer) + (gimp-edit-fill theLayer) (gimp-selection-none inImage) ) diff --git a/plug-ins/script-fu/scripts/gimp-headers.scm b/plug-ins/script-fu/scripts/gimp-headers.scm index 4efb89acb9..d17644cb18 100644 --- a/plug-ins/script-fu/scripts/gimp-headers.scm +++ b/plug-ins/script-fu/scripts/gimp-headers.scm @@ -46,10 +46,10 @@ (gimp-image-add-layer img bg-layer 1) (gimp-layer-set-preserve-trans text-layer TRUE) (gimp-palette-set-background text-color) - (gimp-edit-fill img text-layer) + (gimp-edit-fill text-layer) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img bg-layer) + (gimp-edit-fill bg-layer) (let* ((highlight-layer (car (gimp-layer-copy text-layer TRUE))) (side-layer (car (gimp-layer-copy text-layer TRUE))) @@ -65,15 +65,15 @@ (gimp-layer-set-preserve-trans shadow-layer TRUE) (gimp-palette-set-background high-color) - (gimp-edit-fill img highlight-layer) + (gimp-edit-fill highlight-layer) (gimp-layer-translate highlight-layer -1 -1) (gimp-palette-set-background side-color) - (gimp-edit-fill img side-layer) + (gimp-edit-fill side-layer) (gimp-layer-translate side-layer 1 1) (gimp-palette-set-background shadow-color) - (gimp-edit-fill img shadow-layer) + (gimp-edit-fill shadow-layer) (gimp-layer-translate shadow-layer 5 5) (gimp-layer-set-preserve-trans shadow-layer FALSE) @@ -84,14 +84,14 @@ (set! text-layer (car (gimp-image-flatten img))) - (gimp-layer-add-alpha text-layer) + (gimp-layer-add-alpha text-layer) (if (= rm-bg TRUE) - (begin - (gimp-by-color-select img text-layer '(255 255 255) + (begin + (gimp-by-color-select text-layer '(255 255 255) 1 REPLACE TRUE FALSE 0 FALSE) - (gimp-edit-clear img text-layer) + (gimp-edit-clear text-layer) (gimp-selection-clear img))) (if (= crop TRUE) @@ -115,7 +115,7 @@ (script-fu-headers-gimp-org (string-append " " text) font "bold" "i" "normal" font-size text-color high-color side-color shadow-color - crop rm-bg index num-colors)) + crop rm-bg index num-colors)) (define (script-fu-small-header-gimp-org text font font-size text-color @@ -124,7 +124,7 @@ (script-fu-headers-gimp-org text font "medium" "r" "normal" font-size text-color high-color side-color shadow-color - crop rm-bg index num-colors)) + crop rm-bg index num-colors)) (script-fu-register "script-fu-big-header-gimp-org" diff --git a/plug-ins/script-fu/scripts/gimp-labels.scm b/plug-ins/script-fu/scripts/gimp-labels.scm index c4d406fda5..d3b0cfa314 100644 --- a/plug-ins/script-fu/scripts/gimp-labels.scm +++ b/plug-ins/script-fu/scripts/gimp-labels.scm @@ -50,23 +50,23 @@ (gimp-layer-set-preserve-trans shadow-layer TRUE) (gimp-palette-set-background text-color) - (gimp-edit-fill img text-layer) + (gimp-edit-fill text-layer) (gimp-palette-set-background bg-color) - (gimp-edit-fill img bg-layer) + (gimp-edit-fill bg-layer) (gimp-palette-set-background shadow-color) - (gimp-edit-fill img shadow-layer) + (gimp-edit-fill shadow-layer) (gimp-layer-translate shadow-layer 1 1) (set! text-layer (car (gimp-image-flatten img))) - (gimp-layer-add-alpha text-layer) + (gimp-layer-add-alpha text-layer) (if (= rm-bg TRUE) (begin - (gimp-by-color-select img text-layer bg-color + (gimp-by-color-select text-layer bg-color color-thresh REPLACE TRUE FALSE 0 FALSE) - (gimp-edit-clear img text-layer) + (gimp-edit-clear text-layer) (gimp-selection-clear img))) (if (= index TRUE) diff --git a/plug-ins/script-fu/scripts/glossy.scm b/plug-ins/script-fu/scripts/glossy.scm index 31ba36bbac..b24f36e1da 100644 --- a/plug-ins/script-fu/scripts/glossy.scm +++ b/plug-ins/script-fu/scripts/glossy.scm @@ -44,11 +44,11 @@ (gimp-palette-set-background bg-color) (gimp-selection-all img) - (gimp-bucket-fill img bg-layer BG-BUCKET-FILL NORMAL 100 0 FALSE 0 0) - (gimp-selection-none img) + (gimp-bucket-fill bg-layer BG-BUCKET-FILL NORMAL 100 0 FALSE 0 0) + (gimp-selection-none img) (gimp-palette-set-background old-bg) - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) ; if we are going to use transparent gradients for text, we will (maybe) need to uncomment this ; this clears black letters first so you don't end up with black where the transparent should be @@ -57,17 +57,17 @@ (if (= use-pattern-text TRUE) (begin (gimp-patterns-set-pattern pattern-text) - (gimp-bucket-fill img text-layer PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) + (gimp-bucket-fill text-layer PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) (gimp-patterns-set-pattern old-patterns))) (if (= use-pattern-text FALSE) (begin (gimp-gradients-set-active blend-gradient-text) - (gimp-blend img text-layer CUSTOM NORMAL LINEAR 100 0 REPEAT-NONE FALSE 0 0 0 0 0 (+ height 5)))) + (gimp-blend text-layer CUSTOM NORMAL LINEAR 100 0 REPEAT-NONE FALSE 0 0 0 0 0 (+ height 5)))) (gimp-selection-none img) - (gimp-selection-layer-alpha img grow-me) + (gimp-selection-layer-alpha grow-me) (gimp-selection-grow img grow-size) ; if we are going to use transparent gradients for outline, we will (maybe) need to uncomment this @@ -78,13 +78,13 @@ (if (= use-pattern-outline TRUE) (begin (gimp-patterns-set-pattern pattern-outline) - (gimp-bucket-fill img grow-me PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) + (gimp-bucket-fill grow-me PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) (gimp-patterns-set-pattern old-patterns))) (if (= use-pattern-outline FALSE) (begin (gimp-gradients-set-active blend-gradient-outline) - (gimp-blend img grow-me CUSTOM NORMAL LINEAR 100 0 REPEAT-NONE FALSE 0 0 0 0 0 (+ height 5)))) + (gimp-blend grow-me CUSTOM NORMAL LINEAR 100 0 REPEAT-NONE FALSE 0 0 0 0 0 (+ height 5)))) (gimp-selection-none img) @@ -93,15 +93,15 @@ (if (= use-pattern-overlay TRUE) (begin - (gimp-selection-layer-alpha img grow-me) + (gimp-selection-layer-alpha grow-me) (gimp-patterns-set-pattern pattern-overlay) - (gimp-bucket-fill img grow-me PATTERN-BUCKET-FILL OVERLAY 100 0 FALSE 0 0) + (gimp-bucket-fill grow-me PATTERN-BUCKET-FILL OVERLAY 100 0 FALSE 0 0) (gimp-patterns-set-pattern old-patterns) (gimp-selection-none img))) (if (= shadow-toggle TRUE) (begin - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) (set! dont-drop-me (car (script-fu-drop-shadow img text-layer s-offset-x s-offset-y 15 '(0 0 0) 80 TRUE))) (set! width (car (gimp-image-width img))) (set! height (car (gimp-image-height img))) diff --git a/plug-ins/script-fu/scripts/glowing-logo.scm b/plug-ins/script-fu/scripts/glowing-logo.scm index ff711748c0..07fb8f05ab 100644 --- a/plug-ins/script-fu/scripts/glowing-logo.scm +++ b/plug-ins/script-fu/scripts/glowing-logo.scm @@ -22,29 +22,29 @@ (gimp-selection-none img) (gimp-palette-set-background bg-color) - (gimp-edit-fill img bg-layer) + (gimp-edit-fill bg-layer) (gimp-layer-set-preserve-trans text-layer TRUE) (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img text-layer) + (gimp-edit-fill text-layer) - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) (gimp-selection-feather img feather1) (gimp-palette-set-background '(221 0 0)) - (gimp-edit-fill img glow-layer) - (gimp-edit-fill img glow-layer) - (gimp-edit-fill img glow-layer) + (gimp-edit-fill glow-layer) + (gimp-edit-fill glow-layer) + (gimp-edit-fill glow-layer) - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) (gimp-selection-feather img feather2) (gimp-palette-set-background '(232 217 18)) - (gimp-edit-fill img glow-layer) - (gimp-edit-fill img glow-layer) + (gimp-edit-fill glow-layer) + (gimp-edit-fill glow-layer) - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) (gimp-selection-feather img feather3) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img glow-layer) + (gimp-edit-fill glow-layer) (gimp-selection-none img) (gimp-layer-set-name text-layer text) diff --git a/plug-ins/script-fu/scripts/gradient-bevel-logo.scm b/plug-ins/script-fu/scripts/gradient-bevel-logo.scm index 9fb02c4544..8b38ffd01d 100644 --- a/plug-ins/script-fu/scripts/gradient-bevel-logo.scm +++ b/plug-ins/script-fu/scripts/gradient-bevel-logo.scm @@ -37,31 +37,31 @@ (gimp-image-add-layer img blur-layer 1) (gimp-selection-all img) - (gimp-edit-fill img bg-layer) + (gimp-edit-fill bg-layer) (gimp-selection-none img) (gimp-layer-set-preserve-trans blur-layer TRUE) (gimp-palette-set-background '(255 255 255)) (gimp-selection-all img) - (gimp-edit-fill img blur-layer) - (gimp-edit-clear img blur-layer) + (gimp-edit-fill blur-layer) + (gimp-edit-clear blur-layer) (gimp-selection-none img) (gimp-layer-set-preserve-trans blur-layer FALSE) - (gimp-selection-layer-alpha img text-layer) - (gimp-edit-fill img blur-layer) + (gimp-selection-layer-alpha text-layer) + (gimp-edit-fill blur-layer) (plug-in-gauss-rle 1 img blur-layer bevel-width 1 1) (gimp-selection-none img) (gimp-palette-set-background '(127 127 127)) (gimp-palette-set-foreground '(255 255 255)) (gimp-layer-set-preserve-trans text-layer TRUE) (gimp-selection-all img) - (gimp-blend img text-layer FG-BG-RGB NORMAL RADIAL 95 0 REPEAT-NONE FALSE 0 0 indentX indentY indentX (- height indentY)) + (gimp-blend text-layer FG-BG-RGB NORMAL RADIAL 95 0 REPEAT-NONE FALSE 0 0 indentX indentY indentX (- height indentY)) (gimp-selection-none img) (gimp-layer-set-preserve-trans text-layer FALSE) (gimp-layer-set-name text-layer text) (plug-in-bump-map 1 img text-layer blur-layer 115 bevel-height 5 0 0 0 15 TRUE FALSE 0) (gimp-layer-set-offsets blur-layer 5 5) - (gimp-invert img blur-layer) + (gimp-invert blur-layer) (gimp-layer-set-opacity blur-layer 50.0) (gimp-image-set-active-layer img text-layer) (gimp-palette-set-background old-bg) diff --git a/plug-ins/script-fu/scripts/gradient-example.scm b/plug-ins/script-fu/scripts/gradient-example.scm index 123f503c31..00074c93a1 100644 --- a/plug-ins/script-fu/scripts/gradient-example.scm +++ b/plug-ins/script-fu/scripts/gradient-example.scm @@ -44,7 +44,7 @@ ; Render gradient - (gimp-blend img drawable CUSTOM NORMAL LINEAR 100 0 REPEAT-NONE FALSE 0 0 0 0 (- width 1) 0) + (gimp-blend drawable CUSTOM NORMAL LINEAR 100 0 REPEAT-NONE FALSE 0 0 0 0 (- width 1) 0) ; Terminate diff --git a/plug-ins/script-fu/scripts/grid-system.scm b/plug-ins/script-fu/scripts/grid-system.scm index 90b5a85772..72b0c4f3db 100644 --- a/plug-ins/script-fu/scripts/grid-system.scm +++ b/plug-ins/script-fu/scripts/grid-system.scm @@ -47,7 +47,7 @@ (set! total-step-y (apply + y-divides)) ;(gimp-undo-push-group-start img) (set! grid-layer (car (gimp-layer-copy drw TRUE))) - (gimp-edit-clear img grid-layer) + (gimp-edit-clear grid-layer) (gimp-layer-set-name grid-layer "grid layer") (while (not (null? (cdr x-divides))) (set! stepped-x (+ stepped-x (car x-divides))) @@ -56,7 +56,7 @@ (update-segment! segment (+ drw-offset-x temp) drw-offset-y (+ drw-offset-x temp) (+ drw-offset-y drw-height)) - (gimp-pencil img grid-layer 4 segment)) + (gimp-pencil grid-layer 4 segment)) (while (not (null? (cdr y-divides))) (set! stepped-y (+ stepped-y (car y-divides))) (set! temp (* drw-height (/ stepped-y total-step-y))) @@ -64,14 +64,14 @@ (update-segment! segment drw-offset-x (+ drw-offset-y temp) (+ drw-offset-x drw-width) (+ drw-offset-y temp)) - (gimp-pencil img grid-layer 4 segment)) + (gimp-pencil grid-layer 4 segment)) (gimp-image-add-layer img grid-layer 0) ;(gimp-undo-push-group-end img) (set! script-fu-grid-system-x-divides (wrap-list x-divides-orig)) (set! script-fu-grid-system-y-divides (wrap-list y-divides-orig)) (gimp-displays-flush))) -(script-fu-register "script-fu-grid-system" +(script-fu-register "script-fu-grid-system" "/Script-Fu/Render/Make Grid System" "Draw grid as specified by X-DIVIDES (list of propotions relative to the drawable) and Y-DIVIDES. The color and width of grid is detemined by the current settings of brush." "Shuji Narazaki " diff --git a/plug-ins/script-fu/scripts/hsv-graph.scm b/plug-ins/script-fu/scripts/hsv-graph.scm index 69a7f2dc9c..159a6f2ef2 100644 --- a/plug-ins/script-fu/scripts/hsv-graph.scm +++ b/plug-ins/script-fu/scripts/hsv-graph.scm @@ -31,7 +31,7 @@ fvec) (define (plot-dot img drawable x y) - (gimp-pencil img drawable 1 (set-point! *pos* 0 x y))) + (gimp-pencil drawable 1 (set-point! *pos* 0 x y))) (define (rgb-to-hsv rgb hsv) (let* ((red (floor (nth 0 rgb))) @@ -96,7 +96,7 @@ (aset vec (+ (* 2 base) 1) (aref vec (+ (* 2 (- size (- offset base))) 1))) (set! base (+ base 1))) - (set-car! segment base))) + (set-car! segment base))) (let ((base (car segment)) (size (cadr segment)) (vec (caddr segment))) @@ -121,7 +121,7 @@ (define (draw-segment img drawable segment limit rgb) (gimp-palette-set-foreground rgb) - (gimp-airbrush img drawable 100 (* 2 limit) (segment-strokes segment))) + (gimp-airbrush drawable 100 (* 2 limit) (segment-strokes segment))) (define red-color '(255 10 10)) (define green-color '(10 255 10)) @@ -137,7 +137,7 @@ (define (fill-dot img drawable x y segment color) (if (fill-segment! segment x y) (begin - (gimp-palette-set-foreground color) + (gimp-palette-set-foreground color) (draw-segment img drawable segment (segment-max-size segment) color) #t) #f)) @@ -145,7 +145,7 @@ (define (fill-color-band img drawable x scale x-base y-base color) (gimp-palette-set-foreground color) (gimp-rect-select img (+ x-base (* scale x)) 0 scale y-base REPLACE FALSE 0) - (gimp-bucket-fill img drawable FG-BUCKET-FILL NORMAL 100 0 FALSE 0 0) + (gimp-bucket-fill drawable FG-BUCKET-FILL NORMAL 100 0 FALSE 0 0) (gimp-selection-none img)) (define (plot-hsv img drawable x scale x-base y-base hsv) @@ -208,10 +208,10 @@ (set! beg-x (clamp-value beg-x 0 (+ (nth 0 offsets) (gimp-drawable-width drawable)))) - (set! end-x (clamp-value end-x 0 + (set! end-x (clamp-value end-x 0 (+ (nth 0 offsets) (gimp-drawable-width drawable)))) - (set! beg-y (clamp-value beg-y 0 + (set! beg-y (clamp-value beg-y 0 (+ (nth 1 offsets) (gimp-drawable-height drawable)))) (set! end-y (clamp-value beg-y 0 @@ -253,14 +253,14 @@ (gimp-image-add-layer gimg bglayer -1) (gimp-selection-all gimg) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill gimg bglayer) + (gimp-edit-fill bglayer) (gimp-image-add-layer gimg hsv-layer -1) - (gimp-edit-clear gimg hsv-layer) + (gimp-edit-clear hsv-layer) (gimp-image-add-layer gimg rgb-layer -1) (gimp-layer-set-visible rgb-layer FALSE) - (gimp-edit-clear gimg rgb-layer) + (gimp-edit-clear rgb-layer) (gimp-image-add-layer gimg clayer -1) - (gimp-edit-clear gimg clayer) + (gimp-edit-clear clayer) (gimp-layer-translate clayer border-size 0) (gimp-selection-none gimg) (set! red-segment (make-segment 64 x-base y-base)) @@ -274,7 +274,7 @@ (gimp-brushes-set-opacity 70) (gimp-display-new gimg) (while (< index limit) - (set! rgb (car (gimp-color-picker img drawable + (set! rgb (car (gimp-color-picker drawable (+ beg-x (* x-len (/ index limit))) (+ beg-y (* y-len (/ index limit))) TRUE FALSE))) @@ -286,7 +286,7 @@ (mapcar (lambda (segment color) (if (< 1 (segment-filled-size segment)) - (begin + (begin (gimp-palette-set-foreground color) (draw-segment gimg hsv-layer segment (segment-filled-size segment) color)))) @@ -295,16 +295,16 @@ (mapcar (lambda (segment color) (if (< 1 (segment-filled-size segment)) - (begin + (begin (gimp-palette-set-foreground color) (draw-segment gimg rgb-layer segment (segment-filled-size segment) color)))) (list red-segment green-segment blue-segment) (list red-color green-color blue-color)) (gimp-palette-set-foreground '(255 255 255)) - (let ((text-layer (car (gimp-text gimg -1 0 0 + (let ((text-layer (car (gimp-text gimg -1 0 0 "Red: Hue, Green: Sat, Blue: Val" - 1 1 12 PIXELS "*" + 1 1 12 PIXELS "*" "helvetica" "*" "*" "*" "*"))) (offset-y (- y-base (car (gimp-drawable-height clayer))))) (gimp-layer-set-mode text-layer DIFFERENCE) diff --git a/plug-ins/script-fu/scripts/i26-gunya2.scm b/plug-ins/script-fu/scripts/i26-gunya2.scm index 870f82c6c7..ee145c1c2c 100644 --- a/plug-ins/script-fu/scripts/i26-gunya2.scm +++ b/plug-ins/script-fu/scripts/i26-gunya2.scm @@ -33,33 +33,33 @@ (gimp-image-add-layer img dist-frame-layer -1) (gimp-image-add-layer distortion-img distortion-layer -1) (gimp-selection-none img) - (gimp-edit-clear img dist-text-layer) - (gimp-edit-clear img dist-frame-layer) + (gimp-edit-clear dist-text-layer) + (gimp-edit-clear dist-frame-layer) ;; get the text shape - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) ;; fill it with the specified color (gimp-palette-set-background text-color) - (gimp-edit-fill img dist-text-layer) + (gimp-edit-fill dist-text-layer) ;; get the border shape (gimp-selection-border img frame-size) (gimp-palette-set-background frame-color) - (gimp-edit-fill img dist-frame-layer) + (gimp-edit-fill dist-frame-layer) (gimp-selection-none img) ;; now make the distortion data (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill distortion-img distortion-layer) + (gimp-edit-fill distortion-layer) (plug-in-noisify 1 distortion-img distortion-layer FALSE prob prob prob 0.0) (plug-in-gauss-rle 1 distortion-img distortion-layer radius 1 1) - (plug-in-c-astretch 1 distortion-img distortion-layer) + (plug-in-c-astretch 1 distortion-img distortion-layer) (plug-in-gauss-rle 1 distortion-img distortion-layer radius 1 1) ;; OK, apply it to dist-text-layer (plug-in-displace 1 img dist-text-layer radius radius 1 1 distortion-layer distortion-layer 0) ;; make the distortion data once again fro the frame - (gimp-edit-fill distortion-img distortion-layer) + (gimp-edit-fill distortion-layer) (plug-in-noisify 1 distortion-img distortion-layer FALSE prob prob prob 0.0) (plug-in-gauss-rle 1 distortion-img distortion-layer radius 1 1) - (plug-in-c-astretch 1 distortion-img distortion-layer) + (plug-in-c-astretch 1 distortion-img distortion-layer) (plug-in-gauss-rle 1 distortion-img distortion-layer radius 1 1) ;; then, apply it to dist-frame-layer (plug-in-displace 1 img dist-frame-layer radius radius 1 1 @@ -67,7 +67,7 @@ ;; Finally, clear the bottom layer (text-layer) (gimp-selection-all img) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img text-layer) + (gimp-edit-fill text-layer) ;; post processing (gimp-palette-set-foreground old-fg) (gimp-palette-set-background old-bg) diff --git a/plug-ins/script-fu/scripts/image-structure.scm b/plug-ins/script-fu/scripts/image-structure.scm index 5013fa250e..184b327364 100644 --- a/plug-ins/script-fu/scripts/image-structure.scm +++ b/plug-ins/script-fu/scripts/image-structure.scm @@ -41,7 +41,7 @@ (define (script-fu-show-image-structure img drawable new-image? space shear-length border apply-layer-mask? with-layer-name? with-pad? padding-color - padding-opacity with-background? + padding-opacity with-background? background-color) (if (eq? new-image? TRUE) (begin (set! img (car (gimp-channel-ops-duplicate img))) @@ -61,7 +61,7 @@ (gimp-image-resize img new-width new-height 0 0) (set! layers (cadr layers)) (gimp-selection-none img) - (while (< index num-of-layers) + (while (< index num-of-layers) (set! layer (aref layers index)) (if (equal? "Background" (car (gimp-layer-get-name layer))) (begin @@ -69,23 +69,23 @@ (gimp-layer-set-name layer "Original Background"))) (set! layer-names (cons (car (gimp-layer-get-name layer)) layer-names)) (if (not (= -1 (car (gimp-layer-mask layer)))) - (gimp-image-remove-layer-mask img layer + (gimp-image-remove-layer-mask img layer (if (= TRUE apply-layer-mask?) APPLY DISCARD))) (if (= TRUE with-pad?) (begin - (gimp-selection-layer-alpha img layer) + (gimp-selection-layer-alpha layer) (gimp-selection-invert img) (gimp-layer-set-preserve-trans layer FALSE) (gimp-palette-set-foreground padding-color) - (gimp-bucket-fill img layer FG-BUCKET-FILL NORMAL + (gimp-bucket-fill layer FG-BUCKET-FILL NORMAL padding-opacity 0 0 0 0) (gimp-selection-none img))) (gimp-layer-translate layer (+ border shear-length) (+ border (* space index))) - (gimp-shear img layer TRUE 0 (* (/ (car (gimp-drawable-height layer)) + (gimp-shear layer TRUE 0 (* (/ (car (gimp-drawable-height layer)) old-height) (* -2 shear-length))) (set! index (+ index 1))) @@ -96,7 +96,7 @@ "New Background" 100 NORMAL))) (gimp-image-add-layer img new-bg num-of-layers) (gimp-palette-set-background background-color) - (gimp-edit-fill img new-bg))) + (gimp-edit-fill new-bg))) (gimp-image-set-active-layer img (aref layers 0)) (if (= TRUE with-layer-name?) (let ((text-layer #f)) @@ -142,7 +142,7 @@ SF-VALUE "Space between layers" (number->string script-fu-show-image-structure-space) SF-VALUE "Shear length (> 0)" (number->string script-fu-show-image-structure-shear-length) SF-VALUE "Outer Border (>= 0)" (number->string script-fu-show-image-structure-border) - SF-TOGGLE "Apply layer mask (or discard)" script-fu-show-image-structure-apply-layer-mask? + SF-TOGGLE "Apply layer mask (or discard)" script-fu-show-image-structure-apply-layer-mask? SF-TOGGLE "Insert layer names" script-fu-show-image-structure-with-layer-name? SF-TOGGLE "Padding for transparent regions" script-fu-show-image-structure-with-pad? SF-COLOR "Pad Color" script-fu-show-image-structure-padding-color diff --git a/plug-ins/script-fu/scripts/land.scm b/plug-ins/script-fu/scripts/land.scm index 868b0ce37a..d3071df4dd 100644 --- a/plug-ins/script-fu/scripts/land.scm +++ b/plug-ins/script-fu/scripts/land.scm @@ -35,7 +35,7 @@ (img (car (gimp-image-new width height RGB))) (layer-one (car (gimp-layer-new img width height RGB "bottom" 100 NORMAL))) ) - (gimp-gradients-set-active gradient) + (gimp-gradients-set-active gradient) (gimp-image-disable-undo img) (gimp-image-add-layer img layer-one 0) @@ -49,7 +49,7 @@ - (gimp-by-color-select img layer-one '(190 190 190) 55 REPLACE FALSE FALSE 0 FALSE) + (gimp-by-color-select layer-one '(190 190 190) 55 REPLACE FALSE FALSE 0 FALSE) (plug-in-bump-map 1 img layer-two layer-one 135.0 35 landheight 0 0 0 0 TRUE FALSE 0) ;(plug-in-c-astretch 1 img layer-two) diff --git a/plug-ins/script-fu/scripts/lava.scm b/plug-ins/script-fu/scripts/lava.scm index 2670a72cfe..0065767b84 100644 --- a/plug-ins/script-fu/scripts/lava.scm +++ b/plug-ins/script-fu/scripts/lava.scm @@ -44,10 +44,10 @@ (if (= (car (gimp-selection-is-empty image)) TRUE) (begin - (gimp-selection-layer-alpha image drawable) + (gimp-selection-layer-alpha drawable) (set! active-selection (car (gimp-selection-save image))) (set! from-selection FALSE)) - (begin + (begin (set! from-selection TRUE) (set! active-selection (car (gimp-selection-save image))))) @@ -59,21 +59,21 @@ (if (= seperate-layer TRUE) (begin - (set! lava-layer (car (gimp-layer-new image - select-width - select-height - type - "Lava Layer" - 100 + (set! lava-layer (car (gimp-layer-new image + select-width + select-height + type + "Lava Layer" + 100 NORMAL))) (gimp-layer-set-offsets lava-layer select-offset-x select-offset-y) (gimp-image-add-layer image lava-layer -1) (gimp-selection-none image) - (gimp-edit-clear image lava-layer) + (gimp-edit-clear lava-layer) - (gimp-selection-load image active-selection) - (gimp-image-set-active-layer image lava-layer))) + (gimp-selection-load active-selection) + (gimp-image-set-active-layer image lava-layer))) (set! active-layer (car (gimp-image-get-active-layer image))) diff --git a/plug-ins/script-fu/scripts/line-nova.scm b/plug-ins/script-fu/scripts/line-nova.scm index dfbdb8feea..ea7c028789 100644 --- a/plug-ins/script-fu/scripts/line-nova.scm +++ b/plug-ins/script-fu/scripts/line-nova.scm @@ -41,14 +41,14 @@ (let ((dir1 (deg->rad (+ direction corn-deg))) (dir2 (deg->rad (- direction corn-deg)))) (define (aux dir index) - (set-point! index + (set-point! index (+ beg-x (* (cos dir) radius)) (+ beg-y (* (sin dir) radius)))) (aux dir1 1) (aux dir2 2))) (let ((dir0 (deg->rad direction)) (of (+ offset (- (modulo (rand) variation) variation/2)))) - (set-point! 0 + (set-point! 0 (+ beg-x (* of (cos dir0))) (+ beg-y (* of (sin dir0)))) (set-marginal-point beg-x beg-y direction) @@ -66,8 +66,8 @@ (+ (nth 1 drw-offsets) (/ drw-height 2)) (* index dir-deg/line)) (set! index (+ index 1))) - (gimp-bucket-fill img drw FG-BUCKET-FILL NORMAL 100 0 FALSE 0 0) - (gimp-selection-load img old-selection) + (gimp-bucket-fill drw FG-BUCKET-FILL NORMAL 100 0 FALSE 0 0) + (gimp-selection-load old-selection) ;; (gimp-image-set-active-layer img drw) ;; delete extra channel by Sven Neumann (gimp-image-remove-channel img old-selection) diff --git a/plug-ins/script-fu/scripts/mkbrush.scm b/plug-ins/script-fu/scripts/mkbrush.scm index 3f1b188d75..6fc6d01d18 100644 --- a/plug-ins/script-fu/scripts/mkbrush.scm +++ b/plug-ins/script-fu/scripts/mkbrush.scm @@ -32,17 +32,17 @@ ; construct variables - (data-dir (car (gimp-gimprc-query "gimp_dir"))) + (data-dir (car (gimp-gimprc-query "gimp_dir"))) (filename (string-append data-dir - "/brushes/r" - (number->string width) - "x" - (number->string height) + "/brushes/r" + (number->string width) + "x" + (number->string height) ".gbr") ) - (desc (string-append description " " - (number->string width) - "x" + (desc (string-append description " " + (number->string width) + "x" (number->string height) ) ) @@ -57,10 +57,10 @@ (gimp-palette-set-background '(255 255 255)) (gimp-rect-select img 0 0 width height REPLACE FALSE 0) - (gimp-edit-fill img drawable) + (gimp-edit-fill drawable) (file-gbr-save 1 img drawable filename "" spacing desc) - (gimp-brushes-refresh) + (gimp-brushes-refresh) (gimp-brushes-set-brush desc) ; Terminate, restoring old bg. @@ -72,7 +72,7 @@ (gimp-image-delete img) ) ) -) +) ; Register with the PDB @@ -103,19 +103,19 @@ (old-fg-color (car (gimp-palette-get-foreground))) (old-bg-color (car (gimp-palette-get-background))) - (data-dir (car (gimp-gimprc-query "gimp_dir"))) + (data-dir (car (gimp-gimprc-query "gimp_dir"))) (filename (string-append data-dir - "/brushes/r" - (number->string width) - "x" - (number->string height) + "/brushes/r" + (number->string width) + "x" + (number->string height) "f" (number->string feathering) ".gbr") ) - (desc (string-append description " " - (number->string width) - "x" + (desc (string-append description " " + (number->string width) + "x" (number->string height) "," (number->string feathering) @@ -130,15 +130,15 @@ (gimp-palette-set-background '(0 0 0)) (gimp-drawable-fill drawable BG-IMAGE-FILL) (gimp-palette-set-background '(255 255 255)) - (cond ((< 0 feathering) + (cond ((< 0 feathering) (gimp-rect-select img (/ feathering 2) (/ feathering 2) width height REPLACE TRUE feathering)) ((>= 0 feathering) (gimp-rect-select img 0 0 width height REPLACE FALSE 0)) ) - (gimp-edit-fill img drawable) + (gimp-edit-fill drawable) (file-gbr-save 1 img drawable filename "" 25 desc) - (gimp-brushes-refresh) + (gimp-brushes-refresh) (gimp-brushes-set-brush desc) ; Terminate, restoring old bg. @@ -150,7 +150,7 @@ (gimp-image-delete img) ) ) -) +) ; Register with the PDB @@ -165,7 +165,7 @@ SF-VALUE "Width" "20" SF-VALUE "Height" "20" SF-VALUE "Feathering" "4" - SF-VALUE "Spacing" "25" + SF-VALUE "Spacing" "25" ) (define (script-fu-make-brush-elliptical description width height spacing) @@ -183,14 +183,14 @@ (data-dir (car (gimp-gimprc-query "gimp_dir"))) (filename (string-append data-dir - "/brushes/e" - (number->string width) - "x" - (number->string height) + "/brushes/e" + (number->string width) + "x" + (number->string height) ".gbr")) - (desc (string-append description " " - (number->string width) - "x" + (desc (string-append description " " + (number->string width) + "x" (number->string height) ) ) @@ -206,10 +206,10 @@ (gimp-palette-set-background '(255 255 255)) (gimp-ellipse-select img 0 0 width height REPLACE TRUE FALSE 0) - (gimp-edit-fill img drawable) + (gimp-edit-fill drawable) (file-gbr-save 1 img drawable filename "" spacing desc) - (gimp-brushes-refresh) + (gimp-brushes-refresh) (gimp-brushes-set-brush desc) ; Terminate, restoring old bg. @@ -221,7 +221,7 @@ (gimp-image-delete img) ) ) -) +) ; Register with the PDB @@ -255,16 +255,16 @@ ; Construct variables... (data-dir (car (gimp-gimprc-query "gimp_dir"))) (filename (string-append data-dir - "/brushes/e" - (number->string width) - "x" - (number->string height) + "/brushes/e" + (number->string width) + "x" + (number->string height) "f" (number->string feathering) ".gbr")) - (desc (string-append description " " - (number->string width) - "x" + (desc (string-append description " " + (number->string width) + "x" (number->string height) " f" (number->string feathering) @@ -283,13 +283,13 @@ (gimp-palette-set-background '(255 255 255)) (cond ((> feathering 0) ; keep from taking out gimp with stupid entry. (gimp-ellipse-select img (/ feathering 2) (/ feathering 2) width height REPLACE TRUE TRUE feathering)) - ((<= feathering 0) - (gimp-ellipse-select img 0 0 width height REPLACE TRUE FALSE 0)) + ((<= feathering 0) + (gimp-ellipse-select img 0 0 width height REPLACE TRUE FALSE 0)) ) - (gimp-edit-fill img drawable) + (gimp-edit-fill drawable) (file-gbr-save 1 img drawable filename "" spacing desc) - (gimp-brushes-refresh) + (gimp-brushes-refresh) (gimp-brushes-set-brush desc) ; Terminate, restoring old bg. @@ -301,7 +301,7 @@ (gimp-image-delete img) ) ) -) +) ; Register with the PDB diff --git a/plug-ins/script-fu/scripts/neon-logo.scm b/plug-ins/script-fu/scripts/neon-logo.scm index ed0c082253..1ca36239d8 100644 --- a/plug-ins/script-fu/scripts/neon-logo.scm +++ b/plug-ins/script-fu/scripts/neon-logo.scm @@ -77,70 +77,70 @@ (if (not (= shadow 0)) (begin (gimp-image-add-layer img shadow-layer 1) - (gimp-edit-clear img shadow-layer))) + (gimp-edit-clear shadow-layer))) (gimp-image-add-layer img glow-layer 1) (gimp-palette-set-background '(0 0 0)) - (gimp-selection-layer-alpha img tube-layer) + (gimp-selection-layer-alpha tube-layer) (set! selection (car (gimp-selection-save img))) (gimp-selection-none img) - (gimp-edit-clear img glow-layer) - (gimp-edit-fill img tube-layer) + (gimp-edit-clear glow-layer) + (gimp-edit-fill tube-layer) (gimp-palette-set-background bg-color) - (gimp-edit-fill img bg-layer) + (gimp-edit-fill bg-layer) - (gimp-selection-load img selection) + (gimp-selection-load selection) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img tube-layer) + (gimp-edit-fill tube-layer) (gimp-selection-shrink img shrink) (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img selection) - (gimp-edit-fill img tube-layer) + (gimp-edit-fill selection) + (gimp-edit-fill tube-layer) (gimp-selection-none img) (if (not (= feather1 0)) (plug-in-gauss-rle 1 img tube-layer feather1 TRUE TRUE)) - (gimp-selection-load img selection) + (gimp-selection-load selection) (if (not (= feather2 0)) (plug-in-gauss-rle 1 img tube-layer feather2 TRUE TRUE)) - (gimp-brightness-contrast img tube-layer -10 15) + (gimp-brightness-contrast tube-layer -10 15) (gimp-selection-none img) - (gimp-hue-saturation img tube-layer 0 tube-hue -15 70) + (gimp-hue-saturation tube-layer 0 tube-hue -15 70) - (gimp-selection-load img selection) + (gimp-selection-load selection) (gimp-selection-feather img inc-shrink) (gimp-selection-shrink img inc-shrink) - (gimp-curves-spline img tube-layer 0 6 (neon-spline1)) + (gimp-curves-spline tube-layer 0 6 (neon-spline1)) - (gimp-selection-load img selection) + (gimp-selection-load selection) (gimp-selection-feather img inc-shrink) (gimp-selection-shrink img (* inc-shrink 2)) - (gimp-curves-spline img tube-layer 0 6 (neon-spline2)) + (gimp-curves-spline tube-layer 0 6 (neon-spline2)) - (gimp-selection-load img selection) + (gimp-selection-load selection) (gimp-selection-feather img inc-shrink) (gimp-selection-shrink img (* inc-shrink 3)) - (gimp-curves-spline img tube-layer 0 6 (neon-spline3)) + (gimp-curves-spline tube-layer 0 6 (neon-spline3)) - (gimp-selection-load img selection) + (gimp-selection-load selection) (gimp-selection-grow img grow) (gimp-selection-invert img) - (gimp-edit-clear img tube-layer) + (gimp-edit-clear tube-layer) (gimp-selection-invert img) (gimp-selection-feather img feather) (gimp-palette-set-background glow-color) - (gimp-edit-fill img glow-layer) + (gimp-edit-fill glow-layer) (if (not (= shadow 0)) (begin - (gimp-selection-layer-alpha img tube-layer) + (gimp-selection-layer-alpha tube-layer) (gimp-selection-shrink img shadow-shrink) (gimp-selection-feather img shadow-feather) (gimp-selection-translate img shadow-offx shadow-offy) (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img shadow-layer))) + (gimp-edit-fill shadow-layer))) (gimp-selection-none img) (gimp-layer-set-name tube-layer "Neon Tubes") diff --git a/plug-ins/script-fu/scripts/news-text.scm b/plug-ins/script-fu/scripts/news-text.scm index 71db27c57b..bb6ec5700c 100644 --- a/plug-ins/script-fu/scripts/news-text.scm +++ b/plug-ins/script-fu/scripts/news-text.scm @@ -34,17 +34,17 @@ (gimp-image-add-layer img bg-layer 1) (gimp-image-add-layer img text-layer -1) - (gimp-edit-clear img bg-layer) - (gimp-edit-clear img text-layer) + (gimp-edit-clear bg-layer) + (gimp-edit-clear text-layer) (gimp-floating-sel-anchor (car (gimp-text-fontname img text-layer 10 10 string 0 TRUE font-size PIXELS font))) (set! text-mask (car (gimp-layer-create-mask text-layer ALPHA-MASK))) (gimp-image-add-layer-mask img text-layer text-mask) - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) (gimp-palette-set-background (list grey grey grey)) - (gimp-edit-fill img text-mask) + (gimp-edit-fill text-mask) (plug-in-newsprint 1 img text-mask cell-size 0 0 45.0 3 45.0 0 45.0 0 45.0 0 3) diff --git a/plug-ins/script-fu/scripts/old-photo.scm b/plug-ins/script-fu/scripts/old-photo.scm index 67dea439ff..4c20187450 100644 --- a/plug-ins/script-fu/scripts/old-photo.scm +++ b/plug-ins/script-fu/scripts/old-photo.scm @@ -41,9 +41,9 @@ (set! theLayer (car(gimp-image-flatten theImage))) (if (= inSepia TRUE) - (begin (gimp-desaturate theImage theLayer) - (gimp-brightness-contrast theImage theLayer -20 -40) - (gimp-color-balance theImage theLayer 0 TRUE 30 0 -30) + (begin (gimp-desaturate theLayer) + (gimp-brightness-contrast theLayer -20 -40) + (gimp-color-balance theLayer 0 TRUE 30 0 -30) ) () ) @@ -54,7 +54,7 @@ (gimp-image-add-layer theImage mLayer 0) (gimp-selection-all theImage) - (gimp-edit-clear theImage mLayer) + (gimp-edit-clear mLayer) (gimp-selection-none theImage) (plug-in-noisify TRUE theImage mLayer TRUE 0 0 0 0.5) (plug-in-gauss-rle TRUE theImage mLayer 5 TRUE TRUE) @@ -69,7 +69,7 @@ (begin (gimp-image-clean-all theImage) (gimp-display-new theImage) ) - () + () ) (gimp-selection-none inImage) (gimp-displays-flush theImage) diff --git a/plug-ins/script-fu/scripts/old_photo.scm b/plug-ins/script-fu/scripts/old_photo.scm index 67dea439ff..4c20187450 100644 --- a/plug-ins/script-fu/scripts/old_photo.scm +++ b/plug-ins/script-fu/scripts/old_photo.scm @@ -41,9 +41,9 @@ (set! theLayer (car(gimp-image-flatten theImage))) (if (= inSepia TRUE) - (begin (gimp-desaturate theImage theLayer) - (gimp-brightness-contrast theImage theLayer -20 -40) - (gimp-color-balance theImage theLayer 0 TRUE 30 0 -30) + (begin (gimp-desaturate theLayer) + (gimp-brightness-contrast theLayer -20 -40) + (gimp-color-balance theLayer 0 TRUE 30 0 -30) ) () ) @@ -54,7 +54,7 @@ (gimp-image-add-layer theImage mLayer 0) (gimp-selection-all theImage) - (gimp-edit-clear theImage mLayer) + (gimp-edit-clear mLayer) (gimp-selection-none theImage) (plug-in-noisify TRUE theImage mLayer TRUE 0 0 0 0.5) (plug-in-gauss-rle TRUE theImage mLayer 5 TRUE TRUE) @@ -69,7 +69,7 @@ (begin (gimp-image-clean-all theImage) (gimp-display-new theImage) ) - () + () ) (gimp-selection-none inImage) (gimp-displays-flush theImage) diff --git a/plug-ins/script-fu/scripts/perspective-shadow.scm b/plug-ins/script-fu/scripts/perspective-shadow.scm index cd66210a5b..8e25c4a2b7 100644 --- a/plug-ins/script-fu/scripts/perspective-shadow.scm +++ b/plug-ins/script-fu/scripts/perspective-shadow.scm @@ -31,7 +31,7 @@ ; as a layer below the active layer ; -(define (script-fu-perspective-shadow image +(define (script-fu-perspective-shadow image drawable alpha rel-distance @@ -55,15 +55,15 @@ (shadow-layer 0)) - (if (= rel-distance 0) (set! rel-distance 999999)) + (if (= rel-distance 0) (set! rel-distance 999999)) (gimp-image-disable-undo image) (gimp-layer-add-alpha drawable) (if (= (car (gimp-selection-is-empty image)) TRUE) (begin - (gimp-selection-layer-alpha image drawable) + (gimp-selection-layer-alpha drawable) (set! from-selection FALSE)) - (begin + (begin (set! from-selection TRUE) (set! active-selection (car (gimp-selection-save image))))) @@ -75,8 +75,8 @@ (abs-length (* rel-length select-height)) (abs-distance (* rel-distance select-height)) - (half-bottom-width (/ select-width 2)) - (half-top-width (* half-bottom-width + (half-bottom-width (/ select-width 2)) + (half-top-width (* half-bottom-width (/ (- rel-distance rel-length) rel-distance))) (x0 (+ select-offset-x (+ (- half-bottom-width half-top-width) @@ -96,17 +96,17 @@ (shadow-offset-y (- (min y0 y2) shadow-blur))) - (set! shadow-layer (car (gimp-layer-new image - select-width - select-height + (set! shadow-layer (car (gimp-layer-new image + select-width + select-height type - "Perspective Shadow" + "Perspective Shadow" shadow-opacity NORMAL))) (gimp-layer-set-offsets shadow-layer select-offset-x select-offset-y) (gimp-drawable-fill shadow-layer TRANS-IMAGE-FILL) (gimp-palette-set-background shadow-color) - (gimp-edit-fill image shadow-layer) + (gimp-edit-fill shadow-layer) (gimp-selection-none image) (if (= allow-resize TRUE) @@ -131,43 +131,42 @@ (if (> (+ shadow-height shadow-offset-y) new-image-height) (set! new-image-height (+ shadow-height shadow-offset-y))) (gimp-image-resize image - new-image-width - new-image-height - image-offset-x + new-image-width + new-image-height + image-offset-x image-offset-y))) (gimp-image-add-layer image shadow-layer -1) - (gimp-perspective image - shadow-layer + (gimp-perspective shadow-layer interpolate x0 y0 x1 y1 x2 y2 x3 y3) - (if (> shadow-blur 0) + (if (> shadow-blur 0) (begin (gimp-layer-set-preserve-trans shadow-layer FALSE) - (gimp-layer-resize shadow-layer + (gimp-layer-resize shadow-layer shadow-width shadow-height shadow-blur shadow-blur) - (plug-in-gauss-rle 1 - image - shadow-layer - shadow-blur - TRUE + (plug-in-gauss-rle 1 + image + shadow-layer + shadow-blur + TRUE TRUE)))) (if (= from-selection TRUE) (begin - (gimp-selection-load image active-selection) - (gimp-edit-clear image shadow-layer) + (gimp-selection-load active-selection) + (gimp-edit-clear shadow-layer) (gimp-image-remove-channel image active-selection))) - (if (and + (if (and (= (car (gimp-layer-is-floating-sel drawable)) 0) (= from-selection FALSE)) (gimp-image-raise-layer image drawable)) @@ -177,7 +176,7 @@ (gimp-image-enable-undo image) (gimp-displays-flush))) -(script-fu-register "script-fu-perspective-shadow" +(script-fu-register "script-fu-perspective-shadow" "/Script-Fu/Shadow/Perspective" "Add a perspective shadow" "Sven Neumann (neumanns@uni-duesseldorf.de)" @@ -193,4 +192,4 @@ SF-COLOR "Color" '(0 0 0) SF-ADJUSTMENT "Opacity" '(80 0 100 1 10 0 0) SF-TOGGLE "Interpolate?" TRUE - SF-TOGGLE "Allow Resizing?" FALSE) + SF-TOGGLE "Allow Resizing?" FALSE) diff --git a/plug-ins/script-fu/scripts/predator.scm b/plug-ins/script-fu/scripts/predator.scm index 72cb2b6170..d2f0547540 100644 --- a/plug-ins/script-fu/scripts/predator.scm +++ b/plug-ins/script-fu/scripts/predator.scm @@ -43,10 +43,10 @@ (if (= (car (gimp-selection-is-empty image)) TRUE) (begin - (gimp-selection-layer-alpha image drawable) + (gimp-selection-layer-alpha drawable) (set! active-selection (car (gimp-selection-save image))) (set! from-selection FALSE)) - (begin + (begin (set! from-selection TRUE) (set! active-selection (car (gimp-selection-save image))))) @@ -59,22 +59,22 @@ (if (= seperate-layer TRUE) (begin - (set! effect-layer (car (gimp-layer-new image - select-width - select-height - type - "glow layer" - 100 + (set! effect-layer (car (gimp-layer-new image + select-width + select-height + type + "glow layer" + 100 NORMAL))) (gimp-layer-set-offsets effect-layer select-offset-x select-offset-y) (gimp-image-add-layer image effect-layer -1) (gimp-selection-none image) - (gimp-edit-clear image effect-layer) + (gimp-edit-clear effect-layer) - (gimp-selection-load image active-selection) - (gimp-edit-copy image drawable) - (let ((floating-sel (car (gimp-edit-paste image effect-layer FALSE)))) + (gimp-selection-load active-selection) + (gimp-edit-copy drawable) + (let ((floating-sel (car (gimp-edit-paste effect-layer FALSE)))) (gimp-floating-sel-anchor floating-sel) ) (gimp-image-set-active-layer image effect-layer ))) @@ -87,7 +87,7 @@ (plug-in-edge 1 image active-layer edge-amount 1) ; clean up the selection copy - (gimp-selection-load image active-selection) + (gimp-selection-load active-selection) (gimp-gradients-set-active old-gradient) (gimp-palette-set-background old-bg) diff --git a/plug-ins/script-fu/scripts/pupi-button.scm b/plug-ins/script-fu/scripts/pupi-button.scm index 1c38ba003a..6a0cb33864 100644 --- a/plug-ins/script-fu/scripts/pupi-button.scm +++ b/plug-ins/script-fu/scripts/pupi-button.scm @@ -34,7 +34,7 @@ (define (round-select img x y width height ratio) (let* ((diameter (* ratio height))) (gimp-ellipse-select img x y diameter height ADD FALSE 0 0) - (gimp-ellipse-select img (+ x (- width diameter)) y + (gimp-ellipse-select img (+ x (- width diameter)) y diameter height ADD FALSE 0 0) (gimp-rect-select img (+ x (/ diameter 2)) y (- width diameter) height ADD FALSE 0))) @@ -62,15 +62,15 @@ pressed) (cond ((eqv? notpressed TRUE) - (do-pupibutton text size foundry family weight slant - set-width spacing ul-color lr-color + (do-pupibutton text size foundry family weight slant + set-width spacing ul-color lr-color text-color xpadding ypadding bevel ratio 0))) (cond ((eqv? notpressed-active TRUE) - (do-pupibutton text size foundry family weight slant + (do-pupibutton text size foundry family weight slant set-width spacing ul-color-high lr-color-high hlight-color xpadding ypadding bevel ratio 0))) (cond ((eqv? pressed TRUE) - (do-pupibutton text size foundry family weight slant + (do-pupibutton text size foundry family weight slant set-width spacing ul-color-high lr-color-high hlight-color xpadding ypadding bevel ratio 1)))) @@ -125,9 +125,9 @@ (img (car (gimp-image-new width height RGB))) - (bumpmap (car (gimp-layer-new img width height + (bumpmap (car (gimp-layer-new img width height RGBA_IMAGE "Bumpmap" 100 NORMAL))) - (gradient (car (gimp-layer-new img width height + (gradient (car (gimp-layer-new img width height RGBA_IMAGE "Button" 100 NORMAL)))) (gimp-image-disable-undo img) @@ -136,12 +136,12 @@ (gimp-image-add-layer img bumpmap -1) (gimp-selection-none img) (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img bumpmap) + (gimp-edit-fill bumpmap) - (round-select img (/ bevel 2) (/ bevel 2) + (round-select img (/ bevel 2) (/ bevel 2) (- width bevel) (- height bevel) ratio) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img bumpmap) + (gimp-edit-fill bumpmap) (gimp-selection-none img) (plug-in-gauss-rle 1 img bumpmap bevel 1 1) @@ -149,13 +149,12 @@ ; Create gradient layer (gimp-image-add-layer img gradient -1) - (gimp-edit-clear img gradient) + (gimp-edit-clear gradient) (round-select img 0 0 width height ratio) (gimp-palette-set-foreground ul-color) (gimp-palette-set-background lr-color) - (gimp-blend img - gradient + (gimp-blend gradient FG-BG-RGB NORMAL LINEAR @@ -172,7 +171,7 @@ (gimp-selection-none img) - (plug-in-bump-map 1 img gradient bumpmap + (plug-in-bump-map 1 img gradient bumpmap 135 45 bevel 0 0 0 0 TRUE pressed 0) ; Create text layer @@ -181,7 +180,7 @@ (gimp-palette-set-foreground text-color) (let ((textl (car (gimp-text - img -1 0 0 text 0 TRUE size PIXELS + img -1 0 0 text 0 TRUE size PIXELS foundry family weight slant set-width spacing)))) (gimp-layer-set-offsets textl (+ xpadding radius bevel) @@ -192,7 +191,7 @@ (gimp-selection-none img) (round-select img 1 1 (- width 1) (- height 1) ratio) (gimp-selection-invert img) - (gimp-edit-clear img gradient) + (gimp-edit-clear gradient) ; Done diff --git a/plug-ins/script-fu/scripts/rendermap.scm b/plug-ins/script-fu/scripts/rendermap.scm index c3432785f0..ab6b20f573 100644 --- a/plug-ins/script-fu/scripts/rendermap.scm +++ b/plug-ins/script-fu/scripts/rendermap.scm @@ -19,7 +19,7 @@ ; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -(define (script-fu-render-map inSize inGrain inGrad inWiden) +(define (script-fu-render-map inSize inGrain inGrad inWiden) (set! theWidth inSize) @@ -42,7 +42,7 @@ (gimp-palette-set-foreground '(0 0 0)) (let ((theMask (car(gimp-layer-create-mask thinLayer 0)))) (gimp-image-add-layer-mask theImage thinLayer theMask) - (gimp-blend theImage theMask FG-BG-RGB NORMAL LINEAR 100 + (gimp-blend theMask FG-BG-RGB NORMAL LINEAR 100 0 REPEAT-TRIANGULAR FALSE 0 0 0 0 0 (/ theHeight 2) ) ) (set! theLayer (car(gimp-image-flatten theImage))) @@ -66,7 +66,7 @@ "28th April 1998" "Chris Gutteridge / ECS @ University of Southampton, England" "" - SF-ADJUSTMENT "Image Size" '(256 0 2048 1 10 0 0) + SF-ADJUSTMENT "Image Size" '(256 0 2048 1 10 0 0) SF-ADJUSTMENT "Granularity (0 - 15)" '(4 0 15 1 1 0 0) SF-GRADIENT "Gradient" "Land_and_Sea" SF-TOGGLE "TRUE = Detail in middle, FALSE = tile" FALSE diff --git a/plug-ins/script-fu/scripts/ripply-anim.scm b/plug-ins/script-fu/scripts/ripply-anim.scm index 6ef267de82..e7b2340852 100644 --- a/plug-ins/script-fu/scripts/ripply-anim.scm +++ b/plug-ins/script-fu/scripts/ripply-anim.scm @@ -8,12 +8,12 @@ (define (copy-layer-ripple dest-image dest-drawable source-image source-drawable) (gimp-selection-all dest-image) - (gimp-edit-clear dest-image dest-drawable) + (gimp-edit-clear dest-drawable) (gimp-selection-none dest-image) (gimp-selection-all source-image) - (gimp-edit-copy source-image source-drawable) + (gimp-edit-copy source-drawable) (gimp-selection-none source-image) - (let ((floating-sel (car (gimp-edit-paste dest-image dest-drawable FALSE)))) + (let ((floating-sel (car (gimp-edit-paste dest-drawable FALSE)))) (gimp-floating-sel-anchor floating-sel))) (define (script-fu-ripply-anim img drawable displacement num-frames) @@ -27,7 +27,7 @@ (gimp-image-disable-undo ripple-image) (gimp-palette-set-background '(127 127 127) ) (gimp-image-add-layer ripple-image ripple-layer 0) - (gimp-edit-fill ripple-image ripple-layer) + (gimp-edit-fill ripple-layer) (plug-in-noisify 1 ripple-image ripple-layer FALSE 1.0 1.0 1.0 0.0) ; tile noise (set! rippletiled-ret (plug-in-tile 1 ripple-image ripple-layer (* width 3) (* height 3) TRUE)) @@ -40,9 +40,9 @@ ; process tiled noise into usable displacement map (plug-in-gauss-iir 1 rippletiled-image rippletiled-layer 35 TRUE TRUE) - (gimp-equalize rippletiled-image rippletiled-layer TRUE) + (gimp-equalize rippletiled-layer TRUE) (plug-in-gauss-rle 1 rippletiled-image rippletiled-layer 5 TRUE TRUE) - (gimp-equalize rippletiled-image rippletiled-layer TRUE) + (gimp-equalize rippletiled-layer TRUE) ; displacement map is now in rippletiled-layer of rippletiled-image @@ -63,18 +63,18 @@ (gimp-image-disable-undo dup-image) (gimp-crop dup-image width height xpos ypos) - (set! layer-name (string-append "Frame " - (number->string (- num-frames remaining-frames) 10))) - (set! this-layer (car (gimp-layer-new out-imagestack - width height RGB + (set! layer-name (string-append "Frame " + (number->string (- num-frames remaining-frames) 10))) + (set! this-layer (car (gimp-layer-new out-imagestack + width height RGB layer-name 100 NORMAL))) (gimp-image-add-layer out-imagestack this-layer 0) (copy-layer-ripple out-imagestack this-layer img drawable) (set! dup-layer (car (gimp-image-get-active-layer dup-image))) - (plug-in-displace 1 out-imagestack this-layer - displacement displacement + (plug-in-displace 1 out-imagestack this-layer + displacement displacement TRUE TRUE dup-layer dup-layer 2) (gimp-image-enable-undo dup-image) diff --git a/plug-ins/script-fu/scripts/round-corners.scm b/plug-ins/script-fu/scripts/round-corners.scm index bbf2bad2e6..78bc5fde54 100644 --- a/plug-ins/script-fu/scripts/round-corners.scm +++ b/plug-ins/script-fu/scripts/round-corners.scm @@ -39,12 +39,12 @@ (define (script-fu-round-corners img - drawable + drawable radius shadow-toggle - shadow-x - shadow-y - shadow-blur + shadow-x + shadow-y + shadow-blur background-toggle work-on-copy) (let* ((shadow-blur (abs shadow-blur)) @@ -53,9 +53,9 @@ (width (car (gimp-image-width img))) (height (car (gimp-image-height img))) (type (car (gimp-drawable-type-with-alpha drawable))) - (image (cond ((= work-on-copy TRUE) + (image (cond ((= work-on-copy TRUE) (car (gimp-channel-ops-duplicate img))) - ((= work-on-copy FALSE) + ((= work-on-copy FALSE) img))) (pic-layer (car (gimp-image-active-drawable image)))) @@ -72,36 +72,36 @@ (gimp-ellipse-select image (- width diam) 0 diam diam SUB TRUE 0 0) (gimp-rect-select image 0 (- height radius) radius radius ADD 0 0) (gimp-ellipse-select image 0 (- height diam) diam diam SUB TRUE 0 0) - (gimp-rect-select image (- width radius) (- height radius) + (gimp-rect-select image (- width radius) (- height radius) radius radius ADD 0 0) - (gimp-ellipse-select image (- width diam) (- height diam) + (gimp-ellipse-select image (- width diam) (- height diam) diam diam SUB TRUE 0 0) - (gimp-edit-clear image pic-layer) + (gimp-edit-clear pic-layer) (gimp-selection-none image) ; optionally add a shadow (if (= shadow-toggle TRUE) (begin - (script-fu-drop-shadow image - pic-layer - shadow-x + (script-fu-drop-shadow image + pic-layer + shadow-x shadow-y shadow-blur '(0 0 0) 80 - TRUE) + TRUE) (set! width (car (gimp-image-width image))) (set! height (car (gimp-image-height image))))) ; optionally add a background (if (= background-toggle TRUE) - (let* ((bg-layer (car (gimp-layer-new image - width - height - type - "Background" - 100 - NORMAL)))) + (let* ((bg-layer (car (gimp-layer-new image + width + height + type + "Background" + 100 + NORMAL)))) (gimp-drawable-fill bg-layer BG-IMAGE-FILL) (gimp-image-add-layer image bg-layer -1) (gimp-image-raise-layer image pic-layer) @@ -110,8 +110,8 @@ ; clean up after the script (gimp-image-enable-undo image) - (if (= work-on-copy TRUE) - (gimp-display-new image)) + (if (= work-on-copy TRUE) + (gimp-display-new image)) (gimp-displays-flush))) (script-fu-register "script-fu-round-corners" @@ -129,7 +129,7 @@ SF-VALUE "Shadow y" "8" SF-VALUE "Blur Radius" "15" SF-TOGGLE "Add background" TRUE - SF-TOGGLE "Work on copy" TRUE) + SF-TOGGLE "Work on copy" TRUE) diff --git a/plug-ins/script-fu/scripts/select-to-brush.scm b/plug-ins/script-fu/scripts/select-to-brush.scm index c9079ab5fd..36c06432ed 100644 --- a/plug-ins/script-fu/scripts/select-to-brush.scm +++ b/plug-ins/script-fu/scripts/select-to-brush.scm @@ -40,20 +40,20 @@ (set! select-offset-x (cadr selection-bounds)) (set! select-offset-y (caddr selection-bounds)) (set! selection-width (- (cadr (cddr selection-bounds)) select-offset-x)) - (set! selection-height (- (caddr (cddr selection-bounds)) select-offset-y)) + (set! selection-height (- (caddr (cddr selection-bounds)) select-offset-y)) (gimp-image-disable-undo image) (if (= (car (gimp-selection-is-empty image)) TRUE) (begin - (gimp-selection-layer-alpha image drawable) + (gimp-selection-layer-alpha drawable) (set! active-selection (car (gimp-selection-save image))) (set! from-selection FALSE)) - (begin + (begin (set! from-selection TRUE) (set! active-selection (car (gimp-selection-save image))))) - (gimp-edit-copy image drawable) + (gimp-edit-copy drawable) (set! brush-image (car (gimp-image-new selection-width selection-height 1))) (set! brush-draw (car (gimp-layer-new brush-image selection-width selection-height GRAY_IMAGE "Sloth" 100 NORMAL))) @@ -63,18 +63,18 @@ (gimp-palette-set-background '(255 255 255)) (gimp-drawable-fill brush-draw BG-IMAGE-FILL) - (let ((floating-sel (car (gimp-edit-paste brush-image brush-draw FALSE)))) + (let ((floating-sel (car (gimp-edit-paste brush-draw FALSE)))) (gimp-floating-sel-anchor floating-sel) ) (set! data-dir (car (gimp-gimprc-query "gimp_dir"))) (set! filename2 (string-append data-dir - "/brushes/" - filename + "/brushes/" + filename (number->string image) ".gbr")) - (gimp-invert brush-image brush-draw) + (gimp-invert brush-draw) (file-gbr-save 1 brush-image brush-draw filename2 "" spacing desc) (gimp-brushes-refresh) ; My own modification! You'll need my diff. (gimp-brushes-set-brush desc) diff --git a/plug-ins/script-fu/scripts/select-to-image.scm b/plug-ins/script-fu/scripts/select-to-image.scm index 95d6b0f929..b3c4f17a7f 100644 --- a/plug-ins/script-fu/scripts/select-to-image.scm +++ b/plug-ins/script-fu/scripts/select-to-image.scm @@ -33,27 +33,27 @@ (set! select-offset-x (cadr selection-bounds)) (set! select-offset-y (caddr selection-bounds)) (set! selection-width (- (cadr (cddr selection-bounds)) select-offset-x)) - (set! selection-height (- (caddr (cddr selection-bounds)) select-offset-y)) + (set! selection-height (- (caddr (cddr selection-bounds)) select-offset-y)) (gimp-image-disable-undo image) (if (= (car (gimp-selection-is-empty image)) TRUE) (begin - (gimp-selection-layer-alpha image drawable) + (gimp-selection-layer-alpha drawable) (set! active-selection (car (gimp-selection-save image))) (set! from-selection FALSE)) - (begin + (begin (set! from-selection TRUE) (set! active-selection (car (gimp-selection-save image))))) - (gimp-edit-copy image drawable) + (gimp-edit-copy drawable) (set! brush-image (car (gimp-image-new selection-width selection-height image-type))) (set! brush-draw (car (gimp-layer-new brush-image selection-width selection-height draw-type "Sloth" 100 NORMAL))) (gimp-image-add-layer brush-image brush-draw 0) (gimp-drawable-fill brush-draw BG-IMAGE-FILL) - (let ((floating-sel (car (gimp-edit-paste brush-image brush-draw FALSE)))) + (let ((floating-sel (car (gimp-edit-paste brush-draw FALSE)))) (gimp-floating-sel-anchor floating-sel) ) diff --git a/plug-ins/script-fu/scripts/select_to_brush.scm b/plug-ins/script-fu/scripts/select_to_brush.scm index c9079ab5fd..36c06432ed 100644 --- a/plug-ins/script-fu/scripts/select_to_brush.scm +++ b/plug-ins/script-fu/scripts/select_to_brush.scm @@ -40,20 +40,20 @@ (set! select-offset-x (cadr selection-bounds)) (set! select-offset-y (caddr selection-bounds)) (set! selection-width (- (cadr (cddr selection-bounds)) select-offset-x)) - (set! selection-height (- (caddr (cddr selection-bounds)) select-offset-y)) + (set! selection-height (- (caddr (cddr selection-bounds)) select-offset-y)) (gimp-image-disable-undo image) (if (= (car (gimp-selection-is-empty image)) TRUE) (begin - (gimp-selection-layer-alpha image drawable) + (gimp-selection-layer-alpha drawable) (set! active-selection (car (gimp-selection-save image))) (set! from-selection FALSE)) - (begin + (begin (set! from-selection TRUE) (set! active-selection (car (gimp-selection-save image))))) - (gimp-edit-copy image drawable) + (gimp-edit-copy drawable) (set! brush-image (car (gimp-image-new selection-width selection-height 1))) (set! brush-draw (car (gimp-layer-new brush-image selection-width selection-height GRAY_IMAGE "Sloth" 100 NORMAL))) @@ -63,18 +63,18 @@ (gimp-palette-set-background '(255 255 255)) (gimp-drawable-fill brush-draw BG-IMAGE-FILL) - (let ((floating-sel (car (gimp-edit-paste brush-image brush-draw FALSE)))) + (let ((floating-sel (car (gimp-edit-paste brush-draw FALSE)))) (gimp-floating-sel-anchor floating-sel) ) (set! data-dir (car (gimp-gimprc-query "gimp_dir"))) (set! filename2 (string-append data-dir - "/brushes/" - filename + "/brushes/" + filename (number->string image) ".gbr")) - (gimp-invert brush-image brush-draw) + (gimp-invert brush-draw) (file-gbr-save 1 brush-image brush-draw filename2 "" spacing desc) (gimp-brushes-refresh) ; My own modification! You'll need my diff. (gimp-brushes-set-brush desc) diff --git a/plug-ins/script-fu/scripts/select_to_image.scm b/plug-ins/script-fu/scripts/select_to_image.scm index 95d6b0f929..b3c4f17a7f 100644 --- a/plug-ins/script-fu/scripts/select_to_image.scm +++ b/plug-ins/script-fu/scripts/select_to_image.scm @@ -33,27 +33,27 @@ (set! select-offset-x (cadr selection-bounds)) (set! select-offset-y (caddr selection-bounds)) (set! selection-width (- (cadr (cddr selection-bounds)) select-offset-x)) - (set! selection-height (- (caddr (cddr selection-bounds)) select-offset-y)) + (set! selection-height (- (caddr (cddr selection-bounds)) select-offset-y)) (gimp-image-disable-undo image) (if (= (car (gimp-selection-is-empty image)) TRUE) (begin - (gimp-selection-layer-alpha image drawable) + (gimp-selection-layer-alpha drawable) (set! active-selection (car (gimp-selection-save image))) (set! from-selection FALSE)) - (begin + (begin (set! from-selection TRUE) (set! active-selection (car (gimp-selection-save image))))) - (gimp-edit-copy image drawable) + (gimp-edit-copy drawable) (set! brush-image (car (gimp-image-new selection-width selection-height image-type))) (set! brush-draw (car (gimp-layer-new brush-image selection-width selection-height draw-type "Sloth" 100 NORMAL))) (gimp-image-add-layer brush-image brush-draw 0) (gimp-drawable-fill brush-draw BG-IMAGE-FILL) - (let ((floating-sel (car (gimp-edit-paste brush-image brush-draw FALSE)))) + (let ((floating-sel (car (gimp-edit-paste brush-draw FALSE)))) (gimp-floating-sel-anchor floating-sel) ) diff --git a/plug-ins/script-fu/scripts/selection-round.scm b/plug-ins/script-fu/scripts/selection-round.scm index cf5d0bce5a..8d110ac234 100644 --- a/plug-ins/script-fu/scripts/selection-round.scm +++ b/plug-ins/script-fu/scripts/selection-round.scm @@ -31,7 +31,7 @@ ; in relation to the selections width or height (depends on which of these ; is smaller) -(define (script-fu-selection-round image +(define (script-fu-selection-round image drawable radius) @@ -57,52 +57,36 @@ (begin (set! cut-radius (* radius (/ select-width 2))) (set! ellipse-radius (* radius select-width)))) - (gimp-rect-select image - select-x1 - select-y1 - (+ cut-radius 1) - (+ cut-radius 1) - SUB - FALSE 0) - (gimp-rect-select image - select-x1 - (- select-y2 cut-radius) - (+ cut-radius 1) - (+ cut-radius 1) - SUB - FALSE 0) (gimp-rect-select image - (- select-x2 cut-radius) + select-x1 select-y1 (+ cut-radius 1) (+ cut-radius 1) SUB FALSE 0) (gimp-rect-select image - (- select-x2 cut-radius) + select-x1 + (- select-y2 cut-radius) + (+ cut-radius 1) + (+ cut-radius 1) + SUB + FALSE 0) + (gimp-rect-select image + (- select-x2 cut-radius) + select-y1 + (+ cut-radius 1) + (+ cut-radius 1) + SUB + FALSE 0) + (gimp-rect-select image + (- select-x2 cut-radius) (- select-y2 cut-radius) (+ cut-radius 1) (+ cut-radius 1) SUB FALSE 0) (gimp-ellipse-select image - select-x1 - select-y1 - ellipse-radius - ellipse-radius - ADD - TRUE - FALSE 0) - (gimp-ellipse-select image - select-x1 - (- select-y2 ellipse-radius) - ellipse-radius - ellipse-radius - ADD - TRUE - FALSE 0) - (gimp-ellipse-select image - (- select-x2 ellipse-radius) + select-x1 select-y1 ellipse-radius ellipse-radius @@ -110,19 +94,35 @@ TRUE FALSE 0) (gimp-ellipse-select image - (- select-x2 ellipse-radius) + select-x1 (- select-y2 ellipse-radius) ellipse-radius ellipse-radius ADD TRUE - FALSE 0) + FALSE 0) + (gimp-ellipse-select image + (- select-x2 ellipse-radius) + select-y1 + ellipse-radius + ellipse-radius + ADD + TRUE + FALSE 0) + (gimp-ellipse-select image + (- select-x2 ellipse-radius) + (- select-y2 ellipse-radius) + ellipse-radius + ellipse-radius + ADD + TRUE + FALSE 0) (gimp-undo-push-group-end image) (gimp-displays-flush))) -(script-fu-register "script-fu-selection-round" +(script-fu-register "script-fu-selection-round" "/Script-Fu/Selection/Round" "Rounds the active selection. The selection should be rectangular." diff --git a/plug-ins/script-fu/scripts/slide.scm b/plug-ins/script-fu/scripts/slide.scm index 15ceeaa80d..f1c5879615 100644 --- a/plug-ins/script-fu/scripts/slide.scm +++ b/plug-ins/script-fu/scripts/slide.scm @@ -45,7 +45,7 @@ ((< width (* ratio height)) width))) -(define (script-fu-slide img +(define (script-fu-slide img drawable text number @@ -53,15 +53,15 @@ font-color work-on-copy) (let* ((type (car (gimp-drawable-type-with-alpha drawable))) - (image (cond ((= work-on-copy TRUE) + (image (cond ((= work-on-copy TRUE) (car (gimp-channel-ops-duplicate img))) - ((= work-on-copy FALSE) + ((= work-on-copy FALSE) img))) (owidth (car (gimp-image-width image))) (oheight (car (gimp-image-height image))) - (ratio (if (>= owidth oheight) (/ 3 2) + (ratio (if (>= owidth oheight) (/ 3 2) (/ 2 3))) - (crop-width (crop owidth oheight ratio)) + (crop-width (crop owidth oheight ratio)) (crop-height (/ crop-width ratio)) (width (* (max crop-width crop-height) 1.05)) (height (* (min crop-width crop-height) 1.5)) @@ -72,19 +72,19 @@ (hole-start (- (/ (rand 1000) 1000) 0.5)) (old-bg (car (gimp-palette-get-background))) (old-fg (car (gimp-palette-get-foreground))) - (film-layer (car (gimp-layer-new image - width - height - type - "Film" - 100 + (film-layer (car (gimp-layer-new image + width + height + type + "Film" + 100 NORMAL))) - (bg-layer (car (gimp-layer-new image - width - height - type - "Background" - 100 + (bg-layer (car (gimp-layer-new image + width + height + type + "Background" + 100 NORMAL))) (pic-layer (car (gimp-image-active-drawable image))) (numbera (string-append number "A"))) @@ -96,21 +96,21 @@ (gimp-layer-add-alpha pic-layer) ; crop, resize and eventually rotate the image - (gimp-crop image - crop-width - crop-height + (gimp-crop image + crop-width + crop-height (/ (- owidth crop-width) 2) (/ (- oheight crop-height) 2)) - (gimp-image-resize image - width - height + (gimp-image-resize image + width + height (/ (- width crop-width) 2) (/ (- height crop-height) 2)) (if (< ratio 1) (plug-in-rotate 1 - image + image pic-layer 1 - FALSE)) + FALSE)) ; add the background layer (gimp-drawable-fill bg-layer BG-IMAGE-FILL) @@ -140,7 +140,7 @@ (* 0.040 height) PIXELS fontname ))) (gimp-floating-sel-anchor (car (gimp-text-fontname image - film-layer + film-layer (+ hole-start (* 0.35 width)) (* 0.01 height) number @@ -149,7 +149,7 @@ (* 0.050 height) PIXELS fontname ))) (gimp-floating-sel-anchor (car (gimp-text-fontname image - film-layer + film-layer (+ hole-start (* 0.35 width)) (* 0.95 height) number @@ -158,7 +158,7 @@ (* 0.050 height) PIXELS fontname ))) (gimp-floating-sel-anchor (car (gimp-text-fontname image - film-layer + film-layer (+ hole-start (* 0.85 width)) (* 0.95 height) numbera @@ -171,18 +171,18 @@ (let* ((film-mask (car (gimp-layer-create-mask film-layer WHITE-MASK))) (hole hole-start) (top-y (* height 0.06)) - (bottom-y(* height 0.855))) + (bottom-y(* height 0.855))) (gimp-selection-none image) (while (< hole 8) - (gimp-rect-select image + (gimp-rect-select image (* hole-space hole) top-y hole-width hole-height ADD FALSE - 0) - (gimp-rect-select image + 0) + (gimp-rect-select image (* hole-space hole) bottom-y hole-width @@ -193,10 +193,10 @@ (set! hole (+ hole 1))) (gimp-palette-set-foreground '(0 0 0)) - (gimp-edit-fill image film-mask) + (gimp-edit-fill film-mask) (gimp-selection-none image) (plug-in-gauss-rle 1 image film-mask hole-radius TRUE TRUE) - (gimp-threshold image film-mask 127 255) + (gimp-threshold film-mask 127 255) (gimp-image-add-layer image film-layer -1) (gimp-image-add-layer-mask image film-layer film-mask)) @@ -213,7 +213,7 @@ (if (= work-on-copy TRUE) (gimp-display-new image)) (gimp-displays-flush))) -(script-fu-register "script-fu-slide" +(script-fu-register "script-fu-slide" "/Script-Fu/Decor/Slide" "Gives the image the look of a slide" "Sven Neumann (neumanns@uni-duesseldorf.de)" @@ -226,7 +226,7 @@ SF-STRING "Number" "32" SF-FONT "Font" "-*-utopia-*-r-*-*-24-*-*-*-p-*-*-*" SF-COLOR "Font Color" '(255 180 0) - SF-TOGGLE "Work on copy" TRUE) + SF-TOGGLE "Work on copy" TRUE) diff --git a/plug-ins/script-fu/scripts/sota-chrome-logo.scm b/plug-ins/script-fu/scripts/sota-chrome-logo.scm index 12398bed98..810edface1 100644 --- a/plug-ins/script-fu/scripts/sota-chrome-logo.scm +++ b/plug-ins/script-fu/scripts/sota-chrome-logo.scm @@ -54,11 +54,11 @@ (define (copy-layer-sota dest-image dest-drawable source-image source-drawable) (gimp-selection-all dest-image) - (gimp-edit-clear dest-image dest-drawable) + (gimp-edit-clear dest-drawable) (gimp-selection-none dest-image) (gimp-selection-all source-image) - (gimp-edit-copy source-image source-drawable) - (let ((floating-sel (car (gimp-edit-paste dest-image dest-drawable FALSE)))) + (gimp-edit-copy source-drawable) + (let ((floating-sel (car (gimp-edit-paste dest-drawable FALSE)))) (gimp-floating-sel-anchor floating-sel))) (define (script-fu-sota-chrome-logo chrome-saturation chrome-lightness chrome-factor @@ -96,28 +96,28 @@ (gimp-image-add-layer img layer2 0) (gimp-palette-set-background '(255 255 255)) (gimp-selection-none img) - (gimp-edit-fill img layer2) - (gimp-edit-fill img layer3) - (gimp-edit-clear img shadow) + (gimp-edit-fill layer2) + (gimp-edit-fill layer3) + (gimp-edit-clear shadow) (gimp-layer-set-visible text-layer FALSE) (gimp-layer-set-visible shadow FALSE) (gimp-rect-select img (/ b-size 2) (/ b-size 2) (- width b-size) (- height b-size) REPLACE 0 0) (gimp-rect-select img b-size b-size (- width (* b-size 2)) (- height (* b-size 2)) SUB 0 0) - (gimp-edit-fill img text-layer) + (gimp-edit-fill text-layer) - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) (gimp-palette-set-background '(0 0 0)) (gimp-selection-translate img offx1 offy1) (gimp-selection-feather img feather) - (gimp-edit-fill img layer2) + (gimp-edit-fill layer2) (gimp-selection-translate img (* 2 offx2) (* 2 offy2)) - (gimp-edit-fill img layer3) + (gimp-edit-fill layer3) (gimp-selection-none img) (gimp-layer-set-visible layer2 TRUE) (gimp-layer-set-visible layer3 TRUE) (set! layer2 (car (gimp-image-merge-visible-layers img CLIP-TO-IMAGE))) - (gimp-invert img layer2) + (gimp-invert layer2) (copy-layer-sota img layer1 banding-img banding-layer) (gimp-image-delete banding-img) @@ -128,40 +128,40 @@ (gimp-layer-set-visible layer1 TRUE) (gimp-layer-set-visible layer2 TRUE) (set! layer1 (car (gimp-image-merge-visible-layers img CLIP-TO-IMAGE))) - (gimp-curves-spline img layer1 0 18 (spline1)) + (gimp-curves-spline layer1 0 18 (spline1)) (set! layer-mask (car (gimp-layer-create-mask layer1 BLACK-MASK))) (gimp-image-add-layer-mask img layer1 layer-mask) - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img layer-mask) + (gimp-edit-fill layer-mask) (set! layer2 (car (gimp-layer-copy layer1 TRUE))) (gimp-image-add-layer img layer2 0) (gimp-brushes-set-brush (brush brush-size)) (gimp-palette-set-foreground '(255 255 255)) - (gimp-edit-stroke img layer-mask) + (gimp-edit-stroke layer-mask) (gimp-palette-set-background '(0 0 0)) (gimp-selection-feather img (* feather 1.5)) (gimp-selection-translate img (* 2.5 offx1) (* 2.5 offy1)) - (gimp-edit-fill img shadow) + (gimp-edit-fill shadow) (gimp-selection-all img) (gimp-patterns-set-pattern "Marble #1") - (gimp-bucket-fill img text-layer PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) + (gimp-bucket-fill text-layer PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) (gimp-selection-none img) (gimp-convert-rgb img) - (gimp-color-balance img layer1 0 TRUE (shadows (rval hc)) (shadows (gval hc)) (shadows (bval hc))) - (gimp-color-balance img layer1 1 TRUE (midtones (rval hc)) (midtones (gval hc)) (midtones (bval hc))) - (gimp-color-balance img layer1 2 TRUE (highlights (rval hc)) (highlights (gval hc)) (highlights (bval hc))) + (gimp-color-balance layer1 0 TRUE (shadows (rval hc)) (shadows (gval hc)) (shadows (bval hc))) + (gimp-color-balance layer1 1 TRUE (midtones (rval hc)) (midtones (gval hc)) (midtones (bval hc))) + (gimp-color-balance layer1 2 TRUE (highlights (rval hc)) (highlights (gval hc)) (highlights (bval hc))) - (gimp-color-balance img layer2 0 TRUE (shadows (rval cc)) (shadows (gval cc)) (shadows (bval cc))) - (gimp-color-balance img layer2 1 TRUE (midtones (rval cc)) (midtones (gval cc)) (midtones (bval cc))) - (gimp-color-balance img layer2 2 TRUE (highlights (rval cc)) (highlights (gval cc)) (highlights (bval cc))) - (gimp-hue-saturation img layer2 0 0 chrome-lightness chrome-saturation) + (gimp-color-balance layer2 0 TRUE (shadows (rval cc)) (shadows (gval cc)) (shadows (bval cc))) + (gimp-color-balance layer2 1 TRUE (midtones (rval cc)) (midtones (gval cc)) (midtones (bval cc))) + (gimp-color-balance layer2 2 TRUE (highlights (rval cc)) (highlights (gval cc)) (highlights (bval cc))) + (gimp-hue-saturation layer2 0 0 chrome-lightness chrome-saturation) (gimp-layer-set-visible shadow TRUE) (gimp-layer-set-visible text-layer TRUE) diff --git a/plug-ins/script-fu/scripts/speed-text.scm b/plug-ins/script-fu/scripts/speed-text.scm index 67c30638fb..48f8edccb9 100644 --- a/plug-ins/script-fu/scripts/speed-text.scm +++ b/plug-ins/script-fu/scripts/speed-text.scm @@ -37,13 +37,13 @@ (gimp-image-add-layer img bg-layer 1) (gimp-image-add-layer img text-layer -1) - (gimp-edit-clear img bg-layer) - (gimp-edit-clear img text-layer) + (gimp-edit-clear bg-layer) + (gimp-edit-clear text-layer) (gimp-floating-sel-anchor (car (gimp-text-fontname img text-layer 10 10 string 0 TRUE font-size PIXELS font))) ; save the selection for later - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) (set! saved-sel (car (gimp-selection-save img))) ; add layer mask @@ -54,16 +54,16 @@ (gimp-layer-set-edit-mask text-layer FALSE) (gimp-selection-grow img 10) (gimp-palette-set-background old-fg) - (gimp-edit-fill img text-layer) + (gimp-edit-fill text-layer) ; feather the mask (gimp-layer-set-edit-mask text-layer TRUE) - (gimp-selection-load img saved-sel) + (gimp-selection-load saved-sel) (gimp-selection-feather img 10) (gimp-palette-set-background (list grey grey grey)) - (gimp-edit-fill img text-mask) - (gimp-edit-fill img text-mask) - (gimp-edit-fill img text-mask) + (gimp-edit-fill text-mask) + (gimp-edit-fill text-mask) + (gimp-edit-fill text-mask) (gimp-selection-clear img) (plug-in-newsprint 1 img text-mask cell-size 0 0 0.0 1 45.0 0 45.0 0 45.0 0 5) diff --git a/plug-ins/script-fu/scripts/sphere.scm b/plug-ins/script-fu/scripts/sphere.scm index 581547164e..f4a34bfbe1 100644 --- a/plug-ins/script-fu/scripts/sphere.scm +++ b/plug-ins/script-fu/scripts/sphere.scm @@ -26,7 +26,7 @@ (gimp-image-add-layer img drawable 0) (gimp-palette-set-foreground sphere-color) (gimp-palette-set-background bg-color) - (gimp-edit-fill img drawable) + (gimp-edit-fill drawable) (gimp-palette-set-background '(20 20 20)) (if (and (or (and (>= light 45) (<= light 75)) (and (<= light 135) (>= light 105))) @@ -39,9 +39,9 @@ (prog1 (set! shadow-x (+ cx shadow-w)) (set! shadow-w (- shadow-w)))) (gimp-ellipse-select img shadow-x shadow-y shadow-w shadow-h REPLACE TRUE TRUE 7.5) - (gimp-bucket-fill img drawable BG-BUCKET-FILL MULTIPLY 100 0 FALSE 0 0))) + (gimp-bucket-fill drawable BG-BUCKET-FILL MULTIPLY 100 0 FALSE 0 0))) (gimp-ellipse-select img (- cx radius) (- cy radius) (* 2 radius) (* 2 radius) REPLACE TRUE FALSE 0) - (gimp-blend img drawable FG-BG-RGB NORMAL RADIAL 100 offset REPEAT-NONE + (gimp-blend drawable FG-BG-RGB NORMAL RADIAL 100 offset REPEAT-NONE FALSE 0 0 light-x light-y light-end-x light-end-y) (gimp-selection-none img) (gimp-palette-set-background old-bg) diff --git a/plug-ins/script-fu/scripts/spinning-globe.scm b/plug-ins/script-fu/scripts/spinning-globe.scm index 2164949087..cb13cbafa8 100644 --- a/plug-ins/script-fu/scripts/spinning-globe.scm +++ b/plug-ins/script-fu/scripts/spinning-globe.scm @@ -38,13 +38,13 @@ (set! theFrame (car (gimp-layer-copy theLayer FALSE))) (gimp-image-add-layer theImage theFrame 0) (gimp-layer-set-name theFrame (string-append "Anim Frame: " (number->string (- inFrames n) 10))) - (plug-in-map-object TRUE theImage theFrame 1 + (plug-in-map-object TRUE theImage theFrame 1 ;viewpoint 0.5 0.5 2.0 ;obj pos? 0.5 0.5 0 ;first axis -1.0 0 0 +1.0 0 0 ;2nd axis 0.0 1.0 0.0 ; axis rotation diff --git a/plug-ins/script-fu/scripts/spinning_globe.scm b/plug-ins/script-fu/scripts/spinning_globe.scm index 2164949087..cb13cbafa8 100644 --- a/plug-ins/script-fu/scripts/spinning_globe.scm +++ b/plug-ins/script-fu/scripts/spinning_globe.scm @@ -38,13 +38,13 @@ (set! theFrame (car (gimp-layer-copy theLayer FALSE))) (gimp-image-add-layer theImage theFrame 0) (gimp-layer-set-name theFrame (string-append "Anim Frame: " (number->string (- inFrames n) 10))) - (plug-in-map-object TRUE theImage theFrame 1 + (plug-in-map-object TRUE theImage theFrame 1 ;viewpoint 0.5 0.5 2.0 ;obj pos? 0.5 0.5 0 ;first axis -1.0 0 0 +1.0 0 0 ;2nd axis 0.0 1.0 0.0 ; axis rotation diff --git a/plug-ins/script-fu/scripts/starburst-logo.scm b/plug-ins/script-fu/scripts/starburst-logo.scm index 690efd74da..b631d82273 100644 --- a/plug-ins/script-fu/scripts/starburst-logo.scm +++ b/plug-ins/script-fu/scripts/starburst-logo.scm @@ -30,29 +30,29 @@ (gimp-layer-set-preserve-trans text-layer TRUE) (gimp-palette-set-background bg-color) - (gimp-edit-fill img bg-layer) - (gimp-edit-clear img shadow-layer) - (gimp-edit-clear img burst-layer) + (gimp-edit-fill bg-layer) + (gimp-edit-clear shadow-layer) + (gimp-edit-clear burst-layer) (gimp-selection-all img) (gimp-patterns-set-pattern "Crack") - (gimp-bucket-fill img text-layer PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) + (gimp-bucket-fill text-layer PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) (gimp-selection-none img) - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img layer-mask) + (gimp-edit-fill layer-mask) (gimp-selection-none img) (plug-in-nova 1 img burst-layer (car burst-coords) (cdr burst-coords) burst-color burstradius 100) - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) (gimp-palette-set-background '(0 0 0)) (gimp-selection-feather img feather) (gimp-selection-translate img -1 -1) (while (< count off) - (gimp-edit-fill img shadow-layer) + (gimp-edit-fill shadow-layer) (gimp-selection-translate img 1 1) (set! count (+ count 1))) (gimp-selection-none img) diff --git a/plug-ins/script-fu/scripts/starscape-logo.scm b/plug-ins/script-fu/scripts/starscape-logo.scm index 7432726529..ad0a4975e3 100644 --- a/plug-ins/script-fu/scripts/starscape-logo.scm +++ b/plug-ins/script-fu/scripts/starscape-logo.scm @@ -66,33 +66,33 @@ (gimp-layer-set-preserve-trans text-layer TRUE) (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img bg-layer) - (gimp-edit-clear img shadow-layer) - (gimp-edit-clear img glow-layer) + (gimp-edit-fill bg-layer) + (gimp-edit-clear shadow-layer) + (gimp-edit-clear glow-layer) - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) (gimp-selection-grow img grow) (gimp-selection-feather img feather) (gimp-palette-set-background glow-color) (gimp-selection-feather img feather) - (gimp-edit-fill img glow-layer) + (gimp-edit-fill glow-layer) - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) (gimp-selection-feather img shadow-feather) (gimp-palette-set-background '(0 0 0)) (gimp-selection-translate img offx offy) - (gimp-edit-fill img shadow-layer) + (gimp-edit-fill shadow-layer) (gimp-selection-none img) (gimp-palette-set-background '(31 31 31)) (gimp-palette-set-foreground '(255 255 255)) - (gimp-blend img text-layer FG-BG-RGB NORMAL BILINEAR 100 0 REPEAT-NONE FALSE 0 0 cx cy bx by) + (gimp-blend text-layer FG-BG-RGB NORMAL BILINEAR 100 0 REPEAT-NONE FALSE 0 0 cx cy bx by) (plug-in-nova 1 img glow-layer novax novay glow-color novaradius 100) (gimp-selection-all img) (gimp-patterns-set-pattern "Stone") - (gimp-bucket-fill img bump-channel PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) + (gimp-bucket-fill bump-channel PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) (plug-in-bump-map 1 img text-layer bump-channel 135.0 45.0 4 0 0 0 0 FALSE FALSE 0) (gimp-image-remove-channel img bump-channel) (gimp-selection-none img) diff --git a/plug-ins/script-fu/scripts/swirltile.scm b/plug-ins/script-fu/scripts/swirltile.scm index 1d1cb970a6..fd1f97ea61 100644 --- a/plug-ins/script-fu/scripts/swirltile.scm +++ b/plug-ins/script-fu/scripts/swirltile.scm @@ -16,7 +16,7 @@ (old-bg (car (gimp-palette-get-background)))) (gimp-image-disable-undo img) (gimp-palette-set-background bg-color) - (gimp-edit-fill img layer-one) + (gimp-edit-fill layer-one) (gimp-image-add-layer img layer-one 0) (plug-in-noisify 1 img layer-one FALSE noise-level noise-level noise-level 1.0) @@ -24,7 +24,7 @@ (plug-in-whirl-pinch 1 img layer-one whirl-amount 0.0 1.0) (plug-in-whirl-pinch 1 img layer-one whirl-amount 0.0 1.0) - (gimp-channel-ops-offset img layer-one TRUE 0 cx cy) + (gimp-channel-ops-offset layer-one TRUE 0 cx cy) (plug-in-whirl-pinch 1 img layer-one whirl-amount 0.0 1.0) (plug-in-whirl-pinch 1 img layer-one whirl-amount 0.0 1.0) diff --git a/plug-ins/script-fu/scripts/swirly-pattern.scm b/plug-ins/script-fu/scripts/swirly-pattern.scm index 10fb3ad2e5..dce0fa1046 100644 --- a/plug-ins/script-fu/scripts/swirly-pattern.scm +++ b/plug-ins/script-fu/scripts/swirly-pattern.scm @@ -51,7 +51,7 @@ (gimp-rect-select img 0 0 hsize hsize REPLACE 0 0) (whirl-it img drawable angle times) - (gimp-invert img drawable) + (gimp-invert drawable) ; Whirl upper right @@ -67,7 +67,7 @@ (gimp-rect-select img hsize hsize hsize hsize REPLACE 0 0) (whirl-it img drawable angle times) - (gimp-invert img drawable) + (gimp-invert drawable) ; Terminate diff --git a/plug-ins/script-fu/scripts/t-o-p-logo.scm b/plug-ins/script-fu/scripts/t-o-p-logo.scm index d44c5fefcd..8a36d22f09 100644 --- a/plug-ins/script-fu/scripts/t-o-p-logo.scm +++ b/plug-ins/script-fu/scripts/t-o-p-logo.scm @@ -25,12 +25,12 @@ (gimp-image-add-layer img shadow-layer 3) (gimp-image-add-layer img bg-layer 4) (gimp-selection-none img) - (gimp-edit-clear img shadow-layer) - (gimp-edit-clear img sparkle-layer) + (gimp-edit-clear shadow-layer) + (gimp-edit-clear sparkle-layer) (gimp-palette-set-background base-color) - (gimp-edit-fill img sparkle-layer) + (gimp-edit-fill sparkle-layer) (gimp-palette-set-background base-color) - (gimp-selection-layer-alpha img text-layer) + (gimp-selection-layer-alpha text-layer) (set! selection (car (gimp-selection-save img))) (gimp-selection-grow img edge-size) '(plug-in-noisify 1 img sparkle-layer FALSE @@ -39,33 +39,33 @@ (plug-in-noisify 1 img sparkle-layer FALSE hit-rate hit-rate hit-rate 0.0) (gimp-selection-none img) (plug-in-sparkle 1 img sparkle-layer 0.03 0.45 width 6 15) - (gimp-selection-load img selection) + (gimp-selection-load selection) (gimp-selection-shrink img edge-size) - (gimp-levels img sparkle-layer 0 0 255 1.2 0 255) - (gimp-selection-load img selection) + (gimp-levels sparkle-layer 0 0 255 1.2 0 255) + (gimp-selection-load selection) (gimp-selection-border img edge-size) - (gimp-levels img sparkle-layer 0 0 255 0.5 0 255) - (gimp-selection-load img selection) + (gimp-levels sparkle-layer 0 0 255 0.5 0 255) + (gimp-selection-load selection) (gimp-selection-grow img (/ edge-size 2.0)) (gimp-selection-invert img) - (gimp-edit-clear img sparkle-layer) + (gimp-edit-clear sparkle-layer) (if (= edge-only TRUE) (begin - (gimp-selection-load img selection) + (gimp-selection-load selection) (gimp-selection-shrink img (/ edge-size 2.0)) - (gimp-edit-clear img sparkle-layer) - (gimp-selection-load img selection) + (gimp-edit-clear sparkle-layer) + (gimp-selection-load selection) (gimp-selection-grow img (/ edge-size 2.0)) (gimp-selection-invert img))) (gimp-palette-set-foreground '(0 0 0)) (gimp-palette-set-background '(255 255 255)) (gimp-brushes-set-brush "Circle Fuzzy (11)") (gimp-selection-feather img border) - (gimp-edit-fill img shadow-layer) + (gimp-edit-fill shadow-layer) (gimp-selection-none img) (gimp-palette-set-background base-color) - (gimp-edit-fill img bg-layer) - (gimp-selection-load img selection) + (gimp-edit-fill bg-layer) + (gimp-selection-load selection) (gimp-brushes-set-brush "Circle Fuzzy (07)") (gimp-palette-set-foreground '(255 255 255)) (gimp-selection-none img) diff --git a/plug-ins/script-fu/scripts/test-sphere.scm b/plug-ins/script-fu/scripts/test-sphere.scm index 99f5e3db01..788d4f6f9b 100644 --- a/plug-ins/script-fu/scripts/test-sphere.scm +++ b/plug-ins/script-fu/scripts/test-sphere.scm @@ -114,7 +114,7 @@ (gimp-image-add-layer img drawable 0) (gimp-palette-set-foreground sphere-color) (gimp-palette-set-background bg-color) - (gimp-edit-fill img drawable) + (gimp-edit-fill drawable) (gimp-palette-set-background '(20 20 20)) (if (and (or (and (>= light 45) (<= light 75)) (and (<= light 135) (>= light 105))) @@ -128,24 +128,24 @@ (set! shadow-w (- shadow-w)))) (gimp-ellipse-select img shadow-x shadow-y shadow-w shadow-h REPLACE TRUE TRUE 7.5) (gimp-patterns-set-pattern pattern) - (gimp-bucket-fill img drawable PATTERN-BUCKET-FILL MULTIPLY 100 0 FALSE 0 0))) + (gimp-bucket-fill drawable PATTERN-BUCKET-FILL MULTIPLY 100 0 FALSE 0 0))) (gimp-ellipse-select img (- cx radius) (- cy radius) (* 2 radius) (* 2 radius) REPLACE TRUE FALSE 0) - (gimp-blend img drawable FG-BG-RGB NORMAL RADIAL 100 offset REPEAT-NONE + (gimp-blend drawable FG-BG-RGB NORMAL RADIAL 100 offset REPEAT-NONE FALSE 0 0 light-x light-y light-end-x light-end-y) (gimp-selection-none img) (gimp-gradients-set-active gradient) (gimp-ellipse-select img 10 10 50 50 REPLACE TRUE FALSE 0) - (gimp-blend img drawable CUSTOM NORMAL LINEAR 100 offset REPEAT-NONE + (gimp-blend drawable CUSTOM NORMAL LINEAR 100 offset REPEAT-NONE FALSE 0 0 10 10 30 60) (gimp-selection-none img) (gimp-palette-set-foreground '(0 0 0)) - (gimp-floating-sel-anchor (car (gimp-text-fontname img drawable + (gimp-floating-sel-anchor (car (gimp-text-fontname img drawable x-position y-position text - 0 TRUE - size PIXELS + 0 TRUE + size PIXELS font))) (gimp-palette-set-background old-bg) diff --git a/plug-ins/script-fu/scripts/text-circle.scm b/plug-ins/script-fu/scripts/text-circle.scm index 635be82b00..2df895646a 100644 --- a/plug-ins/script-fu/scripts/text-circle.scm +++ b/plug-ins/script-fu/scripts/text-circle.scm @@ -86,7 +86,7 @@ (index 0)) (gimp-image-disable-undo img) (gimp-image-add-layer img BG-layer 0) - (gimp-edit-fill img BG-layer) + (gimp-edit-fill BG-layer) ;; change units (set! start-angle-rad (* (/ (modulo start-angle 360) 360) 2 *pi*)) (set! fill-angle-rad (* (/ fill-angle 360) 2 *pi*)) @@ -127,7 +127,7 @@ (set! angle-list (nreverse temp-list)) (set! temp 0) (set! angle-list - (mapcar (lambda (angle) + (mapcar (lambda (angle) (let ((tmp temp)) (set! temp (+ angle temp)) (+ tmp (/ angle 2)))) @@ -167,19 +167,19 @@ (+ center-y (* radius (sin angle)) (* rotate-radius - (sin (if (< 0 fill-angle-rad) + (sin (if (< 0 fill-angle-rad) angle (+ angle *pi*)))) (- (/ height 2)))) - (gimp-rotate img new-layer 1 + (gimp-rotate new-layer 1 ((if (< 0 fill-angle-rad) + -) angle rad-90)))))) (set! index (+ index 1))) (gimp-layer-set-visible BG-layer 0) (if (not script-fu-text-circle-debug?) (begin - (set! merged-layer + (set! merged-layer (car (gimp-image-merge-visible-layers img CLIP-TO-IMAGE))) - (gimp-layer-set-name merged-layer + (gimp-layer-set-name merged-layer (if (< (length text) 16) (wrap-string text) "Text Circle")))) @@ -202,7 +202,7 @@ (set! script-fu-text-circle-font-spacing (wrap-string spacing)) (gimp-displays-flush))) -(script-fu-register +(script-fu-register "script-fu-text-circle" "/Xtns/Script-Fu/Logos/Text Circle" "Render the specified text along the perimeter of a circle" diff --git a/plug-ins/script-fu/scripts/textured-logo.scm b/plug-ins/script-fu/scripts/textured-logo.scm index caddbf80ed..868b7c7d4d 100644 --- a/plug-ins/script-fu/scripts/textured-logo.scm +++ b/plug-ins/script-fu/scripts/textured-logo.scm @@ -34,39 +34,39 @@ (gimp-selection-all img) (gimp-patterns-set-pattern text-pattern) (gimp-layer-set-preserve-trans text-layer TRUE) - (gimp-bucket-fill img text-layer PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) + (gimp-bucket-fill text-layer PATTERN-BUCKET-FILL NORMAL 100 0 FALSE 0 0) (gimp-selection-none img) - (gimp-edit-clear img text-shadow-layer) - (gimp-edit-clear img drop-shadow-layer) + (gimp-edit-clear text-shadow-layer) + (gimp-edit-clear drop-shadow-layer) (gimp-palette-set-background bg-color) (gimp-drawable-fill shadow-layer BG-IMAGE-FILL) (gimp-rect-select img b-size-2 b-size-2 (- width b-size) (- height b-size) REPLACE TRUE b-size-2) (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img shadow-layer) - (gimp-selection-layer-alpha img text-layer) + (gimp-edit-fill shadow-layer) + (gimp-selection-layer-alpha text-layer) (gimp-image-add-layer-mask img text-shadow-layer tsl-layer-mask) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img tsl-layer-mask) + (gimp-edit-fill tsl-layer-mask) (gimp-selection-feather img f-size) (gimp-palette-set-background '(63 63 63)) - (gimp-edit-fill img drop-shadow-layer) + (gimp-edit-fill drop-shadow-layer) (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img text-shadow-layer) + (gimp-edit-fill text-shadow-layer) (gimp-palette-set-foreground '(255 255 255)) - (gimp-blend img text-shadow-layer FG-BG-RGB NORMAL SHAPEBURST-ANGULAR 100 0 REPEAT-NONE FALSE 0 0 0 0 1 1) + (gimp-blend text-shadow-layer FG-BG-RGB NORMAL SHAPEBURST-ANGULAR 100 0 REPEAT-NONE FALSE 0 0 0 0 1 1) (gimp-selection-none img) (gimp-palette-set-foreground blend-fg) (gimp-palette-set-background blend-bg) - (gimp-blend img blend-layer FG-BG-RGB NORMAL LINEAR 100 0 REPEAT-NONE FALSE 0 0 0 0 width 0) + (gimp-blend blend-layer FG-BG-RGB NORMAL LINEAR 100 0 REPEAT-NONE FALSE 0 0 0 0 width 0) (plug-in-mosaic 1 img blend-layer 12 1 1 0.7 135 0.2 TRUE FALSE tile-type 1 0) (gimp-layer-translate text-layer (- b-size-2) (- b-size-2)) (gimp-layer-translate blend-layer (- b-size) (- b-size)) (gimp-layer-translate text-shadow-layer (- ts-size) (- ts-size)) (gimp-layer-translate drop-shadow-layer ds-size ds-size) - (gimp-selection-layer-alpha img blend-layer) + (gimp-selection-layer-alpha blend-layer) (gimp-image-add-layer-mask img drop-shadow-layer dsl-layer-mask) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img dsl-layer-mask) + (gimp-edit-fill dsl-layer-mask) (gimp-image-remove-layer-mask img drop-shadow-layer APPLY) (gimp-selection-none img) (gimp-layer-set-name text-layer text) diff --git a/plug-ins/script-fu/scripts/tileblur.scm b/plug-ins/script-fu/scripts/tileblur.scm index 8a600a2512..053b786204 100644 --- a/plug-ins/script-fu/scripts/tileblur.scm +++ b/plug-ins/script-fu/scripts/tileblur.scm @@ -30,7 +30,7 @@ (gimp-layer-resize theLayer (* 3 theWidth) (* 3 theHeight) 0 0) (gimp-rect-select theImage 0 0 theWidth theHeight REPLACE 0 0) - (gimp-edit-cut theImage theLayer) + (gimp-edit-cut theLayer) (gimp-selection-none theImage) (gimp-layer-set-offsets theLayer theWidth theHeight) @@ -40,7 +40,7 @@ (cjg-pasteat 3 1) (cjg-pasteat 3 2) (cjg-pasteat 3 3) (gimp-selection-none theImage) - (if (= inType FALSE) + (if (= inType FALSE) (plug-in-gauss-iir TRUE theImage theLayer inRadius inHoriz inVert) (plug-in-gauss-rle TRUE theImage theLayer inRadius inHoriz inVert) ) @@ -51,8 +51,8 @@ (gimp-displays-flush) ) -(define (cjg-pasteat xoff yoff) - (let ((theFloat (car(gimp-edit-paste theImage theLayer 0)))) +(define (cjg-pasteat xoff yoff) + (let ((theFloat (car(gimp-edit-paste theLayer 0)))) (gimp-layer-set-offsets theFloat (* xoff theWidth) (* yoff theHeight) ) (gimp-floating-sel-anchor theFloat) ) diff --git a/plug-ins/script-fu/scripts/title-header.scm b/plug-ins/script-fu/scripts/title-header.scm index 5dae8c9297..6ee1185255 100644 --- a/plug-ins/script-fu/scripts/title-header.scm +++ b/plug-ins/script-fu/scripts/title-header.scm @@ -97,24 +97,24 @@ ; Create bumpmap layer (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img bumpmap-layer) - (gimp-selection-layer-alpha img text-layer) + (gimp-edit-fill bumpmap-layer) + (gimp-selection-layer-alpha text-layer) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img bumpmap-layer) + (gimp-edit-fill bumpmap-layer) (gimp-selection-none img) (plug-in-gauss-rle 1 img bumpmap-layer 4.0 TRUE TRUE) ; Fore layer, bumpmap (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img fore-layer) + (gimp-edit-fill fore-layer) (plug-in-bump-map 1 img fore-layer bumpmap-layer 135.0 45.0 4 0 0 0 0 FALSE FALSE 0) ; Text layer (gimp-layer-set-visible text-layer TRUE) (gimp-layer-set-preserve-trans text-layer TRUE) - (gimp-blend img text-layer CUSTOM NORMAL LINEAR 100 0 REPEAT-NONE FALSE 0.2 3 + (gimp-blend text-layer CUSTOM NORMAL LINEAR 100 0 REPEAT-NONE FALSE 0.2 3 padding padding (- text-width padding 1) @@ -123,19 +123,18 @@ ; Semicircle at the left (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img bg-layer) + (gimp-edit-fill bg-layer) (gimp-ellipse-select img 0 0 text-height text-height REPLACE TRUE FALSE 0) - (gimp-palette-set-background (car (gimp-color-picker img -1 text-layers-offset 0 TRUE FALSE))) - (gimp-edit-fill img bg-layer) + (gimp-palette-set-background (car (gimp-color-picker -1 text-layers-offset 0 TRUE FALSE))) + (gimp-edit-fill bg-layer) ; Fade-out gradient at the right (gimp-rect-select img (- img-width fade-width) 0 fade-width text-height REPLACE FALSE 0) (gimp-palette-set-foreground (car (gimp-palette-get-background))) (gimp-palette-set-background '(0 0 0)) - (gimp-blend img - bg-layer + (gimp-blend bg-layer FG-BG-RGB NORMAL LINEAR diff --git a/plug-ins/script-fu/scripts/trochoid.scm b/plug-ins/script-fu/scripts/trochoid.scm index f17059b020..d095da426f 100644 --- a/plug-ins/script-fu/scripts/trochoid.scm +++ b/plug-ins/script-fu/scripts/trochoid.scm @@ -11,7 +11,7 @@ erase-before-draw brush-details) (if 'not-guile (define modulo fmod)) (define (floor x) (- x (fmod x 1))) - (define *prime-table* + (define *prime-table* '(2 3 5 7 11 13 17 19 23 29 31 37 41 43 47 53 59 61 67 71 73 79 83 89 97)) (define (LCM x y) ; Least Common Multiple @@ -42,7 +42,7 @@ (set! prime? #f) (set! table (cdr table)))) (if prime? - (set! *prime-table* + (set! *prime-table* (nreverse (cons index (nreverse *prime-table*)))))) (set! index (+ index 1))))) (define (aux l1 l2 result) @@ -114,7 +114,7 @@ (let ((f 0) (p 0) (q 0) - (t 0)) + (t 0)) (set! hue (/ (* 6 h) 255)) (if (= hue 6.0) (set! hue 0.0)) @@ -229,14 +229,14 @@ (begin (gimp-brushes-set-paint-mode NORMAL) (gimp-palette-set-foreground background-color) - (gimp-airbrush img drawable-to-erase 100 + (gimp-airbrush drawable-to-erase 100 (* 2 limit) (segment-strokes segment)) (gimp-brushes-set-paint-mode paint-mode)) - (gimp-eraser img drawable-to-erase (* 2 limit) + (gimp-eraser drawable-to-erase (* 2 limit) (segment-strokes segment))) (if (< keep-opacity 100) (gimp-brushes-set-opacity keep-opacity)))) (gimp-palette-set-foreground rgb) - (gimp-airbrush img drawable 100 (* 2 limit) (segment-strokes segment))) + (gimp-airbrush drawable 100 (* 2 limit) (segment-strokes segment))) (define (set-brush-color! index max-index hue-rate rgb hsv) (if (= 0 hue-rate) @@ -272,7 +272,7 @@ (iindex 0) (center2wheel (+ base-radius wheel-radius)) (wheel2pen (* (abs wheel-radius) pen-pos)) - (segment (make-segment + (segment (make-segment (if (= 0 hue-rate) 32 (max 4 (floor (/ (/ total-step (abs hue-rate)) 255.0)))) @@ -292,7 +292,7 @@ (gimp-layer-set-name drawable (string-append "cricle " (number->string loop-num))) - (gimp-edit-clear img drawable))) + (gimp-edit-clear drawable))) (while (< iindex steps-for-a-loop) ; draw a circle (set! rad-of-wheel (* rad-of-step index)) (if (update-segment! center-x center-y @@ -353,7 +353,7 @@ (old-rgb (car (gimp-palette-get-foreground)))) (gimp-image-disable-undo img) (gimp-image-add-layer img BG-layer 0) - (gimp-edit-fill img BG-layer) + (gimp-edit-fill BG-layer) (if (<= 0 erase-before-draw) ; HDDN FTR (2SLW) (begin (set! the-layer (car (gimp-layer-new img drawable-size drawable-size @@ -361,8 +361,8 @@ 100 NORMAL))) (gimp-image-add-layer img the-layer 0) (if (= NORMAL old-paint-mode) - (gimp-edit-clear img the-layer) - (gimp-edit-fill img the-layer))) + (gimp-edit-clear the-layer) + (gimp-edit-fill the-layer))) (begin (set! layer-paint-mode (- 1 erase-before-draw)) (gimp-image-set-active-layer img BG-layer))) @@ -381,7 +381,7 @@ (gimp-image-enable-undo img) (gimp-displays-flush))) -(script-fu-register "script-fu-trochoid" +(script-fu-register "script-fu-trochoid" "/Xtns/Script-Fu/Patterns/Trochoid" "Draw Trochoid Curve" "Shuji Narazaki " diff --git a/plug-ins/script-fu/scripts/truchet.scm b/plug-ins/script-fu/scripts/truchet.scm index 3c27dffa70..30d83b20f0 100644 --- a/plug-ins/script-fu/scripts/truchet.scm +++ b/plug-ins/script-fu/scripts/truchet.scm @@ -30,8 +30,8 @@ (gimp-ellipse-select img (- cx rx) (- cy ry) (+ rx rx ) (+ ry ry ) op aa feather frad)) (define (use-tiles img drawable height width img2 drawable2 xoffset yoffset) - (gimp-edit-copy img2 drawable2) - (let ((floating-sel (car (gimp-edit-paste img drawable FALSE)))) + (gimp-edit-copy drawable2) + (let ((floating-sel (car (gimp-edit-paste drawable FALSE)))) (gimp-layer-set-offsets floating-sel xoffset yoffset) (gimp-floating-sel-anchor floating-sel) ) @@ -47,17 +47,17 @@ (gimp-selection-all img) (gimp-palette-set-background backcolor) - (gimp-edit-fill img drawable1) + (gimp-edit-fill drawable1) (let* ( (tempSize (* size 3)) - (temp-img (car (gimp-image-new tempSize tempSize RGB))) + (temp-img (car (gimp-image-new tempSize tempSize RGB))) (temp-draw (car (gimp-layer-new temp-img tempSize tempSize RGB_IMAGE "Jabar" 100 NORMAL))) ) (gimp-image-disable-undo temp-img) (gimp-image-add-layer temp-img temp-draw 0) (gimp-palette-set-background backcolor) - (gimp-edit-fill temp-img temp-draw) + (gimp-edit-fill temp-draw) (center-ellipse temp-img size size outer-radius outer-radius REPLACE TRUE FALSE 0) @@ -66,7 +66,7 @@ (center-ellipse temp-img (* size 2) (* size 2) outer-radius outer-radius ADD TRUE FALSE 0) (center-ellipse temp-img (* size 2) (* size 2) inner-radius inner-radius SUB TRUE FALSE 0) (gimp-palette-set-background forecolor) - (gimp-edit-fill temp-img temp-draw) + (gimp-edit-fill temp-draw) (gimp-selection-none temp-img) @@ -75,26 +75,26 @@ (gimp-selection-all temp-img) - (gimp-edit-copy temp-img temp-draw) - (let ((floating-sel (car (gimp-edit-paste img drawable2 FALSE)))) + (gimp-edit-copy temp-draw) + (let ((floating-sel (car (gimp-edit-paste drawable2 FALSE)))) (gimp-floating-sel-anchor floating-sel)) - (let ((floating-sel (car (gimp-edit-paste img drawable1 FALSE)))) + (let ((floating-sel (car (gimp-edit-paste drawable1 FALSE)))) (gimp-floating-sel-anchor floating-sel)) - (let ((drawble (car (gimp-flip img drawable1 0))))) + (let ((drawble (car (gimp-flip drawable1 0))))) ;(gimp-display-new temp-img) (gimp-image-delete temp-img) ) ) -) +) (define (script-fu-truchet size thickness backcolor forecolor xtiles ytiles) - (let* ( + (let* ( (width (* size xtiles)) (height (* size ytiles)) (img (car (gimp-image-new width height RGB))) @@ -103,7 +103,7 @@ (tiledraw1 (car (gimp-layer-new tile size size RGB "Johnson" 100 NORMAL))) (tiledraw2 (car (gimp-layer-new tile size size RGB "Cooper" 100 NORMAL))) (Xindex 0) - (Yindex 0) + (Yindex 0) ) (gimp-image-disable-undo img) @@ -116,8 +116,8 @@ ;just to look a little better (gimp-selection-all img) - (gimp-palette-set-background backcolor) - (gimp-edit-fill img layer-one) + (gimp-palette-set-background backcolor) + (gimp-edit-fill layer-one) (gimp-selection-none img) (create-tiles tile tiledraw1 tiledraw2 size thickness backcolor forecolor) diff --git a/plug-ins/script-fu/scripts/unsharp-mask.scm b/plug-ins/script-fu/scripts/unsharp-mask.scm index 9e696e83a3..f3581b8172 100644 --- a/plug-ins/script-fu/scripts/unsharp-mask.scm +++ b/plug-ins/script-fu/scripts/unsharp-mask.scm @@ -12,7 +12,7 @@ (let* ((drawable-width (car (gimp-drawable-width drw))) (drawable-height (car (gimp-drawable-height drw))) (new-image (car (gimp-image-new drawable-width drawable-height RGB))) - (original-layer (car (gimp-layer-new new-image + (original-layer (car (gimp-layer-new new-image drawable-width drawable-height RGB "Original" 100 NORMAL))) (original-layer-for-darker #f) @@ -22,10 +22,10 @@ (darker-layer #f) (lighter-layer #f)) (gimp-selection-all img) - (gimp-edit-copy img drw) + (gimp-edit-copy drw) (gimp-image-disable-undo new-image) (gimp-floating-sel-anchor - (car (gimp-edit-paste new-image original-layer FALSE))) + (car (gimp-edit-paste original-layer FALSE))) (gimp-image-add-layer new-image original-layer 0) (set! original-layer-for-darker (car (gimp-layer-copy original-layer TRUE))) (set! original-layer-for-lighter (car (gimp-layer-copy original-layer TRUE))) diff --git a/plug-ins/script-fu/scripts/waves-anim.scm b/plug-ins/script-fu/scripts/waves-anim.scm index 029d40297c..434cd6827e 100644 --- a/plug-ins/script-fu/scripts/waves-anim.scm +++ b/plug-ins/script-fu/scripts/waves-anim.scm @@ -29,10 +29,10 @@ ; as if a stone was thrown into the image. The animation may be saved with ; the gif-plug-in. -(define (script-fu-waves-anim img - drawable - amplitude - wavelength +(define (script-fu-waves-anim img + drawable + amplitude + wavelength num-frames invert) (let* ((amplitude (max 0 amplitude)) @@ -51,40 +51,40 @@ (while (> remaining-frames 1) (let* ((waves-layer (car (gimp-layer-copy source-layer TRUE))) - (layer-name (string-append "Frame " + (layer-name (string-append "Frame " (number->string - (- (+ num-frames 2) + (- (+ num-frames 2) remaining-frames) 10)))) (gimp-layer-set-preserve-trans waves-layer FALSE) (gimp-image-add-layer image waves-layer -1) (gimp-layer-set-name waves-layer layer-name) - (plug-in-waves 1 - image + (plug-in-waves 1 + image waves-layer - amplitude - phase - wavelength - 0 + amplitude + phase + wavelength + 0 FALSE) (set! remaining-frames (- remaining-frames 1)) (set! phase (- phase phaseshift)))) (gimp-layer-set-name source-layer "Frame 1") - (plug-in-waves 1 - image + (plug-in-waves 1 + image source-layer - amplitude - phase - wavelength - 0 + amplitude + phase + wavelength + 0 FALSE) (gimp-image-enable-undo image) (gimp-display-new image))) -(script-fu-register "script-fu-waves-anim" +(script-fu-register "script-fu-waves-anim" "/Script-Fu/Animators/Waves" "Animate an image like a stone's been thrown into it" "Sven Neumann (neumanns@uni-duesseldorf.de)" diff --git a/plug-ins/script-fu/scripts/weave.scm b/plug-ins/script-fu/scripts/weave.scm index e1a1bae654..9fa3e03dd3 100644 --- a/plug-ins/script-fu/scripts/weave.scm +++ b/plug-ins/script-fu/scripts/weave.scm @@ -24,8 +24,8 @@ (define (copy-rectangle img drawable x1 y1 width height dest-x dest-y) (gimp-rect-select img x1 y1 width height REPLACE FALSE 0) - (gimp-edit-copy img drawable) - (let ((floating-sel (car (gimp-edit-paste img drawable FALSE)))) + (gimp-edit-copy drawable) + (let ((floating-sel (car (gimp-edit-paste drawable FALSE)))) (gimp-layer-set-offsets floating-sel dest-x dest-y) (gimp-floating-sel-anchor floating-sel)) (gimp-selection-none img)) @@ -41,7 +41,7 @@ (gimp-image-add-layer img drawable 0) (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img drawable) + (gimp-edit-fill drawable) ; Create main horizontal ribbon @@ -56,8 +56,7 @@ REPLACE FALSE 0) - (gimp-blend img - drawable + (gimp-blend drawable FG-BG-RGB NORMAL BILINEAR @@ -82,8 +81,7 @@ REPLACE FALSE 0) - (gimp-blend img - drawable + (gimp-blend drawable FG-BG-RGB NORMAL BILINEAR @@ -167,14 +165,14 @@ (gimp-image-add-layer img drawable 0) (gimp-palette-set-background '(0 0 0)) - (gimp-edit-fill img drawable) + (gimp-edit-fill drawable) (gimp-rect-select img r1-x1 r1-y1 r1-width r1-height REPLACE FALSE 0) (gimp-rect-select img r2-x1 r2-y1 r2-width r2-height ADD FALSE 0) (gimp-rect-select img r3-x1 r3-y1 r3-width r3-height ADD FALSE 0) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img drawable) + (gimp-edit-fill drawable) (gimp-selection-none img) (gimp-image-enable-undo img) @@ -245,7 +243,7 @@ (dense (/ density 100.0))) (gimp-image-add-layer img drawable -1) (gimp-palette-set-background '(255 255 255)) - (gimp-edit-fill img drawable) + (gimp-edit-fill drawable) (plug-in-noisify 1 img drawable FALSE dense dense dense dense) (plug-in-c-astretch 1 img drawable) (cond ((eq? orientation 'horizontal) @@ -284,17 +282,17 @@ (gimp-image-add-layer-mask w-img h-layer h-mask) (gimp-selection-all hm-img) - (gimp-edit-copy hm-img hm-layer) + (gimp-edit-copy hm-layer) (gimp-image-delete hm-img) - (gimp-floating-sel-anchor (car (gimp-edit-paste w-img h-mask FALSE))) + (gimp-floating-sel-anchor (car (gimp-edit-paste h-mask FALSE))) (gimp-layer-set-opacity h-layer thread-intensity) (gimp-layer-set-mode h-layer MULTIPLY) (gimp-image-add-layer-mask w-img v-layer v-mask) (gimp-selection-all vm-img) - (gimp-edit-copy vm-img vm-layer) + (gimp-edit-copy vm-layer) (gimp-image-delete vm-img) - (gimp-floating-sel-anchor (car (gimp-edit-paste w-img v-mask FALSE))) + (gimp-floating-sel-anchor (car (gimp-edit-paste v-mask FALSE))) (gimp-layer-set-opacity v-layer thread-intensity) (gimp-layer-set-mode v-layer MULTIPLY) @@ -336,9 +334,9 @@ (w-layer (cadr weaving))) (gimp-selection-all w-img) - (gimp-edit-copy w-img w-layer) + (gimp-edit-copy w-layer) (gimp-image-delete w-img) - (let ((floating-sel (car (gimp-edit-paste d-img drawable FALSE)))) + (let ((floating-sel (car (gimp-edit-paste drawable FALSE)))) (gimp-layer-set-offsets floating-sel (car d-offsets) (cadr d-offsets)) @@ -363,7 +361,7 @@ SF-ADJUSTMENT "Ribbon width" '(30 0 256 1 10 1 1) SF-ADJUSTMENT "Ribbon spacing" '(10 0 256 1 10 1 1) SF-ADJUSTMENT "Shadow darkness" '(75 0 100 1 10 1 1) - SF-ADJUSTMENT "Shadow depth" '(75 0 100 1 10 1 1) + SF-ADJUSTMENT "Shadow depth" '(75 0 100 1 10 1 1) SF-ADJUSTMENT "Thread length" '(200 0 256 1 10 1 1) SF-ADJUSTMENT "Thread density" '(50 0 100 1 10 1 1) SF-ADJUSTMENT "Thread intensity" '(100 0 512 1 10 1 1)) diff --git a/plug-ins/script-fu/scripts/xach-effect.scm b/plug-ins/script-fu/scripts/xach-effect.scm index 9109384224..ce31fd798c 100644 --- a/plug-ins/script-fu/scripts/xach-effect.scm +++ b/plug-ins/script-fu/scripts/xach-effect.scm @@ -43,7 +43,7 @@ (let* ((ds-blur (max ds-blur 0)) (ds-opacity (min ds-opacity 100)) (ds-opacity (max ds-opacity 0)) - (new-color (list (red green blue))) + (new-color (list (red green blue))) (type (car (gimp-drawable-type-with-alpha drawable))) (image-width (car (gimp-image-width image))) (hl-opacity (list hl-opacity-comp hl-opacity-comp hl-opacity-comp)) @@ -57,10 +57,10 @@ (if (= (car (gimp-selection-is-empty image)) TRUE) (begin - (gimp-selection-layer-alpha image drawable) + (gimp-selection-layer-alpha drawable) (set! active-selection (car (gimp-selection-save image))) (set! from-selection FALSE)) - (begin + (begin (set! from-selection TRUE) (set! active-selection (car (gimp-selection-save image))))) @@ -69,21 +69,21 @@ (gimp-selection-none image) - (gimp-edit-clear image hl-layer) - (gimp-selection-load image active-selection) + (gimp-edit-clear hl-layer) + (gimp-selection-load active-selection) (gimp-palette-set-background hl-color) - (gimp-edit-fill image hl-layer) + (gimp-edit-fill hl-layer) (gimp-selection-translate image hl-offset-x hl-offset-y) - (gimp-edit-fill image hl-layer) + (gimp-edit-fill hl-layer) (gimp-selection-none image) - (gimp-selection-load image active-selection) + (gimp-selection-load active-selection) (set! mask (car (gimp-layer-create-mask hl-layer WHITE-MASK))) (gimp-image-add-layer-mask image hl-layer mask) (gimp-palette-set-background hl-opacity) - (gimp-edit-fill image mask) + (gimp-edit-fill mask) (set! shadow-layer (car (gimp-layer-new image image-width @@ -94,15 +94,15 @@ NORMAL))) (gimp-image-add-layer image shadow-layer -1) (gimp-selection-none image) - (gimp-edit-clear image shadow-layer) - (gimp-selection-load image active-selection) + (gimp-edit-clear shadow-layer) + (gimp-selection-load active-selection) (gimp-selection-translate image ds-offset-x ds-offset-y) (gimp-palette-set-background ds-color) - (gimp-edit-fill image shadow-layer) + (gimp-edit-fill shadow-layer) (gimp-selection-none image) (plug-in-gauss-rle 1 image shadow-layer ds-blur TRUE TRUE) - (gimp-selection-load image active-selection) - (gimp-edit-clear image shadow-layer) + (gimp-selection-load active-selection) + (gimp-edit-clear shadow-layer) (gimp-image-lower-layer image shadow-layer)