From bb9ba91f9dd9e994185f2929f2f48ad367696bcd Mon Sep 17 00:00:00 2001 From: Omikhleia Date: Sun, 1 Sep 2024 01:45:54 +0200 Subject: [PATCH 1/2] fix: Unit thsp conversion compatibility with Lua 5.1 --- packages/resilient/styles/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/resilient/styles/init.lua b/packages/resilient/styles/init.lua index f981fea..92869ba 100644 --- a/packages/resilient/styles/init.lua +++ b/packages/resilient/styles/init.lua @@ -35,7 +35,7 @@ function package:_init (options) SILE.registerUnit("thsp", { relative = true, definition = function (value) - return value * 0.5 * utils.interwordSpace() + return value * 0.5 * utils.interwordSpace():tonumber() end }) self:readStyles() From 8b011676ad495fa4b9c33f878f7653d032203791 Mon Sep 17 00:00:00 2001 From: Omikhleia Date: Sun, 1 Sep 2024 01:46:59 +0200 Subject: [PATCH 2/2] docs: Update some examples and documentation settings to SILE 0.15 --- examples/lefevre-tuor-idril-styles.yml | 50 ++++++++++++++++++++++++++ examples/lefevre-tuor-idril.sil | 3 +- examples/sile-resilient-manual.silm | 2 +- 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/examples/lefevre-tuor-idril-styles.yml b/examples/lefevre-tuor-idril-styles.yml index c4b1fcb..fdadde9 100644 --- a/examples/lefevre-tuor-idril-styles.yml +++ b/examples/lefevre-tuor-idril-styles.yml @@ -20,6 +20,47 @@ blockquote: before: skip: "smallskip" +code: + origin: "resilient.book" + style: + font: + family: "Hack" + size: "1.4ex" + +defn-base: + origin: "resilient.defn" + style: + +defn-desc: + inherit: "defn-base" + origin: "resilient.defn" + style: + paragraph: + after: + skip: "smallskip" + before: + vbreak: false + +defn-term: + inherit: "defn-base" + origin: "resilient.defn" + style: + font: + weight: 700 + paragraph: + after: + vbreak: false + before: + skip: "smallskip" + +dropcap: + origin: "resilient.book" + style: + font: + family: "Zallman Caps" + special: + lines: 2 + epigraph: origin: "resilient.epigraph" style: @@ -884,3 +925,12 @@ url: font: language: "und" +verbatim: + inherit: "code" + origin: "resilient.verbatim" + style: + paragraph: + align: "obeylines" + before: + skip: "smallskip" + diff --git a/examples/lefevre-tuor-idril.sil b/examples/lefevre-tuor-idril.sil index d6c68bc..3aa00f6 100644 --- a/examples/lefevre-tuor-idril.sil +++ b/examples/lefevre-tuor-idril.sil @@ -9,6 +9,7 @@ \set[parameter=document.baselineskip, value=1.2em] \set[parameter=document.lineskip, value=0em] \set[parameter=epigraph.width, value=75%fw] +\set[parameter=typesetter.italicCorrection, value=true] % \language[main=fr] \font[family=EB Garamond, size=12pt] @@ -30,7 +31,7 @@ local class = SILE.documentState.documentClass class:registerCommand("initial", function (options, content) SILE.settings:temporarily(function() local blSkip = SILE.settings:get("document.baselineskip") - SILE.settings:set("document.baselineskip", SILE.nodefactory.vglue(SILE.length(blSkip.height.length))) + SILE.settings:set("document.baselineskip", SILE.types.node.vglue(SILE.types.length(blSkip.height.length))) SILE.call("dropcap", { lines = 2, family = "Zallman Caps", join = true }, { options.letter }) SILE.process(content) diff --git a/examples/sile-resilient-manual.silm b/examples/sile-resilient-manual.silm index 4f697be..a425a9b 100644 --- a/examples/sile-resilient-manual.silm +++ b/examples/sile-resilient-manual.silm @@ -39,7 +39,7 @@ sile: textsubsuper.fake: false autodoc.highlighting: true document.baselineskip: 1.2em - # typesetter.italicCorrection: true # Not yet available in SILE 0.14.x + typesetter.italicCorrection: true packages: - autodoc-resilient # REQUIRED FOR RESILIENT, do not use regular autodoc - background # Some of the packages below might not be required...