Updated ImageMagick, plus multiple bug fixes

Author: N-Holzschuch

Resources/commandDictionary.plist

@@ -821,6 +821,13 @@
 		<string></string>
 		<string>file</string>
 	</array>
+	<key>magick</key>
+	<array>
+		<string>magick.framework/magick</string>
+		<string>main</string>
+		<string></string>
+		<string>file</string>
+	</array>
 	<key>magick-script</key>
 	<array>
 		<string>magick.framework/magick</string>

Resources_mini/commandDictionary.plist

@@ -814,6 +814,13 @@
 		<string></string>
 		<string>file</string>
 	</array>
+	<key>magick</key>
+	<array>
+		<string>magick.framework/magick</string>
+		<string>main</string>
+		<string></string>
+		<string>file</string>
+	</array>
 	<key>magick-script</key>
 	<array>
 		<string>magick.framework/magick</string>

a-Shell.xcodeproj/project.pbxproj

@@ -2118,6 +2118,7 @@
 		22DE173D2653DC960031A029 /* make.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = make.xcframework; path = xcfs/.build/artifacts/xcfs/make.xcframework; sourceTree = SOURCE_ROOT; };
 		22DF4FEE26E25AEA00E5A0F5 /* texmf.cnf */ = {isa = PBXFileReference; lastKnownFileType = text; name = texmf.cnf; path = Resources/texmf.cnf; sourceTree = "<group>"; };
 		22E1B539243DF63E00EA8FBD /* require.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = require.js; sourceTree = "<group>"; };
+		22E2F7E62CD67C5C0079534C /* iwasm.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iwasm.framework; path = xcfs/.build/artifacts/xcfs/iwasm.framework; sourceTree = "<group>"; };
 		22E337EB2949F4CD00A8F76C /* defaultToolbar.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = defaultToolbar.txt; sourceTree = "<group>"; };
 		22E9F57D2558468E00673D11 /* network_ios.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = network_ios.xcframework; path = xcfs/.build/artifacts/xcfs/network_ios.xcframework; sourceTree = SOURCE_ROOT; };
 		22E9F583255846A500673D11 /* lua_ios.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = lua_ios.xcframework; path = xcfs/.build/artifacts/xcfs/lua_ios.xcframework; sourceTree = SOURCE_ROOT; };
@@ -2697,6 +2698,7 @@
 		22B1B80D22CB9A5A00F7C452 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				22E2F7E62CD67C5C0079534C /* iwasm.framework */,
 				220F18872C7C81D7007090F8 /* blink.xcframework */,
 				2224F2A42C24909400E0BA40 /* rclone.framework */,
 				227318AC28F02E170027A736 /* multimarkdown.framework */,
@@ -3567,7 +3569,7 @@
 				CODE_SIGN_ENTITLEMENTS = "a-Shell/a-Shell.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 422;
+				CURRENT_PROJECT_VERSION = 440;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_ASSET_PATHS = "a-Shell/Preview\\ Content";
 				DEVELOPMENT_TEAM = VG8Z23C8YL;
@@ -3588,7 +3590,7 @@
 					"$(SDKROOT)/usr/lib/swift",
 					"$(PROJECT_DIR)/Frameworks",
 				);
-				MARKETING_VERSION = 1.15.2;
+				MARKETING_VERSION = 1.15.9;
 				OTHER_LDFLAGS = (
 					"-L",
 					Frameworks/,
@@ -3618,7 +3620,7 @@
 				CODE_SIGN_ENTITLEMENTS = "a-Shell/a-Shell.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 422;
+				CURRENT_PROJECT_VERSION = 440;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_ASSET_PATHS = "a-Shell/Preview\\ Content";
 				DEVELOPMENT_TEAM = VG8Z23C8YL;
@@ -3639,7 +3641,7 @@
 					"$(SDKROOT)/usr/lib/swift",
 					"$(PROJECT_DIR)/Frameworks",
 				);
-				MARKETING_VERSION = 1.15.2;
+				MARKETING_VERSION = 1.15.9;
 				OTHER_LDFLAGS = (
 					"-L",
 					Frameworks/,
@@ -3792,7 +3794,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "a-Shell/a-Shell.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 433;
+				CURRENT_PROJECT_VERSION = 443;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_ASSET_PATHS = "a-Shell/Preview\\ Content";
 				DEVELOPMENT_TEAM = VG8Z23C8YL;
@@ -3816,7 +3818,7 @@
 					"$(SDKROOT)/usr/lib/swift",
 					"$(PROJECT_DIR)/Frameworks",
 				);
