https://github.com/ImageMagick/ImageMagick/issues/163

diff --git a/Makefile.in b/Makefile.in
index 4836ecb29717965d40cecde6af758fde11714c9c..1bbf6193442fcd211eeb6cfdc060ccc664aaa985 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -3028,6 +3028,7 @@ configlib_DATA = \
        config/quantization-table.xml \
        config/thresholds.xml \
        config/type.xml \
+       config/type-apple.xml \
        config/type-dejavu.xml \
        config/type-ghostscript.xml \
        config/type-windows.xml
@@ -3051,6 +3052,7 @@ CONFIG_EXTRA_DIST = \
        config/quantization-table.xml \
        config/sRGB.icm \
        config/thresholds.xml \
+       config/type-apple.xml.in \
        config/type-dejavu.xml.in \
        config/type-ghostscript.xml.in \
        config/type-windows.xml.in \

diff --git a/config/Makefile.am b/config/Makefile.am
index ffe7aa6dee002d99e38c1520b4a5df110a4509c8..6f93a54d084b6295e616aff296743289f14aba50 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -42,6 +42,7 @@ configlib_DATA = \
        config/quantization-table.xml \
        config/thresholds.xml \
        config/type.xml \
+       config/type-apple.xml \
        config/type-dejavu.xml \
        config/type-ghostscript.xml \
        config/type-windows.xml
@@ -65,6 +66,7 @@ CONFIG_EXTRA_DIST = \
        config/quantization-table.xml \
        config/sRGB.icm \
        config/thresholds.xml \
+       config/type-apple.xml.in \
        config/type-dejavu.xml.in \
        config/type-ghostscript.xml.in \
        config/type-windows.xml.in \

diff --git a/configure b/configure
index 37b929a0e208ce876944dc09f4705814b8e5adb6..b431f166ed566350a070b83519ae1099feafcb2f 100755 (executable)
--- a/configure
+++ b/configure
@@ -4523,7 +4523,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_GIT_REVISION=17946:253f0a8:20160401
+MAGICK_GIT_REVISION=18000:b1b8626:20160409
 
 
 # Substitute library versioning

diff --git a/utilities/magick-script.1 b/utilities/magick-script.1
index 5d6360a3000cb490acdf91220138312a64e413fa..562f79865a57f831282468e5ec846340860e7b9e 100644 (file)
--- a/utilities/magick-script.1
+++ b/utilities/magick-script.1
@@ -1,13 +1,16 @@
 .TH magick 1 "Date: 2009/01/10 01:00:00" "ImageMagick"
 .SH NAME
-magick \- convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more.
+magick-script \- scripting language that converts between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more.
 .SH SYNOPSIS
 .TP
-\fBmagick\fP [\fIinput-options\fP] \fIinput-file\fP [\fIoutput-options\fP] \fIoutput-file\fP
+\fBmagick-script\fP [\fIinput-options\fP] \fIinput-file\fP [\fIoutput-options\fP] \fIoutput-file\fP
 .SH OVERVIEW
-The \fBmagick\fP program is a member of the ImageMagick(1) suite of tools.  Use it to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more.  
+The \fBmagick-script\fP program is a member of the ImageMagick(1) suite of tools.  Use it to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more.  Here is an example script:
 
-For more information about the magick command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/convert.html or http://www.imagemagick.org/script/convert.php.
+    #!/bin/env magick-script
+    -size 100x100 xc:red ( rose: -rotate -90 ) +append  -write show:
+
+For more information about the magick-script command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/magick-script.html or http://www.imagemagick.org/script/magick-script.php.
 .SH DESCRIPTION
 Image Settings:
   \-adjoin              join images into a single multi-image file