rmagick 6.0.1 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 513aba969c109a4cbaef2540e0c8c24b698bae9741340190439f689f36221dc5
-  data.tar.gz: b4c08a874757081e94168f3d61d648fa415a5db3bdf506fd9e1e33d23ddc4a44
+  metadata.gz: ddc973bb97e260ec61a7407c9c64fed8d0c6bca941bd385f742c8588891e3a25
+  data.tar.gz: 188883dc8d411a58201c93a416745d4d86fe9a8f0fa5690c9b6d7fe70d8cf476
 SHA512:
-  metadata.gz: b023dd20af9b18850820465beeec888783d0fd49d96ae35cb8aab30627789a7c542a575095bb15b85e4509d7194162bbe382bf9321e3b2e9f4d033c9dad44e82
-  data.tar.gz: 7cd836b62e7dc614fa00e5b781d096e05d8bac29a05e36c319cc57446e0ff285d91e4f7f1b0b27e38e0c36a3a190b50960470f4d0e808b1e93e61c81735e35db
+  metadata.gz: f88a245f163102c30c3499ee0f002ab725f5c8d1dba4c622597a5e73cf2551e66a587bca14b2388b1889a56228aee7894329671be2be168d8d4edd49ec7fad4e
+  data.tar.gz: fd34f82a3d1baf9acb3b733aef09d17e4b1e42eb4c32b3e192091c7785d2205c632f5d743d6c80f77c023f467af445ad81d85eb56665354a4c1f2f7f0dac0cf1

data/.devcontainer/ImageMagick6/devcontainer.json

@@ -3,8 +3,8 @@
   "build": {
     "dockerfile": "../Dockerfile",
     "args": {
-      "RUBY_VERSION": "3.1.2",
-      "IMAGEMAGICK_VERSION": "6.9.13-7"
+      "RUBY_VERSION": "3.3.3",
+      "IMAGEMAGICK_VERSION": "6.9.13-17"
     }
   },
   "onCreateCommand": "/setup/setup-repo.sh"

data/.devcontainer/devcontainer.json

@@ -3,8 +3,8 @@
   "build": {
     "dockerfile": "Dockerfile",
     "args": {
-      "RUBY_VERSION": "3.1.2",
-      "IMAGEMAGICK_VERSION": "7.1.1-29"
+      "RUBY_VERSION": "3.3.3",
+      "IMAGEMAGICK_VERSION": "7.1.1-39"
     }
   },
   "onCreateCommand": "/setup/setup-repo.sh"

data/.editorconfig

@@ -7,10 +7,10 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-indent_style = spaces
+indent_style = space
 tab_width = 2
 
