From a9c08e799500d19e9dcc9d9eb46a70f8478b8499 Mon Sep 17 00:00:00 2001 From: David Aspinall Date: Thu, 24 Jun 1999 13:53:19 +0000 Subject: Updates and new images --- images/Makefile | 11 ++++-- images/ProofGeneral.8bit.gif | Bin 10074 -> 16547 bytes images/ProofGeneral.gif | Bin 18306 -> 34550 bytes images/ProofGeneral.jpg | Bin 5461 -> 12002 bytes images/ProofGeneral.xcf | Bin 160011 -> 212954 bytes images/coq-badge.xcf | Bin 0 -> 120521 bytes images/gimp/scripts/proofgeneral.scm | 5 ++- images/isabelle-badge.xcf | Bin 0 -> 157845 bytes images/lego-badge.xcf | Bin 0 -> 135157 bytes images/notes.txt | 73 +++++++++++++++++++++++++++++------ images/pg-text.8bit.gif | Bin 0 -> 5859 bytes images/pg-text.gif | Bin 0 -> 13428 bytes images/pg-text.jpg | Bin 0 -> 7784 bytes images/pg-text.xcf | Bin 0 -> 81232 bytes 14 files changed, 72 insertions(+), 17 deletions(-) create mode 100644 images/coq-badge.xcf create mode 100644 images/isabelle-badge.xcf create mode 100644 images/lego-badge.xcf create mode 100644 images/pg-text.8bit.gif create mode 100644 images/pg-text.gif create mode 100644 images/pg-text.jpg create mode 100644 images/pg-text.xcf (limited to 'images') diff --git a/images/Makefile b/images/Makefile index 62e5943a..a5f35f56 100644 --- a/images/Makefile +++ b/images/Makefile @@ -20,11 +20,14 @@ # Sources BUTTONS=goal.xcf next.xcf qed.xcf restart.xcf retract.xcf undo.xcf use.xcf -WEBPIX=isabelle_transparent.xcf ProofGeneral.xcf text_general.xcf text_proof.xcf +WEBPIX=isabelle_transparent.xcf ProofGeneral.xcf pg-text.xcf # Targets for html directory WEBPIX_ONLY= -WEBPIX_TARGETS=$(WEBPIX_ONLY) ProofGeneral.jpg text_general.gif text_proof.gif +WEBPIX_TARGETS=$(WEBPIX_ONLY) ProofGeneral.jpg pg-text.gif +# Targets for doc directory +DOCPIX_TARGETS=ProofGeneral.jpg + # Junk not wanted UNWANTED=text_general.jpg text_proof.jpg @@ -66,7 +69,9 @@ clean: rm -f $(WEBPIX_ONLY) $(UNWANTED) install: webpix - cp -pf $(WEBPIX_TARGETS) ../html + cp -pf $(WEBPIX_TARGETS) ../html/images + cp -pf $(DOCPIX_TARGETS) ../doc + ## ## Batch mode is a bit broken on The Gimp at the moment (v 1.0) ## For script fu, at least, it seems tricky to pass arguments to diff --git a/images/ProofGeneral.8bit.gif b/images/ProofGeneral.8bit.gif index 7aab1cae..dfb182be 100644 Binary files a/images/ProofGeneral.8bit.gif and b/images/ProofGeneral.8bit.gif differ diff --git a/images/ProofGeneral.gif b/images/ProofGeneral.gif index a67429f7..ed91610c 100644 Binary files a/images/ProofGeneral.gif and b/images/ProofGeneral.gif differ diff --git a/images/ProofGeneral.jpg b/images/ProofGeneral.jpg index 2b23f03b..6d5bfbfe 100644 Binary files a/images/ProofGeneral.jpg and b/images/ProofGeneral.jpg differ diff --git a/images/ProofGeneral.xcf b/images/ProofGeneral.xcf index 27c1b4ef..d651749d 100644 Binary files a/images/ProofGeneral.xcf and b/images/ProofGeneral.xcf differ diff --git a/images/coq-badge.xcf b/images/coq-badge.xcf new file mode 100644 index 00000000..98ba6ded Binary files /dev/null and b/images/coq-badge.xcf differ diff --git a/images/gimp/scripts/proofgeneral.scm b/images/gimp/scripts/proofgeneral.scm index 9491655e..7c67d5b5 100644 --- a/images/gimp/scripts/proofgeneral.scm +++ b/images/gimp/scripts/proofgeneral.scm @@ -66,7 +66,8 @@ ;; Flatten and save as jpg ;;(gimp-image-flatten image) ;; Flattening forces a white background. Let's use merge. - (gimp-image-merge-visible-layers image 0) + (if (> (car (gimp-image-get-layers image)) 1) + (gimp-image-merge-visible-layers image 0)) (file-jpeg-save 1 image (car (gimp-image-active-drawable image)) jpgname jpgname 0.75 0 1) @@ -96,7 +97,7 @@ (define (script-fu-proofgeneral-save-all-pix) (mapcar script-fu-proofgeneral-save-pic - '("ProofGeneral" "text_proof" "text_general"))) + '("ProofGeneral" "pg-text"))) (script-fu-register "script-fu-proofgeneral-save-all-jpegs" "/Xtns/Script-Fu/Proof General/Save all Jpegs" diff --git a/images/isabelle-badge.xcf b/images/isabelle-badge.xcf new file mode 100644 index 00000000..ad5de7bd Binary files /dev/null and b/images/isabelle-badge.xcf differ diff --git a/images/lego-badge.xcf b/images/lego-badge.xcf new file mode 100644 index 00000000..c0a2985d Binary files /dev/null and b/images/lego-badge.xcf differ diff --git a/images/notes.txt b/images/notes.txt index c58eafc3..2d4e0a9a 100644 --- a/images/notes.txt +++ b/images/notes.txt @@ -1,11 +1,16 @@ $Id$ -Notes about icons here (not for distribution). -============================================== +Notes about how I made the icons and logos here (not for distribution). +======================================================================== + David Aspinall -Icons to fit on the (default size) Emacs toolbars are 32x32. -The ones with pictures were made at 256x256, then shrunk -to have text added. +ICONS +===== + +Made with the Gimp. + +Icons to fit on the (default size) Emacs toolbars are 32x32. The ones +with pictures were made at 256x256, then shrunk to have text added. Background grey is V74. Red for buttons is 135,13,13. @@ -20,9 +25,10 @@ Text is lucidafax at point size 8. blank.xcf -- blank with correct background colour. ---- +LOGOS +===== -Proof general Text logo: +Original text logo: script fu -> logos -> comic book @@ -33,15 +39,58 @@ script fu -> logos -> comic book Then I filled background with web page colour, and shaded portion with green colour. + +New text logo: same font, but made in blender file. ----- -Proof general logo: +Proof general logos +=================== + +Web page: scene with canvas backdrop. Render in blender at full size, +then use gimp to scale to web size (250pix wide). This gives much +nicer result than low-resolution render: textures are smoothed out +more prettily. -Saved as eps for texi documentation. +EPS (doc/ProofGeneral.eps): For texi documentation. Used another, +wider image with alpha channel to (attempt to) leave background white +on printed page. Post processing with gimp to add fuzzy border and +white background since eps (gimp?) can't handle alpha channel. + + Width 5.00 " + Height 7.87 (wrong, obviously: 3.48 is right by scaling) + + But: this is *page* size! The image size itself + was square, I think. + Size of tiff image is 904x903. - Width 3.00 " - Height 7.87 (keep aspect ration checked, height not edited though) X-offset 2.8 " Y-offset 1.0 " Rotation: 0 + +Actually, Y-offset seems to have no effect on page position: what +happens is that tex compensates for the offset when it inserts the +image! Changing the offset and retexing puts the image back where TeX +wants it. Probably same true for X offset. + +Solving the size problem: original .eps is 8.4M. (Original xcf file +is missing/not saved). + +Test procedure: + + 1. render at 239dpi (original file seems to have 1200x1200 image in + it, this is closest I can get, makes 1199x1199 image). + 2. save as pnm (gives 4.1M file) + 3. Run pnmtoeps with -rle argument to get run length encoding. (4.1M) + 4. gzip -9 -> gives 1.6M file. + +Just using gzip directly gives 1.6M file anyway. +tiff is 1.5M. png is 1.2M. bz2 is 1.3M. + +Okay, so we'll distribute the original .eps file, gzipped. +(It gets zipped inside the tar file anyway, of course, but +leaving it zipped is less polluting). + +Badges +====== + +These were cut out from a close-up view of Proof General's chest. diff --git a/images/pg-text.8bit.gif b/images/pg-text.8bit.gif new file mode 100644 index 00000000..faf44286 Binary files /dev/null and b/images/pg-text.8bit.gif differ diff --git a/images/pg-text.gif b/images/pg-text.gif new file mode 100644 index 00000000..046fe760 Binary files /dev/null and b/images/pg-text.gif differ diff --git a/images/pg-text.jpg b/images/pg-text.jpg new file mode 100644 index 00000000..e2f1d5e3 Binary files /dev/null and b/images/pg-text.jpg differ diff --git a/images/pg-text.xcf b/images/pg-text.xcf new file mode 100644 index 00000000..5f823f65 Binary files /dev/null and b/images/pg-text.xcf differ -- cgit v1.2.3