From af77887364fdbdfaf606461c5a4f332e1bfea665 Mon Sep 17 00:00:00 2001
From: Luis Rivera <12088563+jarnowic@users.noreply.github.com>
Date: Tue, 15 Oct 2024 20:58:44 -0600
Subject: [PATCH 01/20] Update template.typst for upcoming typst 0.12

layout instructions for two column layout has changed. see https://github.com/typst/typst/issues/5215
---
 data/templates/template.typst | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/data/templates/template.typst b/data/templates/template.typst
index 42532e1b24f0..eeb903202157 100644
--- a/data/templates/template.typst
+++ b/data/templates/template.typst
@@ -44,7 +44,7 @@
   set heading(numbering: sectionnumbering)
 
   if title != none {
-    align(center)[#block(inset: 2em)[
+	place(top + center, float: true, scope: "parent")[
       #text(weight: "bold", size: 1.5em)[#title]
       #(if subtitle != none {
         parbreak()
@@ -56,7 +56,8 @@
   if authors != none and authors != [] {
     let count = authors.len()
     let ncols = calc.min(count, 3)
-    grid(
+	  place(top + center, float: true, scope: "parent")[
+     #grid(
       columns: (1fr,) * ncols,
       row-gutter: 1.5em,
       ..authors.map(author =>
@@ -66,24 +67,19 @@
             #author.email
           ]
       )
-    )
+    ]
   }
 
   if date != none {
-    align(center)[#block(inset: 1em)[
+	place(top + center, float: true, scope: "parent")[
       #date
     ]]
   }
 
   if abstract != none {
-    block(inset: 2em)[
+	place(top + center, float: true, scope: "parent")[
     #text(weight: "semibold")[Abstract] #h(1em) #abstract
     ]
   }
-
-  if cols == 1 {
-    doc
-  } else {
-    columns(cols, doc)
-  }
+doc
 }

From 0541344370bf14eb8b565d0207287aa7922b72ac Mon Sep 17 00:00:00 2001
From: Luis Rivera <12088563+jarnowic@users.noreply.github.com>
Date: Tue, 15 Oct 2024 21:03:18 -0600
Subject: [PATCH 02/20] Update default.typst for upcoming typst 0.12

two column layout instructions have changed in typst 0.12; see  https://github.com/typst/typst/issues/5215 for details.
---
 data/templates/default.typst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/data/templates/default.typst b/data/templates/default.typst
index 8efe33887a7d..15dd94e46750 100644
--- a/data/templates/default.typst
+++ b/data/templates/default.typst
@@ -28,6 +28,10 @@ $else$
 $template.typst()$
 $endif$
 
+#set page(
+  columns: $if(columns)$$columns$$else$1$endif$,
+)
+
 $if(smart)$
 $else$
 #set smartquote(enabled: false)
@@ -89,7 +93,6 @@ $endif$
 $if(section-numbering)$
   sectionnumbering: "$section-numbering$",
 $endif$
-  cols: $if(columns)$$columns$$else$1$endif$,
   doc,
 )
 

From 71e68507fb83671e413175f144595119f1e63dc4 Mon Sep 17 00:00:00 2001
From: Luis Rivera <12088563+jarnowic@users.noreply.github.com>
Date: Tue, 15 Oct 2024 21:23:43 -0600
Subject: [PATCH 03/20] Update template.typst

fixed braces (I hope...)
---
 data/templates/template.typst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/data/templates/template.typst b/data/templates/template.typst
index eeb903202157..2ac6a5f5fe63 100644
--- a/data/templates/template.typst
+++ b/data/templates/template.typst
@@ -50,7 +50,7 @@
         parbreak()
         text(weight: "bold", size: 1.25em)[#subtitle]
       })
-    ]]
+    ]
   }
 
   if authors != none and authors != [] {
@@ -67,13 +67,14 @@
             #author.email
           ]
       )