-[{*.{rb,yml,sh,md}]
+[*.{rb,yml,sh,md}]
 indent_size = 2
 
 [*.cpp]

data/.github/workflows/ci.yml

@@ -16,10 +16,10 @@ jobs:
     timeout-minutes: 20
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Ruby 3.0
+    - name: Set up Ruby 3.3
       uses: ruby/setup-ruby@master
       with:
-        ruby-version: '3.0'
+        ruby-version: '3.3'
         bundler-cache: true
     - name: Build and test with Rake
       run: |
@@ -40,17 +40,50 @@ jobs:
       run: |
         bundle exec rake rbs:validate && bundle exec steep check
 
-  test-linux:
-    runs-on: ubuntu-latest
+  # Seems that old imagemagick depend on ghostscript 9.x for handling fonts.
+  # However, ubuntu 24.04 has ghostscript 10.x, which is too new for old imagemagick.
+  test-linux-for-old-imagemagick:
+    runs-on: ubuntu-22.04
     timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: ['3.0', '3.1', '3.2', '3.3']
+        ruby-version: ['3.0']
         imagemagick-version:
           - { full: 6.8.9-10, major-minor: '6.8' }
-          - { full: 6.9.13-9, major-minor: '6.9' }
           - { full: 7.0.11-14, major-minor: '7.0' }
-          - { full: 7.1.1-31, major-minor: '7.1' }
+
+    name: Linux, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
+    steps:
+    - uses: actions/checkout@v4
+    - name: Cache ImageMagick built objects
+      uses: actions/cache@v4
+      with:
+        path: ./build-ImageMagick
+        key: v1-${{ runner.os }}-imagemagick-${{ matrix.imagemagick-version.full }}
+        restore-keys: |
+          v1-${{ runner.os }}-imagemagick-${{ matrix.imagemagick-version.full }}
+    - name: Update/Install packages
+      run: |
+        export IMAGEMAGICK_VERSION=${{ matrix.imagemagick-version.full }}
+        ./before_install_linux.sh
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@master
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Build and test with Rake
+      run: |
+        bundle exec rake
+
+  test-linux:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    strategy:
+      matrix:
+        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4']
+        imagemagick-version:
+          - { full: 6.9.13-17, major-minor: '6.9' }
+          - { full: 7.1.1-39, major-minor: '7.1' }
 
     name: Linux, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
@@ -80,10 +113,10 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: ['3.0', '3.1', '3.2', '3.3']
+        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4']
         imagemagick-version:
-          - { full: 6.9.13-9, major-minor: '6.9' }
-          - { full: 7.1.1-31, major-minor: '7.1' }
+          - { full: 6.9.13-17, major-minor: '6.9' }
+          - { full: 7.1.1-39, major-minor: '7.1' }
 
     name: macOS, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
@@ -112,10 +145,10 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        ruby-version: ['3.3']
+        ruby-version: ['3.4']
         imagemagick-version:
-          - { full: 6.9.13-9, major-minor: '6.9' }
-          - { full: 7.1.1-31, major-minor: '7.1' }
+          - { full: 6.9.13-17, major-minor: '6.9' }
+          - { full: 7.1.1-39, major-minor: '7.1' }
     env:
       bundled_im_dir: C:\Program Files\ImageMagick-7.1.1-Q16-HDRI
       install_im_dir: D:\ImageMagick

data/.rubocop.yml

@@ -4,6 +4,7 @@ inherit_from:
 require:
   - rubocop-rspec
   - rubocop-performance
+  - rubocop-on-rbs
 
 AllCops:
   DefaultFormatter: fuubar
@@ -65,3 +66,6 @@ Style/Copyright:
 
 Style/DisableCopsWithinSourceCodeDirective:
   Enabled: false
+
+Style/AccessorGrouping:
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,26 +1,18 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-04-18 19:59:34 UTC using RuboCop version 1.63.2.
+# on 2024-11-04 02:41:41 UTC using RuboCop version 1.68.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 11
+# Offense count: 12
 # Configuration parameters: Include, IgnoredGems, OnlyFor.
 # Include: **/*.gemfile, **/Gemfile, **/gems.rb
 Bundler/GemComment:
   Exclude:
     - 'Gemfile'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Severity, Include.
-# Include: **/*.gemspec
-Gemspec/RequireMFA:
-  Exclude:
-    - 'rmagick.gemspec'
-
 # Offense count: 1
 # Configuration parameters: Severity, Include.
 # Include: **/*.gemspec
@@ -43,7 +35,7 @@ Layout/ClassStructure:
 
 # Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowMultilineFinalElement.
+# Configuration parameters: AllowMultilineFinalElement, AllowedMethods.
 Layout/FirstMethodArgumentLineBreak:
   Exclude:
     - 'doc/ex/arcpath.rb'
@@ -81,13 +73,13 @@ Layout/MultilineMethodArgumentLineBreaks:
     - 'examples/vignette.rb'
     - 'lib/rmagick_internal.rb'
 
-# Offense count: 66
+# Offense count: 83
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: InspectBlocks.
 Layout/RedundantLineBreak:
   Enabled: false
 
-# Offense count: 1905
+# Offense count: 1911
 # This cop supports safe autocorrection (--autocorrect).
 Layout/SingleLineBlockChain:
   Enabled: false
@@ -101,12 +93,6 @@ Layout/SpaceAroundOperators:
   Exclude:
     - 'lib/rvg/misc.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Layout/SpaceBeforeBrackets:
-  Exclude:
-    - 'lib/rmagick_internal.rb'
-
 # Offense count: 39
 # This cop supports safe autocorrection (--autocorrect).
 Lint/AmbiguousOperatorPrecedence:
@@ -134,13 +120,13 @@ Lint/ConstantDefinitionInBlock:
   Exclude:
     - 'Rakefile'
 
-# Offense count: 5517
+# Offense count: 5522
 # Configuration parameters: Only, Ignore.
 Lint/ConstantResolution:
   Enabled: false
 
 # Offense count: 3
-# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches, IgnoreDuplicateElseBranch.
 Lint/DuplicateBranch:
   Exclude:
     - 'lib/rvg/embellishable.rb'
@@ -193,7 +179,7 @@ Lint/RescueException:
   Exclude:
     - 'lib/rmagick_internal.rb'
 
-# Offense count: 39
+# Offense count: 36
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 537
@@ -205,14 +191,14 @@ Metrics/BlockLength:
   Max: 155
 
 # Offense count: 1
-# Configuration parameters: CountBlocks.
+# Configuration parameters: CountBlocks, CountModifierForms.
 Metrics/BlockNesting:
   Max: 4
 
 # Offense count: 9
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 500
+  Max: 467
 
 # Offense count: 1
 # Configuration parameters: LengthThreshold.
@@ -220,12 +206,12 @@ Metrics/CollectionLiteralLength:
   Exclude:
     - 'doc/ex/smile.rb'
 
-# Offense count: 17
+# Offense count: 15
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 44
 
-# Offense count: 58
+# Offense count: 57
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 146
@@ -236,7 +222,7 @@ Metrics/ParameterLists:
   MaxOptionalParameters: 5
   Max: 8
 
-# Offense count: 13
+# Offense count: 12
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 42
@@ -283,12 +269,12 @@ Naming/MethodParameterName:
     - 'lib/rvg/transformable.rb'
     - 'lib/rvg/units.rb'
 
-# Offense count: 428
+# Offense count: 432
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 126
 
-# Offense count: 538
+# Offense count: 540
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: CustomTransform, IgnoredWords, DisallowedExamples.
 # DisallowedExamples: works
@@ -307,7 +293,7 @@ RSpec/IdenticalEqualityAssertion:
   Exclude:
     - 'spec/rmagick/image/spaceship_spec.rb'
 
-# Offense count: 543
+# Offense count: 544
 RSpec/MultipleExpectations:
   Max: 72
 
@@ -345,6 +331,12 @@ Style/ArgumentsForwarding:
 Style/ArrayFirstLast:
   Enabled: false
 
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/BitwisePredicate:
+  Exclude:
+    - 'spec/rmagick/image_list/partition_spec.rb'
+
 # Offense count: 7
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowOnConstant, AllowOnSelfClass.
@@ -377,7 +369,7 @@ Style/ClassMethodsDefinitions:
 Style/CommentedKeyword:
   Enabled: false
 
-# Offense count: 129
+# Offense count: 128
 # Configuration parameters: IgnoreModules.
 Style/ConstantVisibility:
   Exclude:
@@ -395,13 +387,13 @@ Style/DocumentDynamicEvalDefinition:
   Exclude:
     - 'lib/rmagick_internal.rb'
 
-# Offense count: 36
+# Offense count: 37
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false
 
-# Offense count: 163
-# Configuration parameters: RequireForNonPublicMethods.
+# Offense count: 164
+# Configuration parameters: AllowedMethods, RequireForNonPublicMethods.
 Style/DocumentationMethod:
   Enabled: false
 
@@ -419,14 +411,7 @@ Style/FetchEnvVar:
 Style/FormatStringToken:
   EnforcedStyle: unannotated
 
-# Offense count: 802
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, always_true, never
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
-# Offense count: 46
+# Offense count: 40
 # Configuration parameters: AllowedVariables.
 Style/GlobalVars:
   Exclude:
@@ -451,29 +436,28 @@ Style/HashEachMethods:
     - 'spec/rmagick/image/info/orientation_spec.rb'
     - 'spec/rmagick/image/info/units_spec.rb'
 
-# Offense count: 4
+# Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
   Exclude:
     - 'ext/RMagick/extconf.rb'
 
-# Offense count: 146
+# Offense count: 145
 Style/InlineComment:
   Enabled: false
 
-# Offense count: 10
+# Offense count: 8
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: InverseMethods.
 Style/InvertibleUnlessCondition:
   Exclude:
     - 'doc/ex/get_type_metrics.rb'
     - 'examples/identify.rb'
-    - 'ext/RMagick/extconf.rb'
     - 'lib/rmagick_internal.rb'
     - 'lib/rvg/embellishable.rb'
     - 'lib/rvg/stretchable.rb'
 
-# Offense count: 4509
+# Offense count: 4514
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: IgnoreMacros, AllowedMethods, AllowedPatterns, IncludedMacros, AllowParenthesesInMultilineCall, AllowParenthesesInChaining, AllowParenthesesInCamelCaseMethod, AllowParenthesesInStringInterpolation, EnforcedStyle.
 # SupportedStyles: require_parentheses, omit_parentheses
@@ -493,12 +477,26 @@ Style/MissingRespondToMissing:
     - 'lib/rmagick_internal.rb'
     - 'lib/rvg/misc.rb'
 
-# Offense count: 59
+# Offense count: 46
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: literals, strict
 Style/MutableConstant:
-  Enabled: false
+  Exclude:
+    - 'doc/ex/add_noise.rb'
+    - 'doc/ex/arcs02.rb'
+    - 'doc/ex/cubic01.rb'
+    - 'doc/ex/cubic02.rb'
+    - 'doc/ex/rvg_linecap.rb'
+    - 'doc/ex/rvg_linejoin.rb'
+    - 'doc/ex/rvg_opacity.rb'
+    - 'doc/ex/smile.rb'
+    - 'doc/ex/tref01.rb'
+    - 'doc/ex/writing_mode01.rb'
+    - 'doc/ex/writing_mode02.rb'
+    - 'lib/rvg/misc.rb'
+    - 'lib/rvg/stylable.rb'
+    - 'spec/support/helpers.rb'
 
 # Offense count: 32
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -506,9 +504,9 @@ Style/MutableConstant:
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
   Exclude:
-    - 'spec/**/*'
     - 'lib/rmagick_internal.rb'
     - 'lib/rvg/embellishable.rb'
+    - 'spec/rmagick/image/destroy_spec.rb'
 
 # Offense count: 4
 # Configuration parameters: AllowedMethods.
@@ -519,7 +517,7 @@ Style/OptionalBooleanParameter:
     - 'lib/rmagick_internal.rb'
     - 'lib/rvg/pathdata.rb'
 
-# Offense count: 16
+# Offense count: 94
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: .
 # SupportedStyles: same_as_string_literals, single_quotes, double_quotes
@@ -538,7 +536,6 @@ Style/RequireOrder:
   Exclude:
     - 'Rakefile'
     - 'doc/ex/polaroid.rb'
-    - 'ext/RMagick/extconf.rb'
     - 'lib/rmagick_internal.rb'
     - 'lib/rvg/rvg.rb'
     - 'rmagick.gemspec'
@@ -550,7 +547,7 @@ Style/StaticClass:
   Exclude:
     - 'spec/rmagick/draw/class_methods/_dummy_img__spec.rb'
 
-# Offense count: 185
+# Offense count: 186
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
 Style/StringConcatenation:
@@ -565,7 +562,7 @@ Style/StringHashKeys:
     - 'lib/rvg/misc.rb'
     - 'spec/rmagick/image/properties_spec.rb'
 
-# Offense count: 233
+# Offense count: 308
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
@@ -580,14 +577,14 @@ Style/YodaCondition:
   Exclude:
     - 'spec/rmagick/image/destroy_spec.rb'
 
-# Offense count: 110
+# Offense count: 113
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: .
 # SupportedOperators: *, +, &, |, ^
 Style/YodaExpression:
   Enabled: false
 
-# Offense count: 135
+# Offense count: 134
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https

data/CHANGELOG.md

@@ -3,6 +3,21 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 6.1.0
+
+Bug Fixes
+
+- Fix SEGV if read incorrect PDF file (#1671)
+
+Improvements
+
+- Remove multiple imagemagick version checks (#1650)
+- Suppress exception at installation if ImageMagick is not installed (#1647)
+- Remove unnecessary `require` (#1639)
+- Remove unnecessary minimum ruby version check (#1637)
+- Remove universal build configuration for system bundled ruby in macOS (#1633)
+- Add `frozen_string_literal: true` magic comment (#1631)
+
 ## RMagick 6.0.1
 
 Bug Fixes

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rmagick.gemspec
@@ -14,5 +16,7 @@ gem 'rubocop', '~> 1.63'
 gem 'rubocop-performance', '~> 1.21'
 gem 'rubocop-rspec', '~> 2.29'
 
+gem 'rubocop-on-rbs', '~> 0.5' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1')
+
 gem 'rbs', '~> 3.4'
 gem 'steep', '~> 1.6'

data/README.md

@@ -110,6 +110,12 @@ brew install imagemagick@6
 4. Install ImageMagick. You need to turn on checkboxes `Add application directory to your system path` and `Install development headers for C and C++` in an installer for RMagick.
 <img width="75%" src="https://github.com/rmagick/rmagick/assets/199156/494e7963-cca5-4cb5-b28a-6c4d76adce5d" />
 
+If you want to install ImageMagick using [winget](https://learn.microsoft.com/en-us/windows/package-manager/winget/), run the following command:
+
+```sh
+winget install ImageMagick.ImageMagick --custom /TASKS=modifypath,install_Devel
+```
+
 Installing RMagick
 ------------------
 
@@ -158,7 +164,7 @@ Things that can go wrong
 The [RMagick installation FAQ][faq] has answers to the most commonly reported
 problems, though may be out of date.
 
-### Can't install RMagick. Can't find libMagick or one of the dependent libraries. Check the mkmf.log file for more detailed information
+### Can't install RMagick. Can't find libMagickCore-XXXX.so or one of the dependent libraries. Check the mkmf.log file for more detailed information
 
 Typically this message means that one or more of the libraries that ImageMagick
 depends on hasn't been installed. Examine the mkmf.log file in the ext/RMagick
@@ -171,15 +177,14 @@ diagnose the problem. Also see [this FAQ][libmagick-faq].
 If you get a message like this:
 
 ```sh
-$DIR/RMagick.rb:11:in `require': libMagick.so.0:
-  cannot open shared object file: No such file or directory -
-  $DIR/RMagick2.so (LoadError)
+... /core_ext/kernel_require.rb>:136:in `require': cannot load such file -- RMagick2.so (LoadError)
+  (snip)
 ```
 
 you probably do not have the directory in which the ImageMagick library
 is installed in your load path. An easy way to fix this is to define
 the directory in the `LD_LIBRARY_PATH` environment variable. For
-example, suppose you installed the ImageMagick library `libMagick.so` in
+example, suppose you installed the ImageMagick library `libMagickCore-XXXX.so` in
 `/usr/local/lib`. (By default this is where it is installed.) Create the
 `LD_LIBRARY_PATH` variable like this:
 
@@ -211,7 +216,7 @@ release of RMagick over an earlier release.
 More samples
 ------------
 
-You can find more sample RMagick programs in the `/examples` directory. These
+You can find more sample RMagick programs in the [/examples](https://github.com/rmagick/rmagick/tree/main/examples) and [/doc/ex](https://github.com/rmagick/rmagick/tree/main/doc/ex) directories. These
 programs are not installed in the RMagick documentation tree.
 
 Reporting bugs

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'simplecov'
 require './lib/rmagick/version'
 require 'fileutils'
@@ -93,18 +95,24 @@ namespace :website do
       File.open(File.join(output_dir, output_file_name), 'w') do |dest|
         dest.puts <<~END_EXHTMLHEAD
           <!DOCTYPE public PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-          <html xmlns="http://www.w3.org/1999/xhtml">
+          <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
           <head>
             <meta name="generator" content="ex2html.rb" />
             <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
             <link rel="stylesheet" type="text/css" href="css/popup.css" />
+            <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/github.min.css" />
+            <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/highlight.min.js"></script>
+            <script>
+              hljs.configure({ cssSelector: "pre" });
+              hljs.highlightAll();
+            </script>
             <title>RMagick example: #{input_file_name}</title>
           </head>
           <body>
           <h1>#{input_file_name}</h1>
           <div class="bodybox">
           <div class="bodyfloat">
-          <pre>
+          <pre class="language-ruby">
         END_EXHTMLHEAD
 
         src.each do |line|

data/before_install_linux.sh

@@ -13,13 +13,15 @@ if [ ! -v IMAGEMAGICK_VERSION ]; then
   exit 1
 fi
 
+sudo apt-get update
+
 # remove all existing imagemagick related packages
 sudo apt-get autoremove -y imagemagick* libmagick* --purge
 
 # install build tools, ImageMagick delegates
 sudo apt-get install -y build-essential libx11-dev libxext-dev zlib1g-dev \
   liblcms2-dev libpng-dev libjpeg-dev libfreetype6-dev \
-  libtiff5-dev libwebp-dev liblqr-1-0-dev vim gsfonts ghostscript
+  libtiff5-dev libwebp-dev liblqr-1-0-dev libglib2.0-dev gsfonts ghostscript
 
 project_dir=$(pwd)
 build_dir="${project_dir}/build-ImageMagick/ImageMagick-${IMAGEMAGICK_VERSION}"

data/before_install_osx.sh

@@ -15,7 +15,7 @@ fi
 
 export HOMEBREW_NO_AUTO_UPDATE=true
 brew uninstall --force imagemagick imagemagick@6
-brew install wget ghostscript freetype libtool jpeg jpeg-xl little-cms2 openexr libomp libpng libtiff liblqr zlib webp zstd
+brew install wget ghostscript freetype libtool jpeg jpeg-xl little-cms2 openexr libomp libpng libtiff liblqr zlib webp zstd glib
 
 export LDFLAGS="-L$(brew --prefix jpeg)/lib -I$(brew --prefix jpeg-xl)/lib -L$(brew --prefix little-cms2)/lib -L$(brew --prefix openexr)/lib -L$(brew --prefix libomp)/lib -L$(brew --prefix libpng)/lib -L$(brew --prefix libtiff)/lib -L$(brew --prefix liblqr)/lib -L$(brew --prefix zlib)/lib -L$(brew --prefix webp)/lib -L$(brew --prefix zstd)/lib"
 export CPPFLAGS="-I$(brew --prefix jpeg)/include -I$(brew --prefix jpeg-xl)/include -I$(brew --prefix openexr)/include/OpenEXR -I$(brew --prefix libtiff)/include -I$(brew --prefix zlib)/include -I$(brew --prefix zstd)/include -I$(brew --prefix glib)/include/glib-2.0 -I$(brew --prefix glib)/lib/glib-2.0/include"