Changed to build gif files for text logo.

5 files changed, 23 insertions, 11 deletions

diff --git a/images/Makefile b/images/Makefile
index 468c294e..146b4aa5 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -18,10 +18,15 @@
 ## 
 ###########################################################################
 
+# Sources
 BUTTONS=goal.xcf next.xcf qed.xcf restart.xcf retract.xcf undo.xcf use.xcf
 WEBPIX=ProofGeneral.xcf text_general.xcf text_proof.xcf
-WEBPIX_ONLY=text_general.jpg text_proof.jpg
-WEBPIX_TARGETS=$(WEBPIX_ONLY) ProofGeneral.jpg
+
+# Targets for html directory
+WEBPIX_ONLY=
+WEBPIX_TARGETS=$(WEBPIX_ONLY) ProofGeneral.jpg text_general.gif text_proof.gif
+# Junk not wanted
+UNWANTED=text_general.jpg text_proof.jpg
 
 CWD=$(shell pwd)
 GIMP_DIRECTORY=$(CWD)/gimp
@@ -33,15 +38,14 @@ default: all
 
 all: buttons webpix
 
-dist:   all install clean
-	rm -f $(WEBPIX_ONLY)
+dist:   all install distclean
 
 buttons: $(BUTTONS)
 	$(GIMP) '(script-fu-proofgeneral-make-all-buttons 1)' '(gimp-quit 0)'
 	touch buttons
 
 webpix: $(WEBPIX)
-	$(GIMP) '(script-fu-proofgeneral-save-all-jpegs 1)' '(gimp-quit 0)'
+	$(GIMP) '(script-fu-proofgeneral-save-all-pix 1)' '(gimp-quit 0)'
 	touch webpix
 
 cvsclean: clean
@@ -57,6 +61,7 @@ distclean: clean
 
 clean:
 	rm -f buttons webpix gimp/pluginrc
+	rm -f $(WEBPIX_ONLY) $(UNWANTED)
 
 install: webpix
 	cp -pf $(WEBPIX_TARGETS) ../html
diff --git a/images/ProofGeneral.gif b/images/ProofGeneral.gif
index 92cd79e1..3920d796 100644
--- a/images/ProofGeneral.gif
+++ b/images/ProofGeneral.gif
diff --git a/images/gimp/scripts/proofgeneral.scm b/images/gimp/scripts/proofgeneral.scm
index e1cc236b..f2a912da 100644
--- a/images/gimp/scripts/proofgeneral.scm
+++ b/images/gimp/scripts/proofgeneral.scm
@@ -57,21 +57,28 @@
 		    "1998/10/04"
 		    "")
 
-(define (script-fu-proofgeneral-save-jpg imgname)
+(define (script-fu-proofgeneral-save-pic imgname)
   (let* ((filename (string-append imgname ".xcf"))
 	 (image    (car (gimp-file-load 1 filename filename)))
 	 (jpgname  (string-append imgname ".jpg"))
-	 (gifname  (string-append imgname ".gif")))
+	 (gifname  (string-append imgname ".gif"))
+	 (poorgifname  (string-append imgname ".8bit.gif")))
     ;; Flatten and save as jpg
     (gimp-image-flatten image)
     (file-jpeg-save 1 image (car (gimp-image-active-drawable image))
 		    jpgname jpgname
 		    0.75 0 1)
-    ;; Poor jpegs for display in XEmacs, limit to 10 colours.
-    (gimp-convert-indexed image 1 10)
+    ;; gif with full palette
+    (gimp-convert-indexed image 1 256)
     (file-gif-save 1 image (car (gimp-image-active-drawable image))
 		    gifname gifname
 		    FALSE FALSE 0 0)
+    ;; gif with impoverished palette for display in XEmacs
+    (gimp-convert-rgb image)
+    (gimp-convert-indexed image 1 15)
+    (file-gif-save 1 image (car (gimp-image-active-drawable image))
+		    poorgifname poorgifname
+		    FALSE FALSE 0 0)
     ;; Finish
     (gimp-image-delete image)
     ))
@@ -85,8 +92,8 @@
 		    SF-VALUE "Basename" "\"test\"")
 
 
-(define (script-fu-proofgeneral-save-all-jpegs)
-  (mapcar script-fu-proofgeneral-save-jpg
+(define (script-fu-proofgeneral-save-all-pix)
+  (mapcar script-fu-proofgeneral-save-pic
 	  '("ProofGeneral" "text_proof" "text_general")))
 
 (script-fu-register "script-fu-proofgeneral-save-all-jpegs" 
diff --git a/images/text_general.gif b/images/text_general.gif
index 10e5b41b..dd4b54fb 100644
--- a/images/text_general.gif
+++ b/images/text_general.gif
diff --git a/images/text_proof.gif b/images/text_proof.gif
index 7e9f346a..b40a088b 100644
--- a/images/text_proof.gif
+++ b/images/text_proof.gif