+     )
     ]
   }
 
   if date != none {
 	place(top + center, float: true, scope: "parent")[
       #date
-    ]]
+    ]
   }
 
   if abstract != none {

From a52eb4c13ebe0a6aa5014da221f263eaaa738fa7 Mon Sep 17 00:00:00 2001
From: Luis Rivera <12088563+jarnowic@users.noreply.github.com>
Date: Tue, 15 Oct 2024 23:35:11 -0600
Subject: [PATCH 04/20] Update template.typst

fix indent
---
 data/templates/template.typst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/templates/template.typst b/data/templates/template.typst
index 2ac6a5f5fe63..4132737ad7c1 100644
--- a/data/templates/template.typst
+++ b/data/templates/template.typst
@@ -44,7 +44,7 @@
   set heading(numbering: sectionnumbering)
 
   if title != none {
-	place(top + center, float: true, scope: "parent")[
+    place(top + center, float: true, scope: "parent")[
       #text(weight: "bold", size: 1.5em)[#title]
       #(if subtitle != none {
         parbreak()

From 00c915df019970cbddc5439ed4ecc91faf4b3103 Mon Sep 17 00:00:00 2001
From: Luis Rivera <12088563+jarnowic@users.noreply.github.com>
Date: Tue, 15 Oct 2024 23:36:59 -0600
Subject: [PATCH 05/20] Update template.typst

fixed indentation?
---
 data/templates/template.typst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/templates/template.typst b/data/templates/template.typst
index 4132737ad7c1..4394c5d3da97 100644
--- a/data/templates/template.typst
+++ b/data/templates/template.typst
@@ -56,7 +56,7 @@
   if authors != none and authors != [] {
     let count = authors.len()
     let ncols = calc.min(count, 3)
-	  place(top + center, float: true, scope: "parent")[
+    place(top + center, float: true, scope: "parent")[
      #grid(
       columns: (1fr,) * ncols,
       row-gutter: 1.5em,
@@ -72,13 +72,13 @@
   }
 
   if date != none {
-	place(top + center, float: true, scope: "parent")[
+    place(top + center, float: true, scope: "parent")[
       #date
     ]
   }
 
   if abstract != none {
-	place(top + center, float: true, scope: "parent")[
+    place(top + center, float: true, scope: "parent")[
     #text(weight: "semibold")[Abstract] #h(1em) #abstract
     ]
   }

From 13d74ba0dfc20b619c436047a3770bf40d6325b7 Mon Sep 17 00:00:00 2001
From: Luis Rivera <12088563+jarnowic@users.noreply.github.com>
Date: Fri, 18 Oct 2024 20:17:18 -0600
Subject: [PATCH 06/20] Update template.typst for typst 0.12 styling

---
 data/templates/template.typst | 40 ++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/data/templates/template.typst b/data/templates/template.typst
index 4394c5d3da97..b9884c422868 100644
--- a/data/templates/template.typst
+++ b/data/templates/template.typst
@@ -43,44 +43,40 @@
            size: fontsize)
   set heading(numbering: sectionnumbering)
 
-  if title != none {
-    place(top + center, float: true, scope: "parent")[
-      #text(weight: "bold", size: 1.5em)[#title]
-      #(if subtitle != none {
+  place(top + center, float: true, scope: "parent", clearance: 4mm)[
+  #if title != none {
+      text(weight: "bold", size: 1.5em)[#title]
+      (if subtitle != none {
         parbreak()
         text(weight: "bold", size: 1.25em)[#subtitle]
       })
-    ]
   }
 
-  if authors != none and authors != [] {
+  #if authors != none and authors != [] {
     let count = authors.len()
     let ncols = calc.min(count, 3)
-    place(top + center, float: true, scope: "parent")[
-     #grid(
-      columns: (1fr,) * ncols,
-      row-gutter: 1.5em,
-      ..authors.map(author =>
+      grid(
+        columns: (1fr,) * ncols,
+        row-gutter: 1.5em,
+        ..authors.map(author =>
           align(center)[
             #author.name \
             #author.affiliation \
             #author.email
           ]
-      )
-     )
-    ]
+        )
+       )
   }
 
-  if date != none {
-    place(top + center, float: true, scope: "parent")[
-      #date
-    ]
+  #if date != none {
+      date
   }
 
-  if abstract != none {
-    place(top + center, float: true, scope: "parent")[
-    #text(weight: "semibold")[Abstract] #h(1em) #abstract
-    ]
+  #if abstract != none {
+    text(weight: "semibold")[Abstract]
+      h(1em) 
+      abstract
   }
+]
 doc
 }

From 2b03d2664b8727517d05cfd1ef910e577038fa48 Mon Sep 17 00:00:00 2001
From: Luis Rivera <12088563+jarnowic@users.noreply.github.com>
Date: Mon, 28 Oct 2024 18:45:34 -0600
Subject: [PATCH 07/20] Update template.typst

set columns in template.typst
---
 data/templates/template.typst | 44 +++++++++++++++++------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/data/templates/template.typst b/data/templates/template.typst
index b9884c422868..4772864775eb 100644
--- a/data/templates/template.typst
+++ b/data/templates/template.typst
@@ -16,9 +16,9 @@
   keywords: (),
   date: none,
   abstract: none,
-  cols: 1,
   margin: (x: 1.25in, y: 1.25in),
   paper: "us-letter",
+  cols: 1,
   lang: "en",
   region: "US",
   font: (),
@@ -32,10 +32,10 @@
     keywords: keywords,
   )
   set page(
-    paper: paper,
     margin: margin,
     numbering: "1",
-  )
+    columns: cols,
+    )
   set par(justify: true)
   set text(lang: lang,
            region: region,
@@ -44,39 +44,39 @@
   set heading(numbering: sectionnumbering)
 
   place(top + center, float: true, scope: "parent", clearance: 4mm)[
-  #if title != none {
+    #if title != none {
       text(weight: "bold", size: 1.5em)[#title]
       (if subtitle != none {
         parbreak()
         text(weight: "bold", size: 1.25em)[#subtitle]
       })
-  }
+    }
 
-  #if authors != none and authors != [] {
-    let count = authors.len()
-    let ncols = calc.min(count, 3)
-      grid(
+    #if authors != none and authors != [] {
+      let count = authors.len()
+      let ncols = calc.min(count, 3)
+       grid(
         columns: (1fr,) * ncols,
         row-gutter: 1.5em,
         ..authors.map(author =>
-          align(center)[
-            #author.name \
-            #author.affiliation \
-            #author.email
-          ]
+            align(center)[
+              #author.name \
+              #author.affiliation \
+              #author.email
+            ]
         )
        )
-  }
+    }
 
-  #if date != none {
-      date
-  }
+    #if date != none {
+        date
+    }
 
-  #if abstract != none {
-    text(weight: "semibold")[Abstract]
+    #if abstract != none {
+      text(weight: "semibold")[Abstract]
       h(1em) 
       abstract
-  }
-]
+    }
+  ]
 doc
 }

