From 67ab59bbe408095a60c7aff5e3a25d300770aa2a Mon Sep 17 00:00:00 2001 From: Omikhleia Date: Thu, 1 Aug 2024 20:02:39 +0200 Subject: [PATCH] refactor: Compatibility upgrade with SILE 0.15 --- packages/printoptions/init.lua | 6 +++-- .../printoptions.sile-1.0.0-1.rockspec | 0 rockspecs/printoptions.sile-1.1.0-1.rockspec | 26 +++++++++++++++++++ .../printoptions.sile-dev-1.rockspec | 1 + 4 files changed, 31 insertions(+), 2 deletions(-) rename printoptions.sile-1.0.0-1.rockspec => rockspecs/printoptions.sile-1.0.0-1.rockspec (100%) create mode 100644 rockspecs/printoptions.sile-1.1.0-1.rockspec rename printoptions.sile-dev-1.rockspec => rockspecs/printoptions.sile-dev-1.rockspec (97%) diff --git a/packages/printoptions/init.lua b/packages/printoptions/init.lua index 18a8dad..b685347 100644 --- a/packages/printoptions/init.lua +++ b/packages/printoptions/init.lua @@ -6,6 +6,8 @@ -- Reminders: GraphicsMagick also needs Ghostscript for PDF images (it -- delegates to it). -- +require("silex.types") -- Compatibility shims + local base = require("packages.base") local package = pl.class(base) @@ -179,8 +181,8 @@ local drawSVG = function (filename, svgdata, width, height, density) elseif height then scalefactor = height:tonumber() / svgheight end - width = SILE.measurement(svgwidth * scalefactor) - height = SILE.measurement(svgheight * scalefactor) + width = SILE.types.measurement(svgwidth * scalefactor) + height = SILE.types.measurement(svgheight * scalefactor) scalefactor = scalefactor * density / 72 local resolution = SILE.settings:get("printoptions.resolution") diff --git a/printoptions.sile-1.0.0-1.rockspec b/rockspecs/printoptions.sile-1.0.0-1.rockspec similarity index 100% rename from printoptions.sile-1.0.0-1.rockspec rename to rockspecs/printoptions.sile-1.0.0-1.rockspec diff --git a/rockspecs/printoptions.sile-1.1.0-1.rockspec b/rockspecs/printoptions.sile-1.1.0-1.rockspec new file mode 100644 index 0000000..6c2246c --- /dev/null +++ b/rockspecs/printoptions.sile-1.1.0-1.rockspec @@ -0,0 +1,26 @@ +rockspec_format = "3.0" +package = "printoptions.sile" +version = "1.1.0-1" +source = { + url = "git+https://github.com/Omikhleia/printoptions.sile.git", + tag = "v1.1.0", +} +description = { + summary = "Image tools for professional printers with the SILE typesetting system.", + detailed = [[ + This package for the SILE typesetter helps tuning image resolution and vector rasterization, + as often requested by professional printers and print-on-demand services. + ]], + homepage = "https://github.com/Omikhleia/printoptions.sile", + license = "MIT", +} +dependencies = { + "lua >= 5.1", + "silex.sile >= 0.6.0, < 1.0", +} +build = { + type = "builtin", + modules = { + ["sile.packages.printoptions"] = "packages/printoptions/init.lua", + } +} diff --git a/printoptions.sile-dev-1.rockspec b/rockspecs/printoptions.sile-dev-1.rockspec similarity index 97% rename from printoptions.sile-dev-1.rockspec rename to rockspecs/printoptions.sile-dev-1.rockspec index ade070e..5a2f16b 100644 --- a/printoptions.sile-dev-1.rockspec +++ b/rockspecs/printoptions.sile-dev-1.rockspec @@ -14,6 +14,7 @@ description = { } dependencies = { "lua >= 5.1", + "silex.sile", } build = { type = "builtin",