fix(layouts): Fixup octavo and royaloctavo framesets in new class design

sile-typesetter · Aug 31, 2024 · 63a0098 · 63a0098
1 parent a6ac22d
commit 63a0098
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 56 deletions.
diff --git a/layouts/octavo.lua b/layouts/octavo.lua
@@ -2,31 +2,25 @@ return function (class)
    class.options.papersize = "432pt x 648pt"
 
    if class._name == "cabook" then
-      class:loadPackage("masters", {
-         {
-            id = "right",
-            firstContentFrame = "content",
-            frames = {
-               content = {
-                  left = "left(page) + 22.5mm",
-                  right = "right(page) - 15mm",
-                  top = "top(page) + 20mm",
-                  bottom = "top(footnotes)",
-               },
-               runningHead = {
-                  left = "left(content)",
-                  right = "right(content)",
-                  top = "top(content) - 8mm",
-                  bottom = "top(content) - 2mm",
-               },
-               footnotes = {
-                  left = "left(content)",
-                  right = "right(content)",
-                  height = "0",
-                  bottom = "bottom(page) - 15mm",
-               },
-            },
+      class.defaultFrameset = {
+         content = {
+            left = "left(page) + 22.5mm",
+            right = "right(page) - 15mm",
+            top = "top(page) + 20mm",
+            bottom = "top(footnotes)",
          },
-      })
+         runningHead = {
+            left = "left(content)",
+            right = "right(content)",
+            top = "top(content) - 8mm",
+            bottom = "top(content) - 2mm",
+         },
+         footnotes = {
+            left = "left(content)",
+            right = "right(content)",
+            height = "0",
+            bottom = "bottom(page) - 15mm",
+         },
+      }
    end
 end
diff --git a/layouts/royaloctavo.lua b/layouts/royaloctavo.lua
@@ -2,37 +2,31 @@ return function (class)
    class.options.papersize = "165mm x 250mm"
 
    if class._name == "cabook" then
-      class:loadPackage("masters", {
-         {
-            id = "right",
-            firstContentFrame = "content",
-            frames = {
-               content = {
-                  left = "left(page) + 22.5mm",
-                  right = "right(page) - 15mm",
-                  top = "22mm",
-                  bottom = "top(footnotes)",
-               },
-               runningHead = {
-                  left = "left(content)",
-                  right = "right(content)",
-                  top = "top(content) - 10mm",
-                  bottom = "top(content) - 4mm",
-               },
-               footnotes = {
-                  left = "left(content)",
-                  right = "right(content)",
-                  height = "0",
-                  bottom = "top(folio) - 5mm",
-               },
-               folio = {
-                  left = "left(content)",
-                  right = "right(content)",
-                  height = "5mm",
-                  bottom = "bottom(page) - 12.5mm",
-               },
-            },
+      class.defaultFrameset = {
+         content = {
+            left = "left(page) + 22.5mm",
+            right = "right(page) - 15mm",
+            top = "22mm",
+            bottom = "top(footnotes)",
          },
-      })
+         runningHead = {
+            left = "left(content)",
+            right = "right(content)",
+            top = "top(content) - 10mm",
+            bottom = "top(content) - 4mm",
+         },
+         footnotes = {
+            left = "left(content)",
+            right = "right(content)",
+            height = "0",
+            bottom = "top(folio) - 5mm",
+         },
+         folio = {
+            left = "left(content)",
+            right = "right(content)",
+            height = "5mm",
+            bottom = "bottom(page) - 12.5mm",
+         },
+      }
    end
 end