-				MARKETING_VERSION = 1.15.7;
+				MARKETING_VERSION = 1.15.9;
 				OTHER_LDFLAGS = (
 					"-L",
 					Frameworks/,
@@ -3842,7 +3844,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "a-Shell/a-Shell.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 433;
+				CURRENT_PROJECT_VERSION = 443;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_ASSET_PATHS = "a-Shell/Preview\\ Content";
 				DEVELOPMENT_TEAM = VG8Z23C8YL;
@@ -3866,7 +3868,7 @@
 					"$(SDKROOT)/usr/lib/swift",
 					"$(PROJECT_DIR)/Frameworks",
 				);
-				MARKETING_VERSION = 1.15.7;
+				MARKETING_VERSION = 1.15.9;
 				OTHER_LDFLAGS = (
 					"-L",
 					Frameworks/,
@@ -3891,7 +3893,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "a-Shell/a-Shell.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 433;
+				CURRENT_PROJECT_VERSION = 443;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_ASSET_PATHS = "a-Shell/Preview\\ Content";
 				DEVELOPMENT_TEAM = VG8Z23C8YL;
@@ -3914,7 +3916,7 @@
 					"$(SDKROOT)/usr/lib/swift",
 					"$(PROJECT_DIR)/Frameworks",
 				);
-				MARKETING_VERSION = 1.15.7;
+				MARKETING_VERSION = 1.15.9;
 				OTHER_CODE_SIGN_FLAGS = "";
 				OTHER_LDFLAGS = (
 					"-L",
@@ -3945,7 +3947,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "a-Shell/a-Shell.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 433;
+				CURRENT_PROJECT_VERSION = 443;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_ASSET_PATHS = "a-Shell/Preview\\ Content";
 				DEVELOPMENT_TEAM = VG8Z23C8YL;
@@ -3968,7 +3970,7 @@
 					"$(SDKROOT)/usr/lib/swift",
 					"$(PROJECT_DIR)/Frameworks",
 				);
-				MARKETING_VERSION = 1.15.7;
+				MARKETING_VERSION = 1.15.9;
 				OTHER_CODE_SIGN_FLAGS = "";
 				OTHER_LDFLAGS = (
 					"-L",

a-Shell/AppDelegate.swift

@@ -430,6 +430,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Also notification if user changes accessibility settings:
         NotificationCenter.default.addObserver(self, selector: #selector(self.voiceOverChanged), name:  UIAccessibility.voiceOverStatusDidChangeNotification, object: nil)
         if #available(iOS 17.0, *) {
+            // For debugging tips (either  one):
+            // try? Tips.resetDatastore()
+            // Tips.showAllTipsForTesting()
             // No frequency control. Show all tips as soon as eligible (but only once)
             try? Tips.configure([.displayFrequency(.immediate)])
         }

a-Shell/SceneDelegate.swift

@@ -3072,7 +3072,7 @@ class SceneDelegate: UIViewController, UIWindowSceneDelegate, WKNavigationDelega
                     var mustUpdateXz = false
                     if (FileManager().fileExists(atPath: xzPath)) {
                         do {
-                            let xzFileSize = try FileManager().attributesOfItem(atPath: unzipPath)[.size] as! UInt64
+                            let xzFileSize = try FileManager().attributesOfItem(atPath: xzPath)[.size] as! UInt64
                             if (xzFileSize != 196301) {
                                 mustUpdateXz = true
                             }
@@ -3101,7 +3101,7 @@ class SceneDelegate: UIViewController, UIWindowSceneDelegate, WKNavigationDelega
                     // reset, so that we don't send it twice:
                     windowPrintedContent = ""
                     // scroll to the bottom of the webview: https://stackoverflow.com/questions/51659208/how-to-programmatically-scroll-ios-wkwebview-swift-4
-                    let scrollPoint = CGPoint(x: 0, y: webView!.scrollView.contentSize.height - webView!.frame.size.height)
+                    let scrollPoint = CGPoint(x: 0, y: max(webView!.scrollView.contentSize.height - webView!.frame.size.height, 0))
                     webView?.scrollView.setContentOffset(scrollPoint, animated: true)
                 } else {
                     NSLog("commandRunning= \(currentCommand)")
@@ -3361,6 +3361,13 @@ class SceneDelegate: UIViewController, UIWindowSceneDelegate, WKNavigationDelega
                                                 let rootVC = self.window?.rootViewController
                                                 rootVC?.present(controller, animated: false)
                                             }
+                                        }  else {
+                                            let rootVC = self.window?.rootViewController
+                                            if let controller = rootVC?.presentedViewController {
+                                                if controller is TipUIPopoverViewController {
+                                                    controller.dismiss(animated: false)
+                                                }
+                                            }
                                         }
                                     }
                                 }