From 78a6e01258c9ea3dc22003d5d4109eb37b247098 Mon Sep 17 00:00:00 2001
From: Luis Rivera <12088563+jarnowic@users.noreply.github.com>
Date: Mon, 28 Oct 2024 18:48:00 -0600
Subject: [PATCH 08/20] Update default.typst

revert original `cols` variable from `template.typst`; `template.typst` keeps the original `page` settings
---
 data/templates/default.typst | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/data/templates/default.typst b/data/templates/default.typst
index 15dd94e46750..858eae2ad26a 100644
--- a/data/templates/default.typst
+++ b/data/templates/default.typst
@@ -28,19 +28,17 @@ $else$
 $template.typst()$
 $endif$
 
-#set page(
-  columns: $if(columns)$$columns$$else$1$endif$,
-)
-
 $if(smart)$
 $else$
 #set smartquote(enabled: false)
 
 $endif$
+
 $for(header-includes)$
 $header-includes$
 
 $endfor$
+
 #show: doc => conf(
 $if(title)$
   title: [$title$],
@@ -93,6 +91,7 @@ $endif$
 $if(section-numbering)$
   sectionnumbering: "$section-numbering$",
 $endif$
+  cols: $if(columns)$$columns$$else$1$endif$,
   doc,
 )
 

