v0.2.1 proper indentation and headings

report/README.md

@@ -20,6 +20,7 @@ Define variables at the top of the template :
 #let date-start = datetime(year: 2024, month: 06, day: 05)
 #let date-end = datetime(year: 2024, month: 09, day: 05)
 #let despair-mode = false
+#let first-line-indent-all = auto
 
 #set text(lang: "fr")
 ```

report/guide.typ

@@ -1,4 +1,4 @@
-#import "@preview/typographix-polytechnique-reports:0.2.0" as template
+#import "@preview/typographix-polytechnique-reports:0.2.1" as template
 
 #show: template.apply
 

report/main.typ

@@ -20,9 +20,13 @@
 )
 
 // Applying margins and other page-related setup
-#let apply-page(doc, despair-mode: false) = {
+#let apply-page(doc, despair-mode: false, first-line-indent-all: auto) = context {
   set page(paper: "a4", margin: if (despair-mode) { margin-despair-mode } else { margin-default })
-  set par(justify: true, first-line-indent: (amount: 20pt, all: true))
+
+  let first-line-indent-all = if first-line-indent-all == auto {
+    if text.lang == "fr" { true } else { false }
+  } else { first-line-indent-all }
+  set par(justify: true, first-line-indent: (amount: 20pt, all: first-line-indent-all))
 
   doc
 }
@@ -177,12 +181,15 @@
 
 #let apply-heading(doc) = {
   // Numbering parameters
-  set heading(numbering: "1.1 - ")
+  set heading(numbering: "1.1 ")
+
+  // For some reason, `below: auto` need to be reinserted explicitely for blocks for H1, H2, H3
+  // otherwise spacing below is not inserted although `below: auto` is supposedly the default already
 
   // H1 styling
   show heading.where(level: 1): he => {
     set align(center)
-    box(width: 85%)[#{
+    block(width: 85%, below: auto, {
       set par(justify: false)
       set text(
         size: 20pt,
@@ -195,55 +202,44 @@
         counter(heading).display(he.numbering.slice(0, -3))
         linebreak()
       } else if he.numbering != none {
-        upper((he.numbering)(he.level).slice(0, -2))
+        upper((he.numbering)(he.level).slice(0, -1))
         linebreak()
       }
       upper(he.body)
       image("assets/filet-long.svg", width: 30%)
       v(0.5em)
-    }]
+    })
   }
 
   // H2 styling
   show heading.where(level: 2): he => {
-    box()[#{
-      set text(
-        size: 20pt,
-        weight: "medium",
-        fill: rgb("00677F"),
-      )
-      smallcaps(he)
-      v(-0.5em)
-      image("assets/filet-court.svg")
-    }]
+    block(below: auto, text(
+      size: 20pt,
+      weight: "medium",
+      fill: rgb("00677F"),
+      {
+        smallcaps(he)
+        v(-0.5em)
+        image("assets/filet-court.svg")
+      },
+    ))
   }
 
   // H3 styling
   show heading.where(level: 3): he => {
-    set text(
+    block(below: auto, text(
       size: 16pt,
       weight: "regular",
       fill: rgb("01426A"),
-    )
-    if type(he.numbering) == str {
-      counter(heading).display(he.numbering.slice(0, -3))
-      [ • ]
-    }
-
-    smallcaps(he.body)
-  }
-
-  // H4 styling
-  show heading.where(level: 4): he => {
-    counter(heading).display(he.numbering)
-    he.body
-  }
-
-  // Quick fix for paragraph indentation...
-  // Any superior entity who might be reading, please forgive me
-  show heading: he => {
-    set par(first-line-indent: 0pt)
-    he
+      {
+        if he.numbering != none {
+          counter(heading).display(he.numbering).slice(0, -1)
+          [ • ]
+        }
+
+        smallcaps(he.body)
+      },
+    ))
   }
 
   // Don't forget to return doc cause
@@ -261,7 +257,7 @@
       if vals.len() == 1 {
         s += title + " "
       }
-      s += numbering("A.1 -", ..vals)
+      s += numbering("A.1 ", ..vals)
       s
     },
   )
@@ -293,8 +289,8 @@
 /* MAIN */
 /********/
 
-#let apply(doc, despair-mode: false) = {
-  show: apply-page.with(despair-mode: despair-mode)
+#let apply(doc, despair-mode: false, first-line-indent-all: auto) = {
+  show: apply-page.with(despair-mode: despair-mode, first-line-indent-all: first-line-indent-all)
   show: apply-heading
   show: apply-outline
   doc

report/template/report.typ

@@ -1,4 +1,4 @@
-#import "@preview/typographix-polytechnique-reports:0.2.0" as template
+#import "@preview/typographix-polytechnique-reports:0.2.1" as template
 
 // Defining variables for the cover page and PDF metadata
 // Main title on cover page
@@ -16,12 +16,13 @@
 #let date-end = datetime(year: 2024, month: 09, day: 05)
 // Set to true for bigger margins and so on (good luck with your report)
 #let despair-mode = false
+#let first-line-indent-all = auto
 
 #set text(lang: "fr")
 
 // Set document metadata
 #set document(title: title, author: author, date: datetime.today())
-#show: template.apply.with(despair-mode: despair-mode)
+#show: template.apply.with(despair-mode: despair-mode, first-line-indent-all: first-line-indent-all)
 
 // Cover page
 #template.cover(

report/typst.toml

@@ -1,6 +1,6 @@
 [package]
 name = "typographix-polytechnique-reports"
-version = "0.2.0"
+version = "0.2.1"
 entrypoint = "main.typ"
 authors = ["Rémi Germe <@remigerme>"]
 license = "MIT"