@@ -5528,7 +5535,7 @@ extension SceneDelegate: WKUIDelegate {
 
     func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
         // NSLog("finished loading, title= \(webView.title ?? "unknown"), url=\(webView.url?.path ?? "unknown"), navigation= \(navigation)")
-        if (webView.url?.path == Bundle.main.resourcePath! + "/wasm.html") {
+        if (webView.url?.path == "/wasm.html") {
             return
         }
         if (webView.title != nil) && (webView.title != "") {
@@ -5574,6 +5581,13 @@ extension SceneDelegate: WKUIDelegate {
                             controller.popoverPresentationController?.canOverlapSourceViewRect = true
                             let rootVC = self.window?.rootViewController
                             rootVC?.present(controller, animated: false)
+                        } else {
+                            let rootVC = self.window?.rootViewController
+                            if let controller = rootVC?.presentedViewController {
+                                if controller is TipUIPopoverViewController {
+                                    controller.dismiss(animated: false)
+                                }
+                            }
                         }
                     }
                 }

a-Shell/Tips.swift

@@ -35,5 +35,5 @@ struct toolbarTip: Tip {
         Text("")
     }
 
-   var options: [TipOption] = [MaxDisplayCount(1)]
+    var options: [TipOption] = [MaxDisplayCount(1)]
 }

man/man1/ImageMagick.1

@@ -58,9 +58,9 @@ times to the same or different image. For these types of operations, a
 command-line utility is more suitable.
 
 The remaining of this manpage is a list of the available command-line utilities
-and their short descriptions.  For further documentation conserning a
+and their short descriptions.  For further documentation concerning a
 particular command and its options, consult the corresponding manpage. If you
-are just getting aquainted with ImageMagick, start at the top of that list, the
+are just getting acquainted with ImageMagick, start at the top of that list, the
 magick(1) program, and work your way down. Also, make sure to check out Anthony
 Thyssen's tutorial on how to use ImageMagick utilities to convert, compose, or
 edit images from the command-line.
@@ -77,11 +77,11 @@ a file or pipeline.
 This command is similar to magick(1) but with an implied "-script" option.  It
 is useful in special "#!/usr/bin/env magick-script" scripts that search for the
 magick-script(1) command anywhere along the users PATH, rather than in a
-hardcorded command location.
+hardcoded command location.
 
 .TP
 .B convert
-Available for Backward compatiblity with ImageMagick's version 6 convert(1).
+Available for Backward compatibility with ImageMagick's version 6 convert(1).
 Essentially, it is just an alias to a restrictive form of the magick(1)
 command, which should be used instead.
 
@@ -137,6 +137,7 @@ Interpret and execute scripts written in the Magick Scripting Language (MSL).
 
 .PP
 For more information about the ImageMagick, point your browser to
+file:///usr/local/share/doc/ImageMagick-7/index.html or
 https://imagemagick.org/.
 
 .SH SEE ALSO
@@ -157,6 +158,7 @@ MagickCore-config(1),
 MagickWand-config(1)
 
 .SH COPYRIGHT
-\fBCopyright (C) 1999-2020 ImageMagick Studio LLC.\fP 
-
-Additional copyrights and licenses apply to this software, see $APPDIR/ImageMagick-7/doc/LICENSE or http://imagemagick.org/script/license.php
+\fBCopyright (C) 1999 ImageMagick Studio LLC. Additional copyrights and
+licenses apply to this software, see
+file:///usr/local/share/doc/ImageMagick-7/www/license.html or
+https://imagemagick.org/script/license.php\fP

man/man1/compare.1

@@ -3,11 +3,11 @@
 compare \- mathematically and visually annotate the difference between an image and its reconstruction.
 .SH SYNOPSIS
 .TP