From 198580a36c5735c4225b02cef402639280835830 Mon Sep 17 00:00:00 2001
From: Luis Rivera <12088563+jarnowic@users.noreply.github.com>
Date: Mon, 28 Oct 2024 18:58:41 -0600
Subject: [PATCH 09/20] Update template.typst

fixed regression (removed `paper` from `page` accidentally)...
---
 data/templates/template.typst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/templates/template.typst b/data/templates/template.typst
index 4772864775eb..9d59255c3ee2 100644
--- a/data/templates/template.typst
+++ b/data/templates/template.typst
@@ -32,6 +32,7 @@
     keywords: keywords,
   )
   set page(
+    paper: paper,
     margin: margin,
     numbering: "1",
     columns: cols,

From 35247496af6b395148efabd599916eaccf2729fe Mon Sep 17 00:00:00 2001
From: Luis Rivera <12088563+jarnowic@users.noreply.github.com>
Date: Mon, 28 Oct 2024 19:00:42 -0600
Subject: [PATCH 10/20] Update template.typst

misplaced `cols` variable...
---
 data/templates/template.typst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/templates/template.typst b/data/templates/template.typst
index 9d59255c3ee2..a1c5384c76e0 100644
--- a/data/templates/template.typst
+++ b/data/templates/template.typst
@@ -16,9 +16,9 @@
   keywords: (),
   date: none,
   abstract: none,
+  cols: 1,
   margin: (x: 1.25in, y: 1.25in),
   paper: "us-letter",
-  cols: 1,
   lang: "en",
   region: "US",
   font: (),

From cbf2ce4373ca3de1afef37e2a25a8cc6a75c8346 Mon Sep 17 00:00:00 2001
From: Luis Rivera <12088563+jarnowic@users.noreply.github.com>
Date: Mon, 28 Oct 2024 19:03:20 -0600
Subject: [PATCH 11/20] Update template.typst

restored empty line...
---
 data/templates/template.typst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/templates/template.typst b/data/templates/template.typst
index a1c5384c76e0..92d3b1be8eba 100644
--- a/data/templates/template.typst
+++ b/data/templates/template.typst
@@ -37,6 +37,7 @@
     numbering: "1",
     columns: cols,
     )
+
   set par(justify: true)
   set text(lang: lang,
            region: region,

From 9eb35265f46ddb74e09fbc07ee4bf82b67cb8e7a Mon Sep 17 00:00:00 2001
From: Luis Rivera <12088563+jarnowic@users.noreply.github.com>
Date: Mon, 28 Oct 2024 20:06:18 -0600
Subject: [PATCH 12/20] Update default.typst

prettified (sort of) blank space...
---
 data/templates/default.typst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/data/templates/default.typst b/data/templates/default.typst
index 858eae2ad26a..88da07d024a3 100644
--- a/data/templates/default.typst
+++ b/data/templates/default.typst
@@ -31,12 +31,10 @@ $endif$
 $if(smart)$
 $else$
 #set smartquote(enabled: false)
-
 $endif$
 
 $for(header-includes)$
 $header-includes$
-
 $endfor$
 
 #show: doc => conf(

From a25eac474ac3e0578c676749f623ace0667c7e77 Mon Sep 17 00:00:00 2001
From: Luis Rivera <12088563+jarnowic@users.noreply.github.com>
Date: Tue, 29 Oct 2024 12:24:07 -0600
Subject: [PATCH 13/20] Update default.typst

reverted cosmetic changes for functional ones... effectively restoring original version, iiuc.
---
 data/templates/default.typst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/templates/default.typst b/data/templates/default.typst
index 88da07d024a3..8efe33887a7d 100644
--- a/data/templates/default.typst
+++ b/data/templates/default.typst
@@ -31,12 +31,12 @@ $endif$
 $if(smart)$
 $else$
 #set smartquote(enabled: false)
-$endif$
 
+$endif$
 $for(header-includes)$
 $header-includes$
-$endfor$
 
+$endfor$
 #show: doc => conf(
 $if(title)$
   title: [$title$],

From 82c8e63d68c252e4c039f799069e41e2d39d5847 Mon Sep 17 00:00:00 2001
From: Luis Rivera <12088563+jarnowic@users.noreply.github.com>
Date: Tue, 29 Oct 2024 12:27:28 -0600
Subject: [PATCH 14/20] Update template.typst

removed extra space, added while debugging for clarity
---
 data/templates/template.typst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/templates/template.typst b/data/templates/template.typst
index 92d3b1be8eba..a1c5384c76e0 100644
--- a/data/templates/template.typst
+++ b/data/templates/template.typst
@@ -37,7 +37,6 @@
     numbering: "1",
     columns: cols,
     )
