mathematical 1.6.20 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: decc78795a11a4d3e06cd094da6683f36ee449a386573b15ea7b1872d2466576
-  data.tar.gz: 4219a816fd4c73da3c1404611c617e71b4016b05140fa5307365898d7a375933
+  metadata.gz: d09fb5b145019bd3222fb6e898aeb619eb9a410a3aa50e44a378b7648f6bc3d3
+  data.tar.gz: ba29dec9368b6765c4672ca4bcfc536cbc1179b7717ce40933f95ca67048d4a2
 SHA512:
-  metadata.gz: 0a5f188613d972e700f2525ec8dc1c6193f29d171b03ce010730fe80318e4b04de49ef0f60202b562eddb0900cbac1e2bd5c367c3407b26fc944276db4288b1d
-  data.tar.gz: d0fb800031dce4db133c138f2536af6dd6959f193223f2ad4d1aea963eb9162cd33b8aa5695908f61954c7ec3cca63b188b4d4070d205380187d6d307195b7ae
+  metadata.gz: 0062f484bb16e2d012802c6f4f8bfc8467192f5037a8791890767ff986c411494ed50a766ad1ef1c5aaa68cf7c77d6f1d3375d20ddc3c51fa324aefeb015a6ca
+  data.tar.gz: 9a1e643541901146695cb94669103f314a688f50f5664e65b7ffa7614fd002cb6d7c48ed10e69ce0415ca10211a6675c6ef5e48293175becf03641808167e4d8

data/README.md

@@ -14,7 +14,7 @@ Please reach out if you would like to mantain SVG and PNG portions of the librar
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Precompiled native gems are available for Linux, macOS, and Windows. Add this line to your application's Gemfile:
 
     gem 'mathematical'
 
@@ -26,7 +26,21 @@ Or install it yourself as:
 
     $ gem install mathematical
 
-**Note:** you'll probably need to run [`script/bootstrap`](script/bootstrap) to fetch all the necessary dependencies.
+### Platform-specific notes
+
+**Linux** (x86_64 and ARM, glibc and musl): Fully self-contained — no additional dependencies needed.
+
+**macOS**: Install runtime libraries via Homebrew:
+
+    $ brew install glib gdk-pixbuf cairo pango libxml2
+
+**Windows**: Install runtime libraries via MSYS2 (UCRT64):
+
+    $ pacman -S mingw-w64-ucrt-x86_64-glib2 mingw-w64-ucrt-x86_64-cairo mingw-w64-ucrt-x86_64-pango mingw-w64-ucrt-x86_64-gdk-pixbuf2 mingw-w64-ucrt-x86_64-libxml2
+
+### Building from source
+
+If no precompiled gem is available for your platform, it will be compiled from source. You'll need cmake, pkg-config, bison, flex, and the development headers for glib, cairo, pango, gdk-pixbuf, and libxml2.
 
 ## Usage
 
