Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: access subslide and repeat in footer and header #24

Merged
merged 2 commits into from
Mar 29, 2024

Conversation

OrangeX4
Copy link
Member

Implement #21.

we can access subslide and repeat in footer by code like footer: self => self.subslide and footer: self => self.repeat.

@OrangeX4 OrangeX4 requested a review from ntjess March 29, 2024 08:09
@ntjess
Copy link
Collaborator

ntjess commented Mar 29, 2024

Perhaps the logic can be simplified by checking for auto first?
Edit: Oops, handout should still point to last subslide. The patch is fixed in the edit

proposed.patch

Patch
diff --git "a/.\\actual.typ" "b/.\\proposed.typ"
index 6463457..becd9a2 100644
--- "a/.\\actual.typ"
+++ "b/.\\proposed.typ"
@@ -323,6 +323,12 @@
   return (result-arr, max-repetitions)
 }
 
+#let _get-header-footer(self) = {
+  let header = utils.call-or-display(self, self.page-args.at("header", default: none))
+  let footer = utils.call-or-display(self, self.page-args.at("footer", default: none))
+  (header, footer)
+}
+
 // touying-slide
 #let touying-slide(
   self: none,
@@ -383,20 +389,6 @@
       states._sections-step(repetitions)
     }
   }
-  // page header and footer
-  // for speed up, do not parse the content if repeat is none
-  if repeat == none {
-    self.repeat = repeat
-    self.subslide = 1
-    let header = utils.call-or-display(self, self.page-args.at("header", default: none))
-    let footer = utils.call-or-display(self, self.page-args.at("footer", default: none))
-    return {
-      header = _update-states(1) + header
-      page(..(self.page-args + (header: header, footer: footer)), setting-with-pad(
-        page-preamble(1) + composer-with-side-by-side(..bodies)
-      ))
-    }
-  }
   // for single page slide, get the repetitions
   if repeat == auto {
     let (_, repetitions) = _parse-content(
@@ -407,11 +399,22 @@
     )
     repeat = repetitions
   }
+  self.repeat = repeat
+  self.subslide = 1
+  let (header, footer) = _get-header-footer(self)
+  // page header and footer
+  // for speed up, do not parse the content if repeat is none
+  if repeat == none {
+    return {
+      header = _update-states(1) + header
+      page(..(self.page-args + (header: header, footer: footer)), setting-with-pad(
+        page-preamble(1) + composer-with-side-by-side(..bodies)
+      ))
+    }
+  }
+  
   if self.handout {
-    self.repeat = repeat
     self.subslide = repeat
-    let header = utils.call-or-display(self, self.page-args.at("header", default: none))
-    let footer = utils.call-or-display(self, self.page-args.at("footer", default: none))
     let (conts, _) = _parse-content(self: self, index: repeat, ..bodies)
     header = _update-states(1) + header
     page(..(self.page-args + (header: header, footer: footer)), setting-with-pad(
@@ -424,8 +427,7 @@
     self.repeat = repeat
     for i in range(1, repeat + 1) {
       self.subslide = i
-      let header = utils.call-or-display(self, self.page-args.at("header", default: none))
-      let footer = utils.call-or-display(self, self.page-args.at("footer", default: none))
+      let (header, footer) = _get-header-footer(self)
       let new-header = header
       let (conts, _) = _parse-content(self: self, index: i, ..bodies)
       // update the counter in the first subslide

@OrangeX4
Copy link
Member Author

Yes, thanks. I've updated it

@OrangeX4 OrangeX4 linked an issue Mar 29, 2024 that may be closed by this pull request
@OrangeX4 OrangeX4 merged commit 3c06ca1 into main Mar 29, 2024
@OrangeX4 OrangeX4 deleted the subslide-and-repeat branch April 4, 2024 03:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Is it possible to access the subslide number in the footer?
2 participants