-
   set par(justify: true)
   set text(lang: lang,
            region: region,

From c33d9fa8d6a0e02537e2f61ea1b5e82764611844 Mon Sep 17 00:00:00 2001
From: Luis Rivera <12088563+jarnowic@users.noreply.github.com>
Date: Tue, 29 Oct 2024 12:40:00 -0600
Subject: [PATCH 15/20] Update template.typst

space test added, for legibility
---
 data/templates/template.typst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/templates/template.typst b/data/templates/template.typst
index a1c5384c76e0..7fc341f814ef 100644
--- a/data/templates/template.typst
+++ b/data/templates/template.typst
@@ -79,5 +79,6 @@
       abstract
     }
   ]
+
 doc
 }

From 170f5aaf18609a2c1b4a245982c14f343d7fc8d6 Mon Sep 17 00:00:00 2001
From: Luis Rivera <12088563+jarnowic@users.noreply.github.com>
Date: Tue, 29 Oct 2024 12:43:40 -0600
Subject: [PATCH 16/20] Update template.typst

restored blank line, as in the original, to minimize the diff file
---
 data/templates/template.typst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/templates/template.typst b/data/templates/template.typst
index 7fc341f814ef..72ab99660465 100644
--- a/data/templates/template.typst
+++ b/data/templates/template.typst
@@ -37,6 +37,7 @@
     numbering: "1",
     columns: cols,
     )
+
   set par(justify: true)
   set text(lang: lang,
            region: region,

From d1da8f6958b96ef1a6a632368d052b81bf8e79ac Mon Sep 17 00:00:00 2001
From: Luis Rivera <12088563+jarnowic@users.noreply.github.com>
Date: Tue, 29 Oct 2024 14:40:11 -0600
Subject: [PATCH 17/20] Update template.typst

restored insets
---
 data/templates/template.typst | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/data/templates/template.typst b/data/templates/template.typst
index 72ab99660465..592c621a5b57 100644
--- a/data/templates/template.typst
+++ b/data/templates/template.typst
@@ -47,11 +47,13 @@
 
   place(top + center, float: true, scope: "parent", clearance: 4mm)[
     #if title != none {
-      text(weight: "bold", size: 1.5em)[#title]
-      (if subtitle != none {
+    block(inset: 2em)[
+    #text(weight: "bold", size: 1.5em)[#title]
+      #(if subtitle != none {
         parbreak()
         text(weight: "bold", size: 1.25em)[#subtitle]
       })
+    ]
     }
 
     #if authors != none and authors != [] {
@@ -71,13 +73,15 @@
     }
 
     #if date != none {
-        date
+      block(inset: 1em)[
+      #date
+    ]
     }
 
     #if abstract != none {
-      text(weight: "semibold")[Abstract]
-      h(1em) 
-      abstract
+    block(inset: 2em)[
+    #text(weight: "semibold")[Abstract] #h(1em) #abstract
+    ]
     }
   ]
 