-\fBcompare\fP \fIinput-file\fP \fIinput-file\fP [\fIoptions\fP] \fIoutput-file\fP
+\fBmagick compare\fP \fIinput-file\fP \fIinput-file\fP [\fIoptions\fP] \fIoutput-file\fP
 .SH OVERVIEW
 The \fBcompare\fP program is a member of the ImageMagick(1) suite of tools.  Use it to mathematically and visually annotate the difference between an image and its reconstruction.
 
-For more information about the compare command, point your browser to http://imagemagick.org/script/compare.php.
+For more information about the compare command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/compare.html or https://imagemagick.org/script/compare.php.
 .SH DESCRIPTION
 Image Settings:
   \-alpha option        on, activate, off, deactivate, set, opaque, copy
@@ -66,6 +66,7 @@ Image Settings:
                        virtual pixel access method
 
 Image Operators:
+  \-auto-orient         automatically orient image
   \-brightness-contrast geometry
                         improve brightness / contrast of the image
   \-distort method args
@@ -105,6 +106,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2020 ImageMagick Studio LLC.\fP 
-
-Additional copyrights and licenses apply to this software, see $APPDIR/ImageMagick-7/doc/LICENSE or http://imagemagick.org/script/license.php
+\fBCopyright (C) 1999 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or https://imagemagick.org/script/license.php\fP

man/man1/composite.1

@@ -3,11 +3,11 @@
 composite \-  overlaps one image over another.
 .SH SYNOPSIS
 .TP
-\fBcomposite\fP \fB[\fP \fIoptions\fP \fB... ]\fP \fIchange-file base-file\fP \fB[\fP \fImask-file\fP \fB]\fP \fIoutput-image\fP
+\fBmagick composite\fP \fB[\fP \fIoptions\fP \fB... ]\fP \fIchange-file base-file\fP \fB[\fP \fImask-file\fP \fB]\fP \fIoutput-image\fP
 .SH OVERVIEW
 The \fBcomposite\fP program is a member of the ImageMagick(1) suite of tools.  Use it to overlap one image over another.
 
-For more information about the composite command, point your browser to http://imagemagick.org/script/composite.php.
+For more information about the composite command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/composite.html or https://imagemagick.org/script/composite.php.
 .SH DESCRIPTION
 Image Settings:
   \-affine matrix       affine transform matrix
@@ -113,6 +113,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2020 ImageMagick Studio LLC.\fP 
-
-Additional copyrights and licenses apply to this software, see $APPDIR/ImageMagick-7/doc/LICENSE or http://imagemagick.org/script/license.php
+\fBCopyright (C) 1999 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or https://imagemagick.org/script/license.php\fP

man/man1/conjure.1

@@ -3,11 +3,11 @@
 conjure \- interprets and executes scripts written in the Magick Scripting Language (MSL).
 .SH SYNOPSIS
 .TP
-\fBconjure\fP [\fIoptions\fP] \fIscript.msl\fP
+\fBmagick conjure\fP [\fIoptions\fP] \fIscript.msl\fP
 .SH OVERVIEW
 The \fBconjure\fP program is a member of the ImageMagick(1) suite of tools.  Use it to process a Magick Scripting Language (MSL) script. The Magick scripting language (MSL) will primarily benefit those that want to accomplish custom image processing tasks but do not wish to program, or those that do not have access to a Perl interpreter or a compiler.
 
-For more information about the conjure command, point your browser to http://imagemagick.org/script/conjure.php.
+For more information about the conjure command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/conjure.html or https://imagemagick.org/script/conjure.php.
 .SH DESCRIPTION
 Image Settings:
   \-monitor             monitor progress
@@ -23,13 +23,12 @@ Miscellaneous Options:
   \-list type           print a list of supported option arguments
   \-version             print version information
 
-In additiion, define any key value pairs required by your script.  For example,
+In addition, define any key value pairs required by your script.  For example,
 
     conjure \-size 100x100 \-color blue \-foo bar script.msl
 .SH SEE ALSO
 ImageMagick(1)
 
 .SH COPYRIGHT
-\fBCopyright (C) 1999-2020 ImageMagick Studio LLC.\fP 
 
-Additional copyrights and licenses apply to this software, see $APPDIR/ImageMagick-7/doc/LICENSE or http://imagemagick.org/script/license.php
+\fBCopyright (C) 1999 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or https://imagemagick.org/script/license.php\fP