Include higher-resolution icons

Load icons as TIFF with multiple images (for different resolutions).

Conflicts:

	Makefile.in
	aquamacs/src/site-lisp/aquamacs-tool-bar.el
	lisp/tool-bar.el
	src/nsimage.m

Makefile.in

@@ -449,7 +449,7 @@ AQUAMACS_APPLE_VERSION=${AQUAMACS_MAIN_VERSION}.${HEADDATE}# string with integer
 
 install-aquamacs: mkdir 
 	if test "${ns_appdir}" != ""; then \
-	( cp $(AQUAMACS_DIR)/Icons/build/*.png $(ns_appresdir)/etc/images/ ; \
+	( cp $(AQUAMACS_DIR)/Icons/build/*.tiff $(AQUAMACS_DIR)/Icons/build/*.png $(ns_appresdir)/etc/images/ ; \
 	  cd $(ns_appresdir) ; \
 	  cp -r $(AQUAMACS_DIR)/src/commandline-tool/Aquamacs\ Command\ Line\ Tool.mpkg .; \
 	  cd - >/dev/null ; \
@@ -518,26 +518,26 @@ install-arch-indep: mkdir info install-etc
 	  [ -d $${dir} ] \
 	  && [ `(cd $${dir} && /bin/pwd)` != `(cd $${dest} && /bin/pwd)` ] \
 	  && (echo "Copying $${dir} to $${dest}..." ; \
-	      (cd $${dir}; tar -chf - . ) \
-		| (cd $${dest}; umask 022; \
+	  (cd $${dir}; tar -chf - . ) \
+	    | (cd $${dest}; umask 022; \
                    tar -xf - && cat > /dev/null) || exit 1; \
 	      find $${dest} -exec chown $${installuser} {} ';' ;\
 	      for subdir in `find $${dest} -type d ! -name RCS ! -name CVS -print` ; do \
 		chmod a+rx $${subdir} ; \
 		rm -rf $${subdir}/RCS ; \
 		rm -rf $${subdir}/CVS ; \
 		rm -f  $${subdir}/.cvsignore ; \
-		rm -f  $${subdir}/.gitignore ; \
-		rm -f  $${subdir}/.arch-inventory ; \
-		rm -f  $${subdir}/.DS_Store ; \
-		rm -f  $${subdir}/\#* ; \
-		rm -f  $${subdir}/.\#* ; \
-		rm -f  $${subdir}/*~ ; \
-		rm -f  $${subdir}/*.orig ; \
+	    rm -f $${subdir}/.gitignore ; \
+	    rm -f $${subdir}/.arch-inventory ; \
+	    rm -f $${subdir}/.DS_Store ; \
+	    rm -f $${subdir}/\#* ; \
+	    rm -f $${subdir}/.\#* ; \
+	    rm -f $${subdir}/*~ ; \
+	    rm -f $${subdir}/*.orig ; \
 		[ "$${dir}" != "${srcdir}/etc" ] && \
 		 rm -f $${subdir}/[mM]akefile*.c $${subdir}/[mM]akefile*[.-]in \
 		   $${subdir}/[mM]akefile ; \
-		rm -f  $${subdir}/ChangeLog* ; \
+	    rm -f $${subdir}/ChangeLog* ; \
 		rm -f  $${subdir}/dired.todo ; \
 	      done) ; \
 	done
@@ -573,7 +573,7 @@ install-arch-indep: mkdir info install-etc
 	   (cd ./etc; tar -chf - $${docfile}) \
 	     |(cd $(DESTDIR)${docdir}; umask 022; tar -xf - && cat > /dev/null) || exit 1; \
 	   (cd $(DESTDIR)$(docdir); \
-	    $(set_installuser); \
+	   $(set_installuser); \
 	    chown $${installuser} DOC*; chmod a+r DOC*; \
 	    if test "`echo DOC-*`" != "DOC-*"; then rm -f DOC; fi); \
 	else true; fi
@@ -618,7 +618,7 @@ install-arch-indep: mkdir info install-etc
 	        ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
 	        chmod a+r $(DESTDIR)${infodir}/$$f; \
 		test "$ff" != "dir" && test "${GZIP_PROG}" && \
-		   ${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \
+	        ${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \
 	      done; \
 	   done); \
 	else true; fi
@@ -628,8 +628,8 @@ install-arch-indep: mkdir info install-etc
 	then \
 	  for elt in $(INFO_FILES); do \
 	    test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
-	    (cd $${thisdir}; \
-	     ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
+	     (cd $${thisdir}; \
+	      ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
 	  done; \
 	else true; fi
 	-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
@@ -851,7 +851,7 @@ dist:
 
 .PHONY: info dvi dist check html
 
-info-real: 
+info-real:
 	(cd doc/emacs; $(MAKE) $(MFLAGS) info)
 	(cd doc/misc; $(MAKE) $(MFLAGS) info)
 	(cd doc/lispref; $(MAKE) $(MFLAGS) info)

aquamacs/Icons/build/COPYING

@@ -2,14 +2,27 @@ Aquamacs Icon set
 
 
 
-`new_window', `history', `tab_new', `view_bottom':
+`new_window', `tab_new', `view_bottom':
 
 	 (C) Copyright 2007, Nuovext project
 	 http://nuovext.pwsp.net/
 	 Licensed under the GPL. These icons may be redistributed
 	 under the GNU Public License 2.
 
-`Preferences', `update', `circle_stop', `bibtex', `pdftex', `tex':
+`history'
+
+	 (C) Copyright 2007, David Vignoni
+	 http://www.icon-king.com
+	 http://commons.wikimedia.org/wiki/File:Nuvola_apps_clock.png
+	 Licensed under the LGPL.
+
+`update'
+	(C) MySite Myway
+	http://icons.mysitemyway.com/black-white-pearls-icons-arrows/#full-set
+	free license
+
+
+`Preferences', `circle_stop', `bibtex', `pdftex', `tex':
 
 	(C) Copyright 2007 by Jasper Hauser 
 	All rights reserved.

aquamacs/Icons/make-xpm

@@ -64,7 +64,10 @@ do
 
 #convert  "$P/$file" -resize x32 $file
 convert "$P/$file"  -resize x28 -matte -bordercolor none -border 2 $file
-
+convert "$P/$file"  -matte -bordercolor none -border 2 $BASE\@2x.png
+convert $file $BASE\@2x.png $BASE.tiff
+rm $file $BASE\@2x.png
+# tiffutil won't work due to a conflict between libjpeg and libJPEG
 
 #convert p2.png -resize x32  /Applications/Aquamacs\ Emacs.app/Contents/Resources/etc/images/print.png
 

aquamacs/doc/latex/changelog.tex

@@ -8,6 +8,7 @@ \subsection{Changes--- dev}
 \item S-tab no longer mapped to C-y (ASCII 25, end of medium). Now properly handled as backtab.  Patch by Gracjan Polak.
 \item Full-screen now supports the standard Mac OS X 10.7 ``Lion'' full-screen mode:  The frame takes up the full (main) display and uses its own screen.  Users may switch between screens as usual (mouse swipe or C-left/right, for instance).  The old-style fullscreen mode is still available, however.  To maximize a frame on the current space, allowing other frames on this space, type C-u A-S-Return, or prepend any of the commands that enter fullscreen mode with C-u.
 Thanks for research: Sandy Patterson and Daisuke Murase.
+\item Retina displays are now supported (higher-resolution artwork is included in most cases).
 \item Aquamacs now provides experimental session persistency:  you can load and save sessions.  Use the new {\em Load Session, Save Session As} menu entries in the {\em File} menu to use these new functions.  Note: Unlike the formerly available functions from the `desktop' package, all frames, windows, tabs, buffers and some customizations are saved.  Buffers not linked to a file, such as those showing processes, will not be restored, and frames may not end up on the same space at this time.  Aquamacs now includes an adapted version of the {\tt revive.el} package by Hirose Yuuji.  We recommend that you do not load a different version of this package yourself.
 % , and under Mac OS X 10.7 or later, sessions are reguarily saved and restored in case of unexpected program termination or reboot
 % and the new customization variable `revive-desktop-after-launching' to turn the behavior off, or enable automatic session persistency even on pre-Lion operating systems

aquamacs/src/site-lisp/aquamacs-tool-bar.el

@@ -116,7 +116,9 @@
 			:image (vector img img) ;; 1st: Emacs, 2nd: XEma
 			:help ""))))))
    (reverse (cdr keymap))) meaning))
-
+
+(require 'image)
+
 ;; this to overwrite the tool-bar setup function
 ;  (aquamacs-tool-bar-setup)
 (defun aquamacs-tool-bar-setup ()

lisp/tool-bar.el

@@ -93,6 +93,9 @@ E.g. foo_dis.xpm becomes foo_sel.xpm if EXTENSION is '_sel'."
 			  nil
 			(list :type 'xpm :file
                               (concat "low-color/" icon ".xpm"))))
+	 (tiff-spec (if (image-type-available-p 'png)
+		       (list :type 'png :file (concat icon ".tiff") 
+			     :background "grey")))
 	 (png-spec (if (image-type-available-p 'png)
 		       (list :type 'png :file (concat icon ".png") 
 			     :background "grey")))
@@ -104,7 +107,7 @@ E.g. foo_dis.xpm becomes foo_sel.xpm if EXTENSION is '_sel'."
 	 ;; 		  (list png-spec xpm-lo-spec xpm-spec pbm-spec xbm-spec)
 	 ;; 		(list pbm-spec xbm-spec xpm-lo-spec xpm-spec)))
 	 (format-spec (if tool-bar-load-png-only
-			  (list png-spec)
+			  (list tiff-spec png-spec)
 			  (list png-spec xpm-lo-spec xpm-spec pbm-spec xbm-spec)))
 	 (image (find-image format-spec))
 	 (image-sel (find-image

src/nsimage.m

@@ -95,7 +95,7 @@ Updated by Christian Limpach (chris@nice.ch)
   else
     {
       NSData *data = [NSData dataWithBytes: SDATA (spec_data)
-                                    length: SBYTES (spec_data)];
+			    length: SBYTES (spec_data)];
       eImg = [[EmacsImage alloc] initWithData: data];
       [eImg setPixmapData];
     }