From 7902ac78ac2b49709f08f1f907049da1e83e3f83 Mon Sep 17 00:00:00 2001
From: Luis Rivera <12088563+jarnowic@users.noreply.github.com>
Date: Tue, 29 Oct 2024 14:44:34 -0600
Subject: [PATCH 18/20] Update template.typst

removed extra blank
---
 data/templates/template.typst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/templates/template.typst b/data/templates/template.typst
index 592c621a5b57..baaf4abd1c95 100644
--- a/data/templates/template.typst
+++ b/data/templates/template.typst
@@ -37,7 +37,6 @@
     numbering: "1",
     columns: cols,
     )
-
   set par(justify: true)
   set text(lang: lang,
            region: region,

From 0c55a966b834b8c54f17c328af6464e876dc0d12 Mon Sep 17 00:00:00 2001
From: Luis Rivera <12088563+jarnowic@users.noreply.github.com>
Date: Tue, 29 Oct 2024 14:55:47 -0600
Subject: [PATCH 19/20] Update template.typst

cleanup
---
 data/templates/template.typst | 55 ++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/data/templates/template.typst b/data/templates/template.typst
index baaf4abd1c95..9b3fd42e6bbe 100644
--- a/data/templates/template.typst
+++ b/data/templates/template.typst
@@ -37,6 +37,7 @@
     numbering: "1",
     columns: cols,
     )
+
   set par(justify: true)
   set text(lang: lang,
            region: region,
@@ -44,44 +45,44 @@
            size: fontsize)
   set heading(numbering: sectionnumbering)
 
-  place(top + center, float: true, scope: "parent", clearance: 4mm)[
-    #if title != none {
-    block(inset: 2em)[
-    #text(weight: "bold", size: 1.5em)[#title]
+  place(top, float: true, scope: "parent", clearance: 4mm)[
+  #if title != none {
+    align(center)[#block(inset: 2em)[
+      #text(weight: "bold", size: 1.5em)[#title]
       #(if subtitle != none {
         parbreak()
         text(weight: "bold", size: 1.25em)[#subtitle]
       })
-    ]
-    }
+    ]]
+  }
 
-    #if authors != none and authors != [] {
-      let count = authors.len()
-      let ncols = calc.min(count, 3)
-       grid(
-        columns: (1fr,) * ncols,
-        row-gutter: 1.5em,
-        ..authors.map(author =>
-            align(center)[
-              #author.name \
-              #author.affiliation \
-              #author.email
-            ]
-        )
-       )
-    }
+  #if authors != none and authors != [] {
+    let count = authors.len()
+    let ncols = calc.min(count, 3)
+    grid(
+      columns: (1fr,) * ncols,
+      row-gutter: 1.5em,
+      ..authors.map(author =>
+          align(center)[
+            #author.name \
+            #author.affiliation \
+            #author.email
+          ]
+      )
+    )
+  }
 
-    #if date != none {
-      block(inset: 1em)[
+  #if date != none {
+    align(center)[#block(inset: 1em)[
       #date
-    ]
-    }
+    ]]
+  }
 
-    #if abstract != none {
+  #if abstract != none {
     block(inset: 2em)[
     #text(weight: "semibold")[Abstract] #h(1em) #abstract
     ]
-    }
+  }
   ]
 
 doc

From b69d27c5be61722348d02face4533a18cf3407ef Mon Sep 17 00:00:00 2001
From: Luis Rivera <12088563+jarnowic@users.noreply.github.com>
Date: Tue, 29 Oct 2024 15:02:29 -0600
Subject: [PATCH 20/20] Update template.typst

cleanup
---
 data/templates/template.typst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/templates/template.typst b/data/templates/template.typst
index 9b3fd42e6bbe..f29ef409a225 100644
--- a/data/templates/template.typst
+++ b/data/templates/template.typst
@@ -37,7 +37,6 @@
     numbering: "1",
     columns: cols,
     )
-
   set par(justify: true)
   set text(lang: lang,
            region: region,