single-sided mode

Author: atzlt

packages/preview/obelisk/0.2.0/README.md

@@ -69,18 +69,19 @@ Obelisk exposes its architectural engine through a centralized configuration dic
 ### 1. Layout Configuration
 
 ```typst
-paper: (width, height),
+paper: (width, height, two-sided),
 margin: (s, e, t, f),
 side: (half-gutter, margin),
 texts: (size, ascender, step),
 ```
 
 * **`paper`**: Maps the absolute dimensions of the physical canvas.
     * `width` / `height`: Explicit length dimensions. Defaults to A4 size.
+    * `two-sided`: whether to use a two-sided layout. Defaults to `true`.
 
 
 * **`margin`**: Uses logical binding scopes to handle alternating page layouts dynamically.
-    * `s` / `e`: Spine (Inside) and Face (Outside) horizontal margins. The layout engine flips these on odd and even pages to maintain binding gutters.
+    * `s` / `e`: Spine (Inside) and Face (Outside) horizontal margins. The layout engine flips these on odd and even pages to maintain binding gutters. In single-sided mode, they are right and left margins respectively.
     * `t` / `f`: Top and Foot (Bottom) vertical margins, defining the boundaries where the baseline grid activates and terminates.
 
 
@@ -127,4 +128,6 @@ headers: (h2: (sym, dy, size), h3: (sym, dy, size))
 
 1. Inline math equations are aligned using a box to adjust its height. However, once it is wrapped inside a box, it becomes unbreakable, so inline long equations may fail to break lines. Also, it may break some packages that rely on the layout of the equation, like `fletcher`. Currently the workaround is that if there is no need to adjust its height, then don't wrap it in a box. This should work most of the time; for extra tall equations, manual adjusting might be needed.
 
-2. Theorem blocks rely on measuring the height of the sidenote. However the current measuring mechanism is somewhat broken and sometimes returns the wrong height for very long paragraphs, a little less than the actual height. Manual adjusting might be needed; you can use `v-step(size)` (size being an integer) to insert spaces. This should not be needed for short texts.
+2. The Typst engine will try to automatically increase line height when a inline math equation is particularly tall or deep. This behaviour could sometimes cause the line to shift a little. To fix this, you can adjust the `texts.descender` field to a value such that tall equations are automatically handled by the template, rather than the Typst engine. The default value should be a descent estimate.
+
+3. Theorem blocks rely on measuring the height of the sidenote. However the current measuring mechanism is somewhat broken and sometimes returns the wrong height for very long paragraphs, a little less than the actual height. Manual adjusting might be needed; you can use `v-step(size)` (size being an integer) to insert spaces. This should not be needed for short texts.

packages/preview/obelisk/0.2.0/default.typ

@@ -1,7 +1,7 @@
 // Paper measures
 #let width = 21cm
 #let height = width * calc.sqrt(2)
-#let def-paper = (width: width, height: height)
+#let def-paper = (width: width, height: height, two-sided: true)
 
 // Paper margins
 #let t-margin = width / 9
@@ -25,7 +25,7 @@
 
 // Text measures
 #let text-size = 12pt
-#let text-height = 9pt // Approximately the ascender height
+#let text-height = 10pt // Approximately the ascender height
 
 // Baseline grid
 #let step = 16pt
@@ -136,6 +136,7 @@
     height: paper.height - margin.t - margin.f,
   )
   texts.step-num = calc.floor(body.height / texts.step)
+  texts.descender = texts.step - texts.ascender
   margin.f = (
     paper.height - margin.t - texts.step-num * texts.step
   )

packages/preview/obelisk/0.2.0/headers.typ

@@ -1,8 +1,9 @@
 #import "default.typ": default-settings
