From 317d1adfb8f12b012763c9378c29b480f9072d0f Mon Sep 17 00:00:00 2001
From: Michael <106514037+togglmichael@users.noreply.github.com>
Date: Thu, 20 Nov 2025 21:12:29 +0100
Subject: [PATCH 1/4] fix(mx): Revolution Day every 3rd mon of November

---
 v2/go.mod            |  2 +-
 v2/mx/mx_holidays.go | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/v2/go.mod b/v2/go.mod
index 7395c0c..f8854fe 100644
--- a/v2/go.mod
+++ b/v2/go.mod
@@ -1,3 +1,3 @@
-module github.com/rickar/cal/v2
+module github.com/togglmichael/cal/v2
 
 go 1.12
diff --git a/v2/mx/mx_holidays.go b/v2/mx/mx_holidays.go
index 6943efa..6f7fb75 100644
--- a/v2/mx/mx_holidays.go
+++ b/v2/mx/mx_holidays.go
@@ -64,12 +64,12 @@ var (
 
 	// RevolutionDay represents Revolution Day on 20-Nov
 	RevolutionDay = &cal.Holiday{
-		Name:     "Revolution Day",
-		Type:     cal.ObservancePublic,
-		Month:    time.November,
-		Day:      20,
-		Observed: weekendAlt,
-		Func:     cal.CalcDayOfMonth,
+		Name:    "Revolution Day",
+		Type:    cal.ObservancePublic,
+		Month:   time.November,
+		Offset:  3,
+		Weekday: time.Monday,
+		Func:    cal.CalcWeekdayOffset,
 	}
 
 	// ChristmasDay represents Christmas Day on 25-Dec

From 0a2ddeef77e98ef41a32ec830dcae05d23081ff7 Mon Sep 17 00:00:00 2001
From: Michael Gao <michael.gao@toggl.com>
Date: Thu, 20 Nov 2025 23:20:53 +0100
Subject: [PATCH 2/4] test(mx): Assert every 3rd Monday of November

---
 v2/mx/mx_holidays_test.go | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/v2/mx/mx_holidays_test.go b/v2/mx/mx_holidays_test.go
index 3f553ec..974d265 100644
--- a/v2/mx/mx_holidays_test.go
+++ b/v2/mx/mx_holidays_test.go
@@ -65,14 +65,18 @@ func TestHolidays(t *testing.T) {
 		{IndependenceDay, 2021, d(2021, 9, 16), d(2021, 9, 16)},
 		{IndependenceDay, 2022, d(2022, 9, 16), d(2022, 9, 16)},
 
-		{RevolutionDay, 2015, d(2015, 11, 20), d(2015, 11, 20)},
-		{RevolutionDay, 2016, d(2016, 11, 20), d(2016, 11, 21)},
+		{RevolutionDay, 2015, d(2015, 11, 16), d(2015, 11, 16)},
+		{RevolutionDay, 2016, d(2016, 11, 21), d(2016, 11, 21)},
 		{RevolutionDay, 2017, d(2017, 11, 20), d(2017, 11, 20)},
-		{RevolutionDay, 2018, d(2018, 11, 20), d(2018, 11, 20)},
-		{RevolutionDay, 2019, d(2019, 11, 20), d(2019, 11, 20)},
-		{RevolutionDay, 2020, d(2020, 11, 20), d(2020, 11, 20)},
-		{RevolutionDay, 2021, d(2021, 11, 20), d(2021, 11, 19)},
-		{RevolutionDay, 2022, d(2022, 11, 20), d(2022, 11, 21)},
+		{RevolutionDay, 2018, d(2018, 11, 19), d(2018, 11, 19)},
+		{RevolutionDay, 2019, d(2019, 11, 18), d(2019, 11, 18)},
+		{RevolutionDay, 2020, d(2020, 11, 16), d(2020, 11, 16)},
+		{RevolutionDay, 2021, d(2021, 11, 15), d(2021, 11, 15)},
+		{RevolutionDay, 2022, d(2022, 11, 21), d(2022, 11, 21)},
+		{RevolutionDay, 2023, d(2023, 11, 20), d(2023, 11, 20)},
+		{RevolutionDay, 2024, d(2024, 11, 18), d(2024, 11, 18)},
+		{RevolutionDay, 2025, d(2025, 11, 17), d(2025, 11, 17)},
+		{RevolutionDay, 2026, d(2026, 11, 16), d(2026, 11, 16)},
 
 		{ChristmasDay, 2015, d(2015, 12, 25), d(2015, 12, 25)},
 		{ChristmasDay, 2016, d(2016, 12, 25), d(2016, 12, 26)},

From 356424d171e9093b8332b9c60a58466d444f696e Mon Sep 17 00:00:00 2001
From: Michael Gao <michael.gao@toggl.com>
Date: Thu, 20 Nov 2025 23:06:16 +0100
Subject: [PATCH 3/4] chore: Revert module name

---
 v2/go.mod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2/go.mod b/v2/go.mod
index f8854fe..7395c0c 100644
--- a/v2/go.mod
+++ b/v2/go.mod
@@ -1,3 +1,3 @@
-module github.com/togglmichael/cal/v2
+module github.com/rickar/cal/v2
 
 go 1.12

From f9ad0a091fb861febdb5292cee02732bb799abfb Mon Sep 17 00:00:00 2001
From: Michael Gao <michael.gao@toggl.com>
Date: Thu, 20 Nov 2025 23:37:17 +0100
Subject: [PATCH 4/4] docs(mx): Update Revolution Day comment

---
 v2/mx/mx_holidays.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2/mx/mx_holidays.go b/v2/mx/mx_holidays.go
index 6f7fb75..0c8cad4 100644
--- a/v2/mx/mx_holidays.go
+++ b/v2/mx/mx_holidays.go
@@ -62,7 +62,7 @@ var (
 		Func:     cal.CalcDayOfMonth,
 	}
 
-	// RevolutionDay represents Revolution Day on 20-Nov
+	// RevolutionDay represents Revolution Day on the 3rd Monday in November
 	RevolutionDay = &cal.Holiday{
 		Name:    "Revolution Day",
 		Type:    cal.ObservancePublic,