From 204a80b7880b9bda34c99f642640e43b5c45bffa Mon Sep 17 00:00:00 2001
From: Oskar Eichler <oskar@songstats.com>
Date: Thu, 27 Aug 2026 20:41:26 +0300
Subject: [PATCH] Parse mixed-case and compound named clock values

---
 lib/fugit/nat.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/fugit/nat.rb b/lib/fugit/nat.rb
index 0b0969f..84278fe 100644
--- a/lib/fugit/nat.rb
+++ b/lib/fugit/nat.rb
@@ -104,7 +104,7 @@ module Parser include Raabro
       MONTHDAY_REX = /3[0-1]|[0-2]?[0-9]/.freeze
       WEEKDAY_REX = /(#{WEEKDAYS.join('|')})(?=($|[-, \t]))/i.freeze
         # prevent "mon" from eating "monday"
-      NAMED_M_REX = /#{NMINUTES.keys.join('|')}/i.freeze
+      NAMED_M_REX = /#{NMINUTES.keys.sort_by { |k| -k.length }.join('|')}/i.freeze
       NAMED_H_REX = /#{NHOURS.keys.join('|')}/i.freeze
       POINT_REX = /(#{POINTS.join('|')})[ \t]+/i.freeze
       INTERVAL_REX = /[ \t]*(#{INTERVALS.join('|')})/.freeze
@@ -558,8 +558,8 @@ def rewrite_named_hour(t)
         mt = t.sublookup(:named_m)
         apt = t.sublookup(:ampm)
 
-        h = ht.strinp
-        m = mt ? mt.strinp : 0
+        h = ht.strinpd
+        m = mt ? mt.strinpd : 0
         h = NHOURS[h]
         m = NMINUTES[m] || m