-#import "layout.typ": place-node, blank-page
+#import "layout.typ": blank-page, place-node
 
 #let show-headers(it) = context {
   let (
+    paper,
     margin,
     fonts,
     texts,
@@ -23,31 +24,47 @@
 
   show heading.where(level: 1): it => context {
     let step = texts.step
-    blank-page(to: "odd", weak: true)
+    let two-sided = paper.two-sided
+    if two-sided {
+      blank-page(to: "odd", weak: true)
+    } else {
+      blank-page(weak: true)
+    }
     let h1 = counter(heading).at(here()).at(0)
-    place(
-      top + right,
-      dx: margin.e + 10pt,
-      dy: -margin.t - step - 10pt,
-      box(
-        stroke: 0.75pt + luma(180),
-        fill: white,
-        width: 7cm,
-        height: 7cm,
-        align(
-          center + horizon,
-          text(
-            font: fonts.sans,
-            size: 120pt,
-            fill: white,
-            top-edge: "bounds",
-            bottom-edge: "bounds",
-            stroke: 1.5pt + luma(180),
-            [#h1],
-          ),
+    let boxed = box(
+      stroke: 0.75pt + luma(180),
+      fill: white,
+      width: 7cm,
+      height: 7cm,
+      align(
+        center + horizon,
+        text(
+          font: fonts.sans,
+          size: 120pt,
+          fill: white,
+          top-edge: "bounds",
+          bottom-edge: "bounds",
+          stroke: 1.5pt + luma(180),
+          [#h1],
         ),
       ),
     )
+    if two-sided {
+      place(
+        top + right,
+        dx: margin.e + 10pt,
+        dy: -margin.t - step - 10pt,
+        boxed,
+      )
+    } else {
+      place(
+        top + left,
+        dx: -margin.e - 10pt,
+        dy: -margin.t - step - 10pt,
+        boxed
+      )
+    }
+
     v(step * 12)
     text(
       size: texts.size * 3.5,

packages/preview/obelisk/0.2.0/layout.typ

@@ -9,24 +9,52 @@
 #let bblock(it, ..args) = context {
   let def = default-settings.get()
   let step = def.texts.step
+  let ascender = def.texts.ascender
 
   set text(top-edge: "bounds", bottom-edge: "bounds")
   let height = measure({
     set text(top-edge: "bounds", bottom-edge: "bounds")
     it
   }).height
-  let desired-height = calc.round(height / step)
-  block(v(step * 2 / 3), spacing: 0pt, sticky: true)
+  let desired-height = calc.round(height / step) + 1
   block(
     height: desired-height * step,
+    inset: (top: (step - ascender) / 2),
     align(horizon, it),
-    // stroke: 1pt,
     above: 0pt,
     below: step,
-    sticky: true,
     ..args,
   )
-  block(v(step / 3), spacing: 0pt, sticky: true)
+}
+
+
+#let true-metrics(eq) = {
+  let total = measure(text(
+    top-edge: "bounds",
+    bottom-edge: "bounds",
+    eq,
+  ))
+  let strut-height = 1000pt
+  let strut = box(
+    width: 0pt,
+    height: strut-height,
+    baseline: 0pt,
+  )
+
+  let combined = measure(text(
+    top-edge: "bounds",
+    bottom-edge: "bounds",
+    eq + strut,
+  ))
+
+  let descender = combined.height - strut-height
+  let ascender = total.height - descender
+
+  return (
+    height: total.height,
+    ascender: ascender,
+    descender: descender,
+  )
 }
 
 #let place-side(it, dx: 0pt, dy: 0pt, ..args) = context {
@@ -37,14 +65,15 @@
   let half-gutter = def.side.half-gutter
   let e-margin = def.margin.e
   let text-height = def.texts.ascender
+  let two-sided = def.paper.two-sided
 
   let page-num = here().page()
-  let move = if calc.even(page-num) {
+  let move = if calc.even(page-num) or not two-sided {
     -side-width - half-gutter + dx
   } else {
     t-width + half-gutter + dx
   }
-  let flush = if calc.even(page-num) {
+  let flush = if calc.even(page-num) or not two-sided {
     right
   } else {
     left
@@ -69,9 +98,10 @@
 #let place-node(sym, dy: 0pt) = context {
   let def = default-settings.get()
   let half-gutter = def.side.half-gutter
+  let two-sided = def.paper.two-sided
   let page-num = here().page()
   let width = measure(sym).width
-  let dx = if calc.even(page-num) {
+  let dx = if calc.even(page-num) or not two-sided {
     half-gutter + width / 2
   } else {
     -half-gutter - width / 2
@@ -96,9 +126,10 @@
   let f-margin = def.margin.f
   let step = def.texts.step
   let ascender = def.texts.ascender
+  let two-sided = def.paper.two-sided
 
   let page-num = counter(page).get().first()
-  let is-odd = calc.odd(page-num)
+  let is-odd = calc.odd(page-num) and two-sided
 
   // Get the total number of sblocks in the document
   let total-blocks = counter("__obelisk_sblock-id")
@@ -279,10 +310,11 @@
 
 #let sidenote(it, dy: 0pt) = context {
   let def = default-settings.get()
+  let two-sided = def.paper.two-sided
   let page-num = here().page()
   let posx = here().position().x
   sym.wj
-  let dx = if calc.even(page-num) {
+  let dx = if calc.even(page-num) or not two-sided {
     -posx + def.margin.e
   } else {
     -posx + def.margin.s