feat(classes,packages): Add variant styling support on block quotes

classes/resilient/base.lua

@@ -1,6 +1,6 @@
 --
 -- Base resilient class
--- 2023, Didier Willis
+-- 2023, 2025 Didier Willis
 -- License: MIT
 --
 require("silex")
@@ -45,6 +45,10 @@ function class:resolveStyle (name, discardable)
   return self.styles:resolveStyle(name, discardable)
 end
 
+function class:hasStyle (name, discardable)
+  return self.styles:hasStyle(name)
+end
+
 -- For overriding in subclass
 function class.registerStyles (_) end
 

classes/resilient/book.lua

@@ -1,6 +1,6 @@
 --
 -- A new advanced book class for SILE
--- 2021-2023, Didier Willis
+-- 2021-2025, Didier Willis
 -- License: MIT
 --
 local base = require("classes.resilient.base")
@@ -665,8 +665,10 @@ function class:registerCommands ()
     end)
   end, "Typeset its contents in a right and left indented block (variant).")
 
-  self:registerCommand("blockquote", function (_, content)
-    SILE.call("style:apply:paragraph", { name = "blockquote" }, content)
+  self:registerCommand("blockquote", function (options, content)
+    local variant = options.variant and "blockquote-" .. options.variant or nil
+    local style = variant and self.styles:hasStyle(variant) and variant or "blockquote"
+    SILE.call("style:apply:paragraph", { name = style }, content)
   end, "Typeset its contents in a styled blockquote.")
 
   -- Captioned elements

examples/manual-classes/classes.sil

@@ -306,13 +306,12 @@ commands are available, as well as \autodoc:command{\header:rule}.
 \section{Block-indented quotes}
 
 The class provides the \autodoc:environment{blockquote} environment to typeset simple block-indented
-paragraphs of the kind shown in the \autodoc:package{resilient.styles} package documentation. It is sort
-of an extra, but it was so often needed by this author that he decided to include it in
-standard.
+paragraphs.
+Indented quotes can be nested.
 
-The environment relies on the same-named style for its styling and on the
-\autodoc:setting{book.blockquote.margin} setting for its indentation (defaults to 2em). Indented
-quotes can be nested.
+The environment relies on the same-named style for its styling and on the \autodoc:setting{book.blockquote.margin} setting for its indentation (defaults to 2em).
+
+The environment also accepts a \autodoc:parameter{variant} option, to switch to an alternate style, assumed to be named \code{blockquote-⟨\em{variant}⟩}.
 
 \section{Other features}
 

packages/resilient/defn/init.lua

@@ -1,7 +1,7 @@
 --
 -- Definition environment for SILE
 -- Very minimal implementation for Djot/Markdown needs, with styling support.
--- 2023, Didier Willis
+-- 2023, 2025 Didier Willis
 -- License: MIT
 --
 local ast = require("silex.ast")
@@ -50,14 +50,16 @@ function package:registerCommands ()
 
   self:registerCommand("defn:internal:term", function (options, content)
     local variant = options.variant or SILE.settings:get("defn.variant")
-    local style = variant and "defn-term-" .. variant or "defn-term"
+    local varstyle = variant and "defn-term-" .. variant
+    local style = varstyle and self.styles:hasStyle(varstyle) and varstyle or "defn-term"
 
     SILE.call("style:apply:paragraph", { name = style }, content)
   end, "Definition term (internal)")
 
   self:registerCommand("defn:internal:desc", function (options, content)
     local variant = options.variant or SILE.settings:get("defn.variant")
-    local style = variant and "defn-desc-" .. variant or "defn-desc"
+    local varstyle = variant and "defn-desc-" .. variant
+    local style = varstyle and self.styles:hasStyle(varstyle) and varstyle or "defn-desc"
 
     SILE.settings:temporarily(function ()
       local indent = SILE.settings:get("defn.indent"):absolute()

packages/resilient/styles/init.lua

@@ -1,7 +1,7 @@
 --
 -- A style package for SILE
 -- License: MIT
--- 2021-2024, Didier Willis
+-- 2021-2025, Didier Willis
 --
 local base = require("packages.base")
 
@@ -229,6 +229,11 @@ function package:resolveStyle (name, discardable)
   return pl.tablex.deepcopy(stylespec.style)
 end
 
+function package:hasStyle (name)
+  local stylespec = SILE.scratch.styles.specs[name]
+  return stylespec and true or false
+end
+
 function package:resolveParagraphStyle (name, discardable)
   local styledef = self:resolveStyle(name, discardable)
   -- Apply defaults