[PROPOSED 1/2] "Apr", not "April", in IN column
* northamerica (Rule): Use "Apr", not "April", in the IN column. Both forms are valid, but "Apr" is more consistent. Problem reported by Howard Hinnant. --- northamerica | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/northamerica b/northamerica index 01f392e0..1af874b6 100644 --- a/northamerica +++ b/northamerica @@ -2631,7 +2631,7 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20 # http://puentelibre.mx/noticia/ciudad_juarez_cambio_horario_noviembre_2022/ # Rule NAME FROM TO - IN ON AT SAVE LETTER/S -Rule Mexico 1931 only - April 30 0:00 1:00 D +Rule Mexico 1931 only - Apr 30 0:00 1:00 D Rule Mexico 1931 only - Oct 1 0:00 0 S Rule Mexico 1939 only - Feb 5 0:00 1:00 D Rule Mexico 1939 only - Jun 25 0:00 0 S -- 2.43.0
* checktab.awk: Check style of STDOFF and month names. --- checktab.awk | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/checktab.awk b/checktab.awk index 9a26e465..15a3a697 100644 --- a/checktab.awk +++ b/checktab.awk @@ -9,6 +9,19 @@ BEGIN { if (!zone_table) zone_table = "zone1970.tab" if (!want_warnings) want_warnings = -1 + monthabbr["Jan"] = 1 + monthabbr["Feb"] = 1 + monthabbr["Mar"] = 1 + monthabbr["Apr"] = 1 + monthabbr["May"] = 1 + monthabbr["Jun"] = 1 + monthabbr["Jul"] = 1 + monthabbr["Aug"] = 1 + monthabbr["Sep"] = 1 + monthabbr["Oct"] = 1 + monthabbr["Nov"] = 1 + monthabbr["Dec"] = 1 + while (getline <iso_table) { iso_NR++ if ($0 ~ /^#/) continue @@ -128,12 +141,14 @@ BEGIN { $1 ~ /^#/ { next } { - tz = rules = "" + tz = rules = stdoff = "" if ($1 == "Zone") { tz = $2 + stdoff = $3 ruleUsed[$4] = 1 if ($5 ~ /%/) rulePercentUsed[$4] = 1 - } else if ($1 == "Link" && zone_table == "zone.tab") { + } else if ($1 == "Link") { + if (zone_table == "zone.tab") { # Ignore Link commands if source and destination basenames # are identical, e.g. Europe/Istanbul versus Asia/Istanbul. src = $2 @@ -141,13 +156,27 @@ $1 ~ /^#/ { next } while ((i = index(src, "/"))) src = substr(src, i+1) while ((i = index(dst, "/"))) dst = substr(dst, i+1) if (src != dst) tz = $3 + } } else if ($1 == "Rule") { ruleDefined[$2] = 1 if ($10 != "-") ruleLetters[$2] = 1 + if (!monthabbr[$6]) { + printf "%s:%d: tricky month: %s\n", FILENAME, FNR, $6 \ + >>"/dev/stderr" + status = 1 + } } else { + stdoff = $1 ruleUsed[$2] = 1 if ($3 ~ /%/) rulePercentUsed[$2] = 1 } + + if (stdoff && stdoff !~ /^\-?1?[0-9](:[0-5][0-9](:[0-5][0-9])?)?$/) { + printf "%s:%d: unlikely STDOFF: %s\n", FILENAME, FNR, stdoff \ + >>"/dev/stderr" + status = 1 + } + if (tz && tz ~ /\// && tz !~ /^Etc\//) { if (!tztab[tz] && FILENAME != "backward" \ && zone_table != "zonenow.tab") { -- 2.43.0
participants (1)
-
Paul Eggert