Merge 128b78f into ddb6391

sile-typesetter · Mar 29, 2023 · a3b1467 · a3b1467
2 parents ddb6391 + 128b78f
commit a3b1467
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 23 deletions.
diff --git a/classes/book.lua b/classes/book.lua
@@ -113,6 +113,10 @@ function class:registerCommands ()
       else
         SILE.call("show-multilevel-counter", { id = "sectioning" })
       end
+    else
+      -- https://github.com/sile-typesetter/sile/issues/1707
+      -- https://github.com/sile-typesetter/sile/issues/1751
+      SILE.call("hbox")
     end
   end)
 
@@ -149,14 +153,16 @@ function class:registerCommands ()
         level = 1,
         msg = "book-chapter-title"
       }, content)
+      if SU.boolean(options.numbering, true) then
+        local lang = SILE.settings:get("document.language")
+        local postcmd = "book:chapter:post"
+        if SILE.Commands[postcmd .. ":" .. lang] then
+          postcmd = postcmd .. ":" .. lang
+        end
+        SILE.call(postcmd)
+      end
+      SILE.process(content)
     end)
-    local lang = SILE.settings:get("document.language")
-    local postcmd = "book:chapter:post"
-    if SILE.Commands[postcmd .. ":" .. lang] then
-      postcmd = postcmd .. ":" .. lang
-    end
-    SILE.call(postcmd)
-    SILE.call("book:chapterfont", {}, content)
     SILE.call("left-running-head", {}, function ()
       SILE.settings:temporarily(function ()
         SILE.call("book:left-running-head-font", {}, content)
@@ -177,12 +183,14 @@ function class:registerCommands ()
         toc = options.toc,
         level = 2
       }, content)
-      local lang = SILE.settings:get("document.language")
-      local postcmd = "book:section:post"
-      if SILE.Commands[postcmd .. ":" .. lang] then
-        postcmd = postcmd .. ":" .. lang
+      if SU.boolean(options.numbering, true) then
+        local lang = SILE.settings:get("document.language")
+        local postcmd = "book:section:post"
+        if SILE.Commands[postcmd .. ":" .. lang] then
+          postcmd = postcmd .. ":" .. lang
+        end
+        SILE.call(postcmd)
       end
-      SILE.call(postcmd)
       SILE.process(content)
     end)
     if not SILE.scratch.counters.folio.off then
@@ -217,12 +225,14 @@ function class:registerCommands ()
             toc = options.toc,
             level = 3
           }, content)
-      local lang = SILE.settings:get("document.language")
-      local postcmd = "book:subsection:post"
-      if SILE.Commands[postcmd .. ":" .. lang] then
-        postcmd = postcmd .. ":" .. lang
+      if SU.boolean(options.numbering, true) then
+        local lang = SILE.settings:get("document.language")
+        local postcmd = "book:subsection:post"
+        if SILE.Commands[postcmd .. ":" .. lang] then
+          postcmd = postcmd .. ":" .. lang
+        end
+        SILE.call(postcmd)
       end
-      SILE.call(postcmd)
       SILE.process(content)
     end)
     SILE.typesetter:leaveHmode()

diff --git a/packages/infonode/init.lua b/packages/infonode/init.lua
@@ -9,12 +9,8 @@ package._name = "infonode"
 -- Check out SILE.scratch.info.thispage in your end-of-page routine and see what nodes
 -- are there.
 
-local _info = pl.class(SILE.nodefactory.hbox)
-
-_info.type ="special"
-_info.category = ""
-_info.value = nil
-_info.width = SILE.length()
+local _info = pl.class(SILE.nodefactory.zerohbox)
+_info.type = "info"
 
 function _info:__tostring ()
   return "I<" .. self.category .. "|" .. tostring(self.value) .. ">"