From 44d408583ab8811f2b89d8fcb9e21b98f1409b7d Mon Sep 17 00:00:00 2001
From: San Jacobs
Date: Sat, 14 Oct 2023 16:19:16 +0200
Subject: There is a theme editor now???

---
 src/time.odin | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/time.odin')

diff --git a/src/time.odin b/src/time.odin
index 44c810a..b607e51 100644
--- a/src/time.odin
+++ b/src/time.odin
@@ -89,7 +89,7 @@ new_workday :: proc(previous_wrap    : Moment,
 								// Paragraph 6.7 says that up to 2 hours of unused warned overtime counts as worktime,
 								// though so that at least one hour of the unused overtime is not counted.
 								// (It's unclear if an 8-hour day that ends 3 hours in counts as having 5 hours of unused overtime)
-								max(clamp(sub(planned_wrap, {0, 1, 0}), wrap, add(wrap, {0, 2, 0})),
+								time_max(time_clamp(sub(planned_wrap, {0, 1, 0}), wrap, add(wrap, {0, 2, 0})),
 									add(call, {0, 4, 0})), 1, ""}
 									//  ^ Minimum 4 hour day ^
 	
@@ -169,7 +169,7 @@ new_workday :: proc(previous_wrap    : Moment,
 		if getweekday(block.start) == .Sunday do upvalue(&block, 2, "Sunday") // Sundays are +100%
 		
 		if !(less(call, Moment{0, 7, call.day, call.month, call.year}) &&
-			less(min(add(call, Delta{0,8,0}), wrap), Moment{0, 17, call.day, call.month, call.year} )) {
+			less(time_min(add(call, Delta{0,8,0}), wrap), Moment{0, 17, call.day, call.month, call.year} )) {
 				// This was added for rule 6.11c, but in a world without a defined normal workday,
 				// that rule is already covered already by 6.11g, so this is empty.
 			}
@@ -389,7 +389,7 @@ maxDelta :: proc(delta_a: Delta, delta_b: Delta) -> Delta {
 	if sortable(delta_a) > sortable(delta_b) do return delta_a
 	return delta_b
 }
-max :: proc{maxDelta, maxMoment}
+time_max :: proc{maxDelta, maxMoment}
 
 minMoment :: proc(moment_a: Moment, moment_b: Moment) -> Moment {
 	if sortable(moment_a) < sortable(moment_b) do return moment_a
@@ -399,15 +399,15 @@ minDelta :: proc(delta_a: Delta, delta_b: Delta) -> Delta {
 	if sortable(delta_a) < sortable(delta_b) do return delta_a
 	return delta_b
 }
-min :: proc{minDelta, minMoment}
+time_min :: proc{minDelta, minMoment}
 
 clampMoment :: proc(moment: Moment, moment_min: Moment, moment_max: Moment) -> Moment {
-	return min(max(moment, moment_min), moment_max)
+	return time_min(time_max(moment, moment_min), moment_max)
 }
 clampDelta :: proc(delta: Delta, delta_min: Delta, delta_max: Delta) -> Delta {
-	return min(max(delta, delta_min), delta_max)
+	return time_min(time_max(delta, delta_min), delta_max)
 }
-clamp :: proc{clampMoment, clampDelta}
+time_clamp :: proc{clampMoment, clampDelta}
 
 greatMoment :: proc(moment_a: Moment, moment_b: Moment) -> bool {
 	return bool(sortable(moment_a) > sortable(moment_b))
-- 
cgit v1.2.1


From 2e3a7e10756954dc5a99d617a1c0eef327d3adbb Mon Sep 17 00:00:00 2001
From: San Jacobs
Date: Sun, 15 Oct 2023 14:37:29 +0200
Subject: Normalized timelines and editor for spacing and sizing

---
 src/time.odin | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/time.odin')

diff --git a/src/time.odin b/src/time.odin
index b607e51..1f2ffbd 100644
--- a/src/time.odin
+++ b/src/time.odin
@@ -602,6 +602,16 @@ clockprintTimeblock :: proc(block: Timeblock) -> string {
 }
 clockprint :: proc{clockprintTimeblock, clockprintMoment}
 
+dayprintMoment :: proc(moment: Moment) -> string {
+	using moment
+	return fmt.tprintf("%4i-%2i-%2i", year, month, day)
+}
+dayprintTimeblock :: proc(block: Timeblock) -> string {
+	using block
+	return fmt.tprintf("%s -> %s", dayprint(start), dayprint(end))
+}
+dayprint :: proc{dayprintTimeblock, dayprintMoment}
+
 popBlock :: proc(workday: ^Workday, index: int, count: int = 1) {
 	using workday
 	when ODIN_DEBUG do fmt.printf("popBlock() running to remove %i block(s) from index %i\n", count, index)
-- 
cgit v1.2.1