@@ -112,28 +126,24 @@ Check out [SUPPORTED.md on the mtex2MML website](https://github.com/gjtorikian/m
 
 **Note**: This library makes a few assumptions about the strings that you pass in. It assumes that `$..$` is inline math and `$$..$$` is display math.
 
-## Building
+## Building from source
+
+To build from source, install the development dependencies for your platform:
+
+**Linux (Debian/Ubuntu):**
 
-Before building this gem, you must install the following libraries:
+    $ sudo apt-get install cmake bison flex pkg-config libglib2.0-dev libgdk-pixbuf2.0-dev libcairo2-dev libpango1.0-dev libxml2-dev
 
-* Ruby 2.1 or higher (you'll need Ruby header files, so a `*-dev` version is also required)
-* GNU make
-* glib-2.0
-* gdk-pixbuf-2.0
-* xml2
-* cairo
-* pango
-* [Dependencies for mtex2MML](https://github.com/gjtorikian/mtex2MML#building)
+**macOS:**
 
-After cloning the repo, you can fetch dependencies and run the library by typing:
+    $ brew install glib gdk-pixbuf cairo pango cmake pkg-config
+
+Then:
 
 ```
-script/bootstrap
 bundle exec rake compile
 ```
 
-If there were no errors, you're done! Otherwise, make sure to follow the dependency instructions.
-
 ### Fonts and special notices for Mac OS X
 
 Install the fonts with:

data/Rakefile

@@ -6,42 +6,105 @@ require "rake/testtask"
 require "fileutils"
 require "tmpdir"
 
-LASEM_DIR = File.expand_path(File.join(File.dirname(__FILE__), "ext", "mathematical", "lasem"))
-
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList["test/**/*_test.rb"]
   t.verbose = true
 end
 
+# ─── Extension compilation ─────────────────────────────────────────────────────
+
 require "rake/extensiontask"
+
+CROSS_PLATFORMS = [
+  "x86_64-linux-gnu",
+  "x86_64-linux-musl",
+  "aarch64-linux-gnu",
+  "aarch64-linux-musl",
+]
+
+NATIVE_PLATFORMS = [
+  "arm64-darwin",
+  "x86_64-darwin",
+  "x64-mingw-ucrt",
+]
+
+ALL_PLATFORMS = CROSS_PLATFORMS + NATIVE_PLATFORMS
+
+# Ruby versions to target for precompiled gems
+CROSS_RUBIES = ["3.1.0", "3.2.0", "3.3.0", "3.4.0", "4.0.0"]
+
 spec = Gem::Specification.load("mathematical.gemspec")
+
 Rake::ExtensionTask.new("mathematical", spec) do |ext|
   ext.lib_dir = File.join("lib", "mathematical")
+  ext.cross_compile = true
+  ext.cross_platform = CROSS_PLATFORMS
+  ext.cross_config_options << "--enable-cross-build"
+
+  ext.cross_compiling do |cross_spec|
+    # Native gems don't need source files — the compiled .so is included
+    cross_spec.files.reject! { |path| File.fnmatch?("ext/**/*", path) }
+    # Include font files in native gems
+    cross_spec.files += Dir.glob("fonts/**/*")
+  end
 end
 
-task default: [:test]
-
-Gem::PackageTask.new(spec)
+# Set RUBY_CC_VERSION for cross-compilation
+begin
+  require "rake_compiler_dock"
+  ENV["RUBY_CC_VERSION"] = RakeCompilerDock.ruby_cc_version("3.1", "3.2", "3.3", "3.4", "4.0")
+rescue LoadError
+  ENV["RUBY_CC_VERSION"] = CROSS_RUBIES.join(":")
+end
 
-Rake::Task[:test].prerequisites
+# ─── Cross-compiled gem tasks (Linux via rake-compiler-dock) ───────────────────
+
+namespace "gem" do
+  CROSS_PLATFORMS.each do |platform|
+    desc "Build native gem for #{platform}"
+    task platform do
+      require "rake_compiler_dock"
+
+      # Both GNU and musl RCD containers are Debian-based (musl uses a cross-compiler,
+      # NOT Alpine). Install deps with apt-get, running as root inside the container.
+      RakeCompilerDock.sh(<<~SCRIPT, platform: platform, verbose: true)
+        set -e
+        sudo apt-get update -qq && sudo apt-get install -y --no-install-recommends \
+          cmake bison flex pkg-config ninja-build python3 python3-pip
+        # RCD containers (Ubuntu 20.04) ship old CMake 3.16 and Meson 0.53;
+        # libxml2 2.12+ needs CMake 3.18+ and glib 2.80+ needs Meson 1.2+
+        pip3 install --upgrade cmake meson packaging
+        export PATH="$(python3 -m site --user-base)/bin:$PATH"
+        # Build static deps from source (Debian lacks .a files for meson-built libs)
+        script/build_static_deps
+        # RCD containers use rbenv; override .ruby-version which may not match
+        export RBENV_VERSION="$(rbenv versions --bare | tail -1)"
+        gem install bundler --no-document
+        bundle install
+        bundle exec rake native:#{platform} gem MAKE="nice make -j$(nproc)"
+      SCRIPT
+    end
+  end
 
-task build: [:clean]
+  desc "Build native gems for all Linux platforms"
+  multitask linux: CROSS_PLATFORMS
 
-Rake::Task[:clean].enhance do
-  Dir.chdir(LASEM_DIR) { puts %x(git clean -fdx) }
+  desc "Build the source (platform=ruby) gem"
+  task :source do
+    sh "gem build mathematical.gemspec"
+  end
 end
 
-desc "Copy samples to gh-pages"
-task :copy_samples do
-  Dir.mktmpdir do |tmp|
-    system "cp -r samples #{tmp}"
+# ─── Default tasks ─────────────────────────────────────────────────────────────
 
-    system "git checkout gh-pages"
+task default: [:test]
 
-    system "cp -r #{tmp}/samples ."
-  end
-end
+Gem::PackageTask.new(spec)
+
+Rake::Task[:test].prerequisites
+
+task build: [:clean]
 
 require "rubocop/rake_task"
 

data/ext/mathematical/CMakeLists.txt

@@ -3,11 +3,10 @@
 #   General project setup
 #
 #
-project(lasem)
-enable_language(C)
-cmake_minimum_required(VERSION 2.8.7 FATAL_ERROR)
-cmake_policy(SET CMP0015 NEW)
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+project(lasem C)
 set(CMAKE_MACOSX_RPATH 1)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 set(LIBRARY "lasem")
 set(VERSION 0.6)
@@ -17,7 +16,6 @@ find_package(PkgConfig REQUIRED)
 set(LASEM_SRC_DIR ${CMAKE_SOURCE_DIR}/lasem/src/)
 set(MTEX2MML_SRC_DIR ${CMAKE_SOURCE_DIR}/mtex2MML/src/)
 set(MTEX2MML_BUILD_DIR ${CMAKE_SOURCE_DIR}/mtex2MML/build/)
-set(INCLUDE_DIRS ${INCLUDE_DIRS} ${RUBY_INCLUDE_PATH} ${MTEX2MML_SRC_DIR} ${LASEM_SRC_DIR})
 
 file(GLOB_RECURSE LASEM_SRC ${LASEM_SRC_DIR}/*.c)
 file(GLOB_RECURSE LASEM_HEADERS ${LASEM_SRC_DIR}/*.h)
@@ -25,11 +23,16 @@ list(REMOVE_ITEM LASEM_SRC "${LASEM_SRC_DIR}/lasemrender.c")
 list(REMOVE_ITEM LASEM_SRC "${LASEM_SRC_DIR}/lsmitex.c")
 list(APPEND LASEM_SRC "${CMAKE_SOURCE_DIR}/lasem_overrides.c")
 
-# If you're reading this and it's giving you errors, fix it and send
-# me the patch.  Much appreciated.
 add_definitions(-DPACKAGE_LOCALE_DIR="/usr/share/locale")
 
-add_library(${LIBRARY} SHARED
+# On Windows with MSYS2, glib/pango/gdk-pixbuf/cairo are shared libraries (DLLs).
+# Do NOT define *_STATIC_COMPILATION — headers must use __declspec(dllimport)
+# so the linker correctly resolves symbols via the import libraries (.dll.a).
+
+# Build lasem as a STATIC library so it links directly into the Ruby extension.
+# Lasem is LGPL-2.1+, but since mathematical is MIT and fully open source,
+# LGPL obligations are trivially satisfied (users can rebuild from source).
+add_library(${LIBRARY} STATIC
             ${LASEM_SRC}
 )
 
@@ -41,7 +44,7 @@ add_library(${LIBRARY} SHARED
 pkg_check_modules(GLIB2 REQUIRED glib-2.0)
 pkg_check_modules(CAIRO REQUIRED cairo)
 pkg_check_modules(PANGO REQUIRED pango)
-pkg_check_modules(GDK-PIXBUF2 REQUIRED gdk-pixbuf-2.0)
+pkg_check_modules(GDK_PIXBUF2 REQUIRED gdk-pixbuf-2.0)
 pkg_check_modules(LIBXML2 REQUIRED libxml-2.0)
 pkg_check_modules(GIO2 REQUIRED gio-2.0)
 pkg_check_modules(PANGO_CAIRO REQUIRED pangocairo)
@@ -66,40 +69,16 @@ if(CMAKE_HOST_APPLE AND APPLE)
   endif()
 endif()
 
-set(GLIB_LIB_SUFFIX 2.0)
-set(PANGO_LIB_SUFFIX 1.0)
-set(GDK_PIXBUF_LIB_SUFFIX 2.0)
-
-# find dependencies
-# glib
-find_path(GLIB_INCLUDE_DIR glib.h)
-find_library(GLIB_GLIB_LIBRARY glib-${GLIB_LIB_SUFFIX})
-find_library(GLIB_GIO_LIBRARY gio-${GLIB_LIB_SUFFIX})
-find_library(GLIB_GMODULE_LIBRARY gmodule-${GLIB_LIB_SUFFIX})
-find_library(GLIB_GOBJECT_LIBRARY gobject-${GLIB_LIB_SUFFIX})
-set(GLIB_LIBRARIES ${GLIB_GLIB_LIBRARY} ${GLIB_GIO_LIBRARY} ${GLIB_GMODULE_LIBRARY} ${GLIB_GOBJECT_LIBRARY})
-
-# pango
-find_path(PANGO_INCLUDE_DIR pango/pango.h)
-find_library(PANGO_LIBRARY pango-${PANGO_LIB_SUFFIX})
-find_library(PANGO_CAIRO_LIBRARY pangocairo-${PANGO_LIB_SUFFIX})
-set(PANGO_LIBRARIES ${PANGO_LIBRARY} ${PANGO_CAIRO_LIBRARY})
-
-# cairo
-find_library(CAIRO_LIBRARY cairo${CAIRO_LIB_SUFFIX})
-find_library(CAIRO_GOBJECT_LIBRARY cairo-gobject${CAIRO_LIB_SUFFIX})
-set(CAIRO_LIBRARIES ${CAIRO_LIBRARY} ${CAIRO_GOBJECT_LIBRARY})
-find_path(CAIRO_INCLUDE_DIR cairo.h)
-
-# gdk-pixbuf
-find_path(GDK_PIXBUF_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h)
-find_library(GDK_PIXBUF_LIBRARY gdk_pixbuf-${GDK_PIXBUF_LIB_SUFFIX})
+target_include_directories(${LIBRARY} PRIVATE
+  ${MTEX2MML_SRC_DIR}
+  ${LASEM_SRC_DIR}
+)
 
-include_directories(${LIBRARY}
-  ${INCLUDE_DIRS}
+target_include_directories(${LIBRARY} PUBLIC
+  ${RUBY_INCLUDE_PATH}
   ${GLIB2_INCLUDE_DIRS}
   ${CAIRO_INCLUDE_DIRS}
-  ${GDK-PIXBUF2_INCLUDE_DIRS}
+  ${GDK_PIXBUF2_INCLUDE_DIRS}
   ${LIBXML2_INCLUDE_DIRS}
   ${LIBXML2_MACOS_INCLUDE_DIRS}
   ${GIO2_INCLUDE_DIRS}
@@ -107,11 +86,12 @@ include_directories(${LIBRARY}
 )
 
 target_link_libraries(${LIBRARY}
-  ${GLIB_LIBRARIES}
+  ${GLIB2_LIBRARIES}
   ${CAIRO_LIBRARIES}
   ${PANGO_LIBRARIES}
-  ${GDK_PIXBUF_LIBRARY}
+  ${GDK_PIXBUF2_LIBRARIES}
   ${LIBXML2_LIBRARIES}
-  ${RUBY_LIBRARY}
+  ${GIO2_LIBRARIES}
+  ${PANGO_CAIRO_LIBRARIES}
   ${MTEX2MML_BUILD_DIR}/libmtex2MML.a
 )

data/ext/mathematical/extconf.rb

@@ -6,6 +6,7 @@ ENV["RC_ARCHS"] = "" if RUBY_PLATFORM.match?(/darwin|mac os/)
 
 require "mkmf"
 require "rbconfig"
+require "fileutils"
 
 OS = case RbConfig::CONFIG["host_os"]
 when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
@@ -17,15 +18,32 @@ when /linux/
 when /solaris|bsd/
   :unix
 else
-  raise Error::WebDriverError, "unknown os: #{host_os.inspect}"
+  raise "unknown os: #{RbConfig::CONFIG["host_os"].inspect}"
 end
 
 LIBDIR     = RbConfig::CONFIG["libdir"]
 INCLUDEDIR = RbConfig::CONFIG["includedir"]
-SHARED_EXT = OS == :macos ? "dylib" : "so"
+
+SHARED_EXT = case OS
+when :macos then "dylib"
+when :windows then "dll"
+else "so"
+end
+
 # Starting in Catalina, libxml2 was moved elsewhere
 SDKROOT = OS == :macos ? %x(/usr/bin/xcrun --show-sdk-path).chomp : ""
-RPATH = OS == :macos ? "-rpath @loader_path/../../ext/mathematical/lib".chomp : ""
+RPATH = OS == :macos ? "-rpath @loader_path/../../ext/mathematical/lib" : ""
+
+# Windows needs the MSYS Makefiles generator for cmake
+CMAKE_GENERATOR = OS == :windows ? '-G "MSYS Makefiles"' : ""
+
+# Cross-compilation support
+CROSS_BUILD = enable_config("cross-build", false)
+if CROSS_BUILD
+  # In cross-compilation mode, use the cross-compiler
+  RbConfig::CONFIG["CC"] = ENV["CC"] if ENV["CC"]
+  RbConfig::CONFIG["CXX"] = ENV["CXX"] if ENV["CXX"]
+end
 
 unless find_executable("cmake")
   $stderr.puts "\n\n\n[ERROR]: cmake is required and not installed. Get it here: http://www.cmake.org/\n\n"
@@ -40,6 +58,14 @@ def using_system_mtex2mml?
   arg_config("--use-system-mtex2MML", !!ENV["MATHEMATICAL_USE_SYSTEM_MTEX2MML"])
 end
 
+# Check for vendored static dependencies (built by script/build_static_deps)
+VENDOR_DIR = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "vendor"))
+if File.directory?(File.join(VENDOR_DIR, "lib"))
+  ENV["PKG_CONFIG_PATH"] = "#{File.join(VENDOR_DIR, "lib", "pkgconfig")}:#{File.join(VENDOR_DIR, "lib64", "pkgconfig")}:#{ENV["PKG_CONFIG_PATH"]}"
+  ENV["PKG_CONFIG_LIBDIR"] = "" if CROSS_BUILD # Don't search system pkg-config in cross mode
+  puts "*** Using vendored static deps from #{VENDOR_DIR} ***"
+end
+
 LASEM_DIR = File.expand_path(File.join(File.dirname(__FILE__), "lasem"))
 LASEM_BUILD_DIR = File.join(LASEM_DIR, "build")
 LASEM_SRC_DIR = File.expand_path(File.join(LASEM_DIR, "src"))
@@ -51,7 +77,10 @@ MTEX2MML_SRC_DIR = File.expand_path(File.join(MTEX2MML_DIR, "src"))
 MTEX2MML_LIB_DIR = File.expand_path(File.join(File.dirname(__FILE__), "lib"))
 
 if OS == :macos
-  ENV["PKG_CONFIG_PATH"] = "/opt/X11/lib/pkgconfig:#{ENV["PKG_CONFIG_PATH"]}"
+  # Homebrew paths must come before X11 so we get newer versions of libs like cairo
+  homebrew_prefix = %x(brew --prefix 2>/dev/null).chomp
+  homebrew_pkgconfig = "#{homebrew_prefix}/lib/pkgconfig" unless homebrew_prefix.empty?
+  ENV["PKG_CONFIG_PATH"] = [homebrew_pkgconfig, "/opt/X11/lib/pkgconfig", ENV["PKG_CONFIG_PATH"]].compact.join(":")
 end
 
 # pre-compile checks
@@ -62,8 +91,6 @@ find_header("libxml/parser.h", "/include/libxml2", "/usr/include/libxml2", "/usr
 find_header("libxml/xpath.h", "/include/libxml2", "/usr/include/libxml2", "/usr/local/include/libxml2", "#{SDKROOT}/usr/include/libxml2")
 find_header("libxml/xpathInternals.h", "/include/libxml2", "/usr/include/libxml2", "/usr/local/include/libxml2", "#{SDKROOT}/usr/include/libxml2")
 
-# TODO: we need to clear out the build dir that's erroneously getting packaged
-# this causes problems, as Linux installation is expecting OS X output
 def clean_dir(dir)
   if File.directory?(dir)
     FileUtils.rm_rf(dir)
@@ -74,40 +101,42 @@ end
 clean_dir(MTEX2MML_BUILD_DIR)
 clean_dir(LASEM_BUILD_DIR)
 
+# Pass cross-compiler settings to cmake if available
+cmake_env = ""
+if ENV["CC"]
+  cmake_env += " -DCMAKE_C_COMPILER=#{ENV["CC"]}"
+end
+if ENV["CXX"]
+  cmake_env += " -DCMAKE_CXX_COMPILER=#{ENV["CXX"]}"
+end
+
 if !using_system_mtex2mml?
   # build mtex2MML library
-  Dir.chdir(MTEX2MML_BUILD_DIR) do
-    system "cmake .."
+  Dir.chdir(MTEX2MML_BUILD_DIR) do # rubocop:disable ThreadSafety/DirChdir
+    system "cmake #{CMAKE_GENERATOR}#{cmake_env} .."
     system "make libmtex2MML_static"
   end
   FileUtils.mkdir_p(MTEX2MML_LIB_DIR)
   FileUtils.cp_r(File.join(MTEX2MML_BUILD_DIR, "libmtex2MML.a"), MTEX2MML_LIB_DIR)
   $LIBS << " -lmtex2MML"
-elsif dir_config("mtex2MML").any? || system("dpkg -s libmtex2MML >/dev/null")
+elsif dir_config("mtex2MML").any? || system("dpkg -s libmtex2MML >/dev/null 2>&1")
   $LIBS << " -lmtex2MML"
 else
-  # NOTE: pkg_config implicitly adds right -l argument for the linker.
   pkg_config("libmtex2MML") || pkg_config("mtex2MML")
 end
 
 if !using_system_lasem?
-  # build Lasem library
-  # SHOULD BE DYNAMICALLY LINKED for potential LGPL copyright issues
-  Dir.chdir(LASEM_BUILD_DIR) do
-    system "cmake ../.."
+  # build Lasem library as STATIC (linked directly into the Ruby extension)
+  Dir.chdir(LASEM_BUILD_DIR) do # rubocop:disable ThreadSafety/DirChdir
+    system "cmake #{CMAKE_GENERATOR}#{cmake_env} ../.."
     system "make"
   end
   FileUtils.mkdir_p(LASEM_LIB_DIR)
-  FileUtils.cp_r(File.join(LASEM_BUILD_DIR, "liblasem.#{SHARED_EXT}"), LASEM_LIB_DIR)
-  $LIBS << if OS == :linux
-    " -Wl,-rpath,#{LASEM_LIB_DIR} -llasem"
-  else
-    " -llasem"
-  end
-elsif dir_config("lasem").any? || system("dpkg -s liblasem >/dev/null")
+  FileUtils.cp_r(File.join(LASEM_BUILD_DIR, "liblasem.a"), LASEM_LIB_DIR)
+  $LIBS << " -llasem"
+elsif dir_config("lasem").any? || system("dpkg -s liblasem >/dev/null 2>&1")
   $LIBS << " -llasem"
 else
-  # NOTE: pkg_config implicitly adds right -l argument for the linker.
   pkg_config("liblasem") || pkg_config("lasem")
 end
 
@@ -120,10 +149,27 @@ dir_config("mathematical", HEADER_DIRS, LIB_DIRS)
 
 find_header("mtex2MML.h", MTEX2MML_SRC_DIR)
 
-flag = ENV["TRAVIS"] ? "-O0" : "-O2"
-$LDFLAGS << " #{%x(pkg-config --static --libs glib-2.0 gdk-pixbuf-2.0 cairo pango).chomp} #{RPATH}"
+flag = ENV["CI"] ? "-O0" : "-O2"
+
+# Get link flags — prefer static linking when available
+pkg_config_static_flag = File.directory?(VENDOR_DIR) ? "--static" : ""
+
+# Link flags for system libraries must appear AFTER -llasem and -lmtex2MML
+# because the linker resolves symbols left-to-right: liblasem.a references
+# glib/libxml2 symbols, so those libs must come after -llasem.
+# We append directly to $LIBS (which becomes LOCAL_LIBS in the Makefile)
+# to guarantee correct ordering on all platforms including Windows.
+pkg_packages = "glib-2.0 gdk-pixbuf-2.0 cairo pango pangocairo gio-2.0 libxml-2.0"
+pkg_libs = %x(pkg-config #{pkg_config_static_flag} --libs #{pkg_packages}).chomp
+puts "*** pkg-config --libs: #{pkg_libs} ***"
+$LIBS << " #{pkg_libs}"
+
+$LDFLAGS << " #{RPATH}" unless RPATH.empty?
 $CFLAGS << " #{flag} #{%x(pkg-config --cflags glib-2.0 gdk-pixbuf-2.0 cairo pango).chomp}"
 
+# fPIC is needed for linking static libs into the shared extension
+$CFLAGS << " -fPIC" unless OS == :windows
+
 create_makefile("mathematical/mathematical")
 
 # rubocop:enable Style/GlobalVars

data/ext/mathematical/mtex2MML/CMakeLists.txt

@@ -14,9 +14,9 @@
 #   General project setup
 #
 #
+cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
 project(mtex2MML)
 enable_language(C)
-cmake_minimum_required(VERSION 2.8.7 FATAL_ERROR)
 cmake_policy(SET CMP0015 NEW)
 
 include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/astyle.cmake")
@@ -194,7 +194,7 @@ endif(MSVC)
 if (BUILD_CLAR)
   include (CTest)
   enable_testing()
-  find_package(PythonInterp REQUIRED)
+  find_package(Python REQUIRED)
 
   set(CLAR_FIXTURES "${CMAKE_CURRENT_SOURCE_DIR}/tests/fixtures/")
   set(CLAR_PATH "${CMAKE_CURRENT_SOURCE_DIR}/tests")
@@ -202,7 +202,7 @@ if (BUILD_CLAR)
 	add_definitions(-DCLAR_TMPDIR=\"libmtex2MML_tests\")
 
   include_directories(${CLAR_PATH})
-  file(GLOB_RECURSE SRC_TEST ${CLAR_PATH}/*/*.c ${CLAR_PATH}/*/*.h)
+  file(GLOB_RECURSE SRC_TEST ${CLAR_PATH}/*/*.c ${CLAR_PATH}/*/*.h, ${CLAR_PATH}/*/*.py)
   set(SRC_CLAR "${CLAR_PATH}/main.c" "${CLAR_PATH}/clar.c"
     "${CLAR_PATH}/array.c"
     "${CLAR_PATH}/basic.c"
@@ -220,7 +220,7 @@ if (BUILD_CLAR)
 
   add_custom_command(
     OUTPUT ${CLAR_PATH}/clar.suite
-    COMMAND ${PYTHON_EXECUTABLE} generate.py
+    COMMAND ${Python_EXECUTABLE} generate.py
     DEPENDS ${SRC_TEST}
     WORKING_DIRECTORY ${CLAR_PATH}
   )
@@ -240,7 +240,7 @@ if (BUILD_CLAR)
 
   add_custom_command(TARGET mtex2MML_clar
     POST_BUILD
-    COMMAND ${PYTHON_EXECUTABLE} mathjax_generate.py
+    COMMAND ${Python_EXECUTABLE} mathjax_generate.py
     WORKING_DIRECTORY ${CLAR_PATH}
   )
 

data/ext/mathematical/mtex2MML/README.md

@@ -42,26 +42,26 @@ Both a static and dynamic library are created as part of the `cmake` build proce
 
 The library exposes the following methods:
 
-* `char * mtex2MML_parse(const char * str, unsigned long strlen, const int options)`: Converts a single TeX equation in `str` to MathML. Returns just the MathML equation, as a string.
+- `char * mtex2MML_parse(const char * str, unsigned long strlen, const int options)`: Converts a single TeX equation in `str` to MathML. Returns just the MathML equation, as a string.
 
-* `char * mtex2MML_global_parse(const char * str, unsigned long strlen, const int options, int global_start)`: The same as `mtex2MML_parse`, but allows you to provide a starting integer for equation numbering. Returns just the MathML equation, as a string.
+- `char * mtex2MML_global_parse(const char * str, unsigned long strlen, const int options, int global_start)`: The same as `mtex2MML_parse`, but allows you to provide a starting integer for equation numbering. Returns just the MathML equation, as a string.
 
-* `int mtex2MML_filter(const char * str, unsigned long strlen, const int options)`: Given a string with a mix of TeX math and non-math elements, this returns a single string containing just the converted math elements. Equations are automatically numbered. Returns a `status` indicating success (`0`) or failure. You must access the resulting string with `mtex2MML_output`.
+- `int mtex2MML_filter(const char * str, unsigned long strlen, const int options)`: Given a string with a mix of TeX math and non-math elements, this returns a single string containing just the converted math elements. Equations are automatically numbered. Returns a `status` indicating success (`0`) or failure. You must access the resulting string with `mtex2MML_output`.
 
-* `int mtex2MML_text_filter(const char * str, unsigned long strlen, const int options)`: Given a string with a mix of TeX math and non-math elements, this converts all the math and leaves the rest of the string unmodified. Equations are automatically numbered. Returns a `status` indicating success (`0`) or failure. You must access the resulting string with `mtex2MML_output`. HTML within a math equation are normalized (eg. `<` becomes `&lt;`).
+- `int mtex2MML_text_filter(const char * str, unsigned long strlen, const int options)`: Given a string with a mix of TeX math and non-math elements, this converts all the math and leaves the rest of the string unmodified. Equations are automatically numbered. Returns a `status` indicating success (`0`) or failure. You must access the resulting string with `mtex2MML_output`. HTML within a math equation are normalized (eg. `<` becomes `&lt;`).
 
-* `int mtex2MML_strict_filter(const char * str, unsigned long strlen, const int options)`: Given a string with a mix of TeX math and non-math elements, this converts all the math and leaves the rest of the string unmodified. Equations are automatically numbered. Returns a `status` indicating success (`0`) or failure. You must access the resulting string with `mtex2MML_output`. HTML tags are removed completely.
+- `int mtex2MML_strict_filter(const char * str, unsigned long strlen, const int options)`: Given a string with a mix of TeX math and non-math elements, this converts all the math and leaves the rest of the string unmodified. Equations are automatically numbered. Returns a `status` indicating success (`0`) or failure. You must access the resulting string with `mtex2MML_output`. HTML tags are removed completely.
 
 The `options` argument determines which types of delimiters are to be used:
 
-* `MTEX2MML_DELIMITER_DEFAULT` is the default, using `$..$` for inline and `$$..$$` for display.
-* `MTEX2MML_DELIMITER_DOLLAR` uses single dollar signs: `$..$` for inline.
-* `MTEX2MML_DELIMITER_DOUBLE` uses double dollar signs: `$$..$$` for display.
-* `MTEX2MML_DELIMITER_PARENS` uses parenthesis: `\(..\)` for inline.
-* `MTEX2MML_DELIMITER_BRACKETS` uses brackets: `\[..\]` for display.
-* `MTEX2MML_DELIMITER_ENVIRONMENTS` supports bare `\\begin..\\end` environments.
+- `MTEX2MML_DELIMITER_DEFAULT` is the default, using `$..$` for inline and `$$..$$` for display.
+- `MTEX2MML_DELIMITER_DOLLAR` uses single dollar signs: `$..$` for inline.
+- `MTEX2MML_DELIMITER_DOUBLE` uses double dollar signs: `$$..$$` for display.
+- `MTEX2MML_DELIMITER_PARENS` uses parenthesis: `\(..\)` for inline.
+- `MTEX2MML_DELIMITER_BRACKETS` uses brackets: `\[..\]` for display.
+- `MTEX2MML_DELIMITER_ENVIRONMENTS` supports bare `\\begin..\\end` environments.
 
-[The *tests/basic.c*](tests/basic.c) and [the *tests/delimiters.c*](tests/delimiters.c) suites provides a demonstrate of how these methods can be used.
+[The _tests/basic.c_](tests/basic.c) and [the _tests/delimiters.c_](tests/delimiters.c) suites provides a demonstrate of how these methods can be used.
 
 ### As a command
 
@@ -77,16 +77,16 @@ Use `mtex2MML -h` to get documentation on the options.
 
 A `0` status indicates a success, while anything else indicates a failure, [as per the Bison documentation](http://www.gnu.org/software/bison/manual/html_node/Parser-Function.html). If a token cannot be parsed, or if the tokenization is nested too deep, the library will bail with a non-zero status code. An error message is also printed to STDERR.
 
-[The *tests/maliciousness.c* suite](tests/maliciousness.c) has a demonstration on how to perform error handling.
+[The _tests/maliciousness.c_ suite](tests/maliciousness.c) has a demonstration on how to perform error handling.
 
 ## Building
 
 To build mtex2MML, you need:
 
-* [CMake](http://www.cmake.org/download/) (at least version 2.8.7)
-* [Bison](https://www.gnu.org/software/bison/)
-* [Flex](http://flex.sourceforge.net/)
-* [Python3](https://www.python.org/) (just for the tests)
+- [CMake](http://www.cmake.org/download/) (at least version 2.8.7)
+- [Bison](https://www.gnu.org/software/bison/)
+- [Flex](http://flex.sourceforge.net/)
+- [Python3](https://www.python.org/) (just for the tests)
 
 ### OS X (brew or macports), Ubuntu and Arch Linux
 
@@ -120,8 +120,8 @@ ctest -V
 
 mtex2MML has a test suite that mimics the one found in [MathJax](https://github.com/mathjax/MathJax-test), with a few exceptions:
 
-* Files marked as `.xtex` have features that are not implemented, but probably should be in the future.
-* Files marked as `.no_tex` have features that probably won't be implemented.
+- Files marked as `.xtex` have features that are not implemented, but probably should be in the future.
+- Files marked as `.no_tex` have features that probably won't be implemented.
 
 During the test run, the suite will list the percentage of features that still need coverage.
 

data/ext/mathematical/mtex2MML/deps/uthash/package.json

@@ -20,8 +20,9 @@
     "src/uthash.h",
     "src/utlist.h",
     "src/utringbuffer.h",
+    "src/utstack.h",
     "src/utstring.h"
   ],
 
-  "version": "2.0.1"
+  "version": "2.3.0"
 }