bizdays-toolkit 0.20.0 → 0.21.0

package/CHANGELOG.md

@@ -4,6 +4,28 @@
 
 ## [Unreleased]
 
+## [0.21.0] - 2026-10-25
+
+### 移行
+
+動作が変わる既存の API はない（2012 年以降の英国の祝日は変わらない）。英国の 4 つの提供元の `supportedYears.from` が 2012 から 1974 になり、これまで `out-of-range` だった 1974〜2011 年の日付が結果を返すようになる。
+
+### Added
+
+- 英国の 4 つの提供元（`england`・`wales`・`scotland`・`northernIreland`）の対応年を 1974 年まで広げた（これまで 2012 年から）。GOV.UK のデータがない年は、2000〜2011 年は当時の政府が公表した一覧（DTI・BERR・directgov・Scottish Executive/Government・nidirect の Web Archive）を正として The Gazette の国王の布告と北アイルランドの Order で全日を照合し（`test/fixtures/uk-2000-2011-government-lists.json`）、1974〜1999 年は一覧が存在しないので Schedule 1 と The Gazette の布告・Order を正とし、Hansard の書面答弁がある年はそれを第二の出典とした（`test/fixtures/uk-1974-1999-proclamations.json`。テストは Schedule 1 を別に書いた規則で計算し（復活祭は米国海軍天文台の表）、布告の日と合わせて提供元の結果と一致することを確かめる）。出典の記録は `docs/sources/uk-bank-holidays-1974-1999.md`・`docs/sources/uk-bank-holidays-2000-2011.md`。Scotland の 3 日（2010-01-04・2010-12-27・2011-01-04）は当時の一覧にあるが布告がなく、一覧に従って振替日として返す。布告が見つからなかった 1987 年分の毎年の布告と 1975 年・1986〜1990 年の北アイルランドの Order（The Gazette の索引の欠け）は規則どおりに返し、フィクスチャの `unverified` に記録した。臨時の祝日と移動: 1977 年 Silver Jubilee bank holiday（England・Wales・NI は 6 月 7 日、Spring は 6 月 6 日に移動。Scotland は 6 月 6 日）、1981 年 Royal Wedding bank holiday（7 月 29 日）、1995 年の VE Day 50 周年（England・Wales・NI は Early May を 5 月 8 日に移動、Scotland は 5 月 8 日を "Additional bank holiday" として追加）、1999 年 12 月 31 日（"Additional bank holiday"。名称は政府の答弁の呼び方に限り、固有の名称がない日は中立の名称）、2002 年 Golden Jubilee（6 月 3 日。Spring は 6 月 4 日に移動）、2011 年 Royal Wedding（4 月 29 日）。毎年布告される日の始まり（England・Wales・NI の Early May と Scotland の Spring は 1978 年から、St Andrew's Day は 2007 年から）を符号化した。振替日の名称の割り当てが当時の一覧・布告と今の GOV.UK で違う年（12 月 25 日が土曜日の 1976・1982・1993・1999・2004 年、Scotland の 1 月 1 日が土曜日の 1977・1983・1994・2000・2005 年、Scotland の 12 月 25 日が日曜日の 1977・1983・1988・1994・2005 年、2011 年の 12 月）は当時の出典に合わせた
+
+### Changed
+
+- README・`docs/guide.md`・`docs/guide.ja.md`: 英国の対応年を 1974〜2099 年に改め、1974〜1999 年と 2000〜2011 年の出典、布告のない 3 日・`unverified`・振替日の割り当ての違いの説明を足した。国の記述順を対応年数の多い順（日本 → 英国 → フランス → シンガポール）に揃えた（README の提供元の表・節の見出し・照合のデータの説明・ライセンスの表記・箇条書き、ガイドの各国の節・識別子の表、providers、`RELEASING.md` の各国の節、`package.json` の description。`data-watch.yml` の照合の順は実行順なので変えていない）
+- README: ライセンスの節を「MIT License。全文は LICENSE（リンク）」の形にした
+- `RELEASING.md`: 英国の 1974〜2011 年は監視の対象外で、出典の読み違いが見つかったときだけ直す、と書いた
+- `docs/decisions.md`: 49 番（英国の対応年の拡大と、GOV.UK のない年の正の決め方。一覧のない年は布告が正、`unverified`、`year >= N` の条件の意味）を追加した
+
+### 開発
+
+- テスト: `test/uk-1974-1999.test.ts`・`test/uk-2000-2011.test.ts` と、フィクスチャ `test/fixtures/uk-1974-1999-proclamations.json`・`test/fixtures/uk-2000-2011-government-lists.json` を追加した。出典の収集の記録を `docs/sources/` に置いた
+- サイズの上限（`size-limits.json`）を上げた。`./uk` 7,500 → 9,000（測定 8,576。1974〜2011 年の `RENAMED`・臨時の祝日・移動の表のため）（gzip）
+
 ## [0.20.0] - 2026-10-25
 
 ### 移行
@@ -543,7 +565,8 @@
 
 - 日本: 2026 年 2 月の官報（2027 年の春分・秋分の日）まで反映（`dataVersion: "2026-02"`、`confirmedThrough: 2027`）
 
-[Unreleased]: https://github.com/inohan77/bizdays-toolkit/compare/v0.20.0...HEAD
+[Unreleased]: https://github.com/inohan77/bizdays-toolkit/compare/v0.21.0...HEAD
+[0.21.0]: https://github.com/inohan77/bizdays-toolkit/compare/v0.20.0...v0.21.0
 [0.20.0]: https://github.com/inohan77/bizdays-toolkit/compare/v0.19.0...v0.20.0
 [0.19.0]: https://github.com/inohan77/bizdays-toolkit/compare/v0.18.0...v0.19.0
 [0.18.0]: https://github.com/inohan77/bizdays-toolkit/compare/v0.17.1...v0.18.0

package/README.md

@@ -19,12 +19,12 @@
 
 A business-day calendar that combines public holidays with company or store closures.
 
-- **Holidays verified day by day against official data**: Japan (Cabinet Office, 1955 to the latest year in the Official Gazette), France (data.gouv.fr; metropolitan France and Alsace-Moselle, verified for 2006–2031), the UK (GOV.UK; England, Wales, Scotland and Northern Ireland, 2012 onwards) and Singapore (Ministry of Manpower on data.gov.sg, 2020 onwards). Every date is checked in the tests, differences are watched daily and shipped as patch versions
+- **Holidays verified day by day against official data**: Japan (Cabinet Office, 1955 to the latest year in the Official Gazette), the UK (GOV.UK; for 1974–2011 the Royal Proclamations in The Gazette, and from 2000 the government lists of the time; England, Wales, Scotland and Northern Ireland), France (data.gouv.fr; metropolitan France and Alsace-Moselle, verified for 2006–2031) and Singapore (Ministry of Manpower on data.gov.sg, 2020 onwards). Every date is checked in the tests, differences are watched daily and shipped as patch versions
 - **Business-day arithmetic**: closed weekdays, annual closures (across the new year too), specific closed and open dates and holidays combine into "N business days later", "next business day after the cutoff" and month-based due dates with the four adjustment conventions used in finance
 - **Recurring rules**: "closed on the 3rd Wednesday", "every other Wednesday", "stocktaking on the last day of the month", "closed on Mondays, or the next weekday when Monday is a holiday", "the day after (or before) a holiday", each with its own behaviour on holidays and an optional effective period
 - **Day-by-day values and combined calendars**: store hours that change by weekday, holiday and date; a business-day calendar made from such a schedule; and the days on which all (or any) of several calendars are open
 - **Option diagnostics**: `bizdays-toolkit/diagnose` lists rules that never apply, rules that are shadowed or redundant, rules that have ended, typos in option names and options with no business day at all, without throwing. One line in a test keeps options honest
-- **Lightweight, zero dependencies, time-zone safe**: about 11.0 KB min+gzip (about 12.9 KB with Japanese holidays, about 11.9 KB with French holidays, about 12.8 KB with UK bank holidays, about 11.9 KB with Singapore holidays; measured for 0.20.0). Standard JavaScript and `Intl` only, ESM with bundled types; tested on Node.js, Chrome, Firefox, Edge, Safari, Cloudflare Workers, Bun and Deno. Instants such as `Date` are converted to a civil date in the calendar's time zone before evaluation
+- **Lightweight, zero dependencies, time-zone safe**: about 11.0 KB min+gzip (about 12.9 KB with Japanese holidays, about 12.8 KB with UK bank holidays, about 11.9 KB with French holidays, about 11.9 KB with Singapore holidays; measured for 0.20.0). Standard JavaScript and `Intl` only, ESM with bundled types; tested on Node.js, Chrome, Firefox, Edge, Safari, Cloudflare Workers, Bun and Deno. Instants such as `Date` are converted to a civil date in the calendar's time zone before evaluation
 - **Extensible to other countries and regions**: holiday providers are pluggable through the `HolidayProvider` interface, and `bizdays-toolkit/provider` exposes the calendar arithmetic (nth weekday of a month, Easter, substitute days for holidays on a weekend) that most countries' holidays are built from
 
 ## Installation
@@ -60,14 +60,14 @@ The [guide](https://github.com/inohan77/bizdays-toolkit/blob/main/docs/guide.md)
 
 ## What you can do
 
-### Holidays of Japan, France, the UK and Singapore
+### Holidays of Japan, the UK, France and Singapore
 
-| Provider                                          | Subpath              | Time zone        | Supported years | Verified against                       |
-| ------------------------------------------------- | -------------------- | ---------------- | --------------- | -------------------------------------- |
-| `jp`                                              | `bizdays-toolkit/jp` | `Asia/Tokyo`     | 1955–2099       | Cabinet Office "National Holidays" CSV |
-| `metropole`, `alsaceMoselle`                      | `bizdays-toolkit/fr` | `Europe/Paris`   | 2000–2099       | data.gouv.fr "Jours fériés en France"  |
-| `england`, `wales`, `scotland`, `northernIreland` | `bizdays-toolkit/uk` | `Europe/London`  | 2012–2099       | GOV.UK bank holidays                   |
-| `sg`                                              | `bizdays-toolkit/sg` | `Asia/Singapore` | 2020–2027       | data.gov.sg (Ministry of Manpower)     |
+| Provider                                          | Subpath              | Time zone        | Supported years | Verified against                                                                              |
+| ------------------------------------------------- | -------------------- | ---------------- | --------------- | --------------------------------------------------------------------------------------------- |
+| `jp`                                              | `bizdays-toolkit/jp` | `Asia/Tokyo`     | 1955–2099       | Cabinet Office "National Holidays" CSV                                                        |
+| `england`, `wales`, `scotland`, `northernIreland` | `bizdays-toolkit/uk` | `Europe/London`  | 1974–2099       | GOV.UK bank holidays (1974–2011: The Gazette, and the government lists of the time from 2000) |
+| `metropole`, `alsaceMoselle`                      | `bizdays-toolkit/fr` | `Europe/Paris`   | 2000–2099       | data.gouv.fr "Jours fériés en France"                                                         |
+| `sg`                                              | `bizdays-toolkit/sg` | `Asia/Singapore` | 2020–2027       | data.gov.sg (Ministry of Manpower)                                                            |
 
 Each holiday carries its date, name (and English name), `kind` (national, substitute, citizens' holiday, bank holiday and so on, by country) and `confirmed` (whether the date is officially fixed; the Japanese equinox days and UK bank holidays after the last published year are predictions). Years after the supported range are an error unless `outOfRange: "ignore"` is set, and `unconfirmedHolidays: "throw"` stops any result that would depend on a predicted holiday. Details: [Bundled holiday providers](https://github.com/inohan77/bizdays-toolkit/blob/main/docs/guide.md#bundled-holiday-providers), [Unconfirmed holidays](https://github.com/inohan77/bizdays-toolkit/blob/main/docs/guide.md#unconfirmed-holidays).
 
@@ -129,9 +129,9 @@ A holiday provider is an object with `id`, `timeZone`, `supportedYears` and `hol
 
 Versioning follows [Semantic Versioning](https://semver.org/). See [RELEASING.md](https://github.com/inohan77/bizdays-toolkit/blob/main/RELEASING.md) (Japanese) for details.
 
-- Official data updates (new, moved and one-off holidays by law, Official Gazette or proclamation, fixed equinox days in Japan, newly published years on GOV.UK, newly gazetted years and revised dates in Singapore, changes to the French Labour Code) are released as **patch** versions, so they reach you with either `^` or `~`
+- Official data updates (new, moved and one-off holidays by law, Official Gazette or proclamation, fixed equinox days in Japan, newly published years on GOV.UK, changes to the French Labour Code, newly gazetted years and revised dates in Singapore) are released as **patch** versions, so they reach you with either `^` or `~`
 - To freeze the holiday results, pin an exact version (for example `"bizdays-toolkit": "0.8.0"`)
-- The reflected data is shown by the provider's `dataVersion` (for Japan, the year and month of the Official Gazette reflected; for the UK and Singapore, the year and month of the GOV.UK or data.gov.sg data reflected) and `confirmedThrough` (`jp.dataVersion`, `england.confirmedThrough` and so on). The module-level constants `dataVersion` and `confirmedThrough` in `bizdays-toolkit/jp` and `bizdays-toolkit/uk` are deprecated since 0.12.0 and will be removed in 1.0.0
+- The reflected data is shown by the provider's `dataVersion` (for Japan, the year and month of the Official Gazette reflected; for the UK, France and Singapore, the year and month of the GOV.UK, data.gouv.fr or data.gov.sg data reflected) and `confirmedThrough` (`jp.dataVersion`, `england.confirmedThrough` and so on). The module-level constants `dataVersion` and `confirmedThrough` in `bizdays-toolkit/jp` and `bizdays-toolkit/uk` are deprecated since 0.12.0 and will be removed in 1.0.0
 - Before 1.0.0, minor versions may contain breaking changes. What you need to change when moving between minor versions is listed in the [migration guide](https://github.com/inohan77/bizdays-toolkit/blob/main/docs/migration.md) (Japanese) and in the "移行" (migration) part of each version in the CHANGELOG
 - Decision reasons (`reason`), holiday kinds (`kind`), error codes and diagnostic codes may gain values in future versions. When you branch on their values, handle "anything else" too (see "互換性の約束", the compatibility promise, in [RELEASING.md](https://github.com/inohan77/bizdays-toolkit/blob/main/RELEASING.md))
 
@@ -141,12 +141,14 @@ Japanese holidays are verified with the "National Holidays" CSV published on the
 
 UK bank holidays are verified with the GOV.UK bank holidays data (<https://www.gov.uk/bank-holidays.json>, and for earlier years the history of the official GOV.UK repositories [alphagov/calendars](https://github.com/alphagov/calendars) and [alphagov/frontend](https://github.com/alphagov/frontend)), and the Welsh names of the Wales holidays with the Welsh version of GOV.UK (the verification data is a test fixture only; not included in the package).
 
-Singapore public holidays are verified with the "Singapore Public Holidays" collection published by the Ministry of Manpower on data.gov.sg (<https://data.gov.sg/collections/691/view>), with the Ministry's press releases as the authority where the two differ (the verification data is a test fixture only; not included in the package).
+For 2000–2011, which predate GOV.UK's data, the authority is the bank holiday lists the government published at the time (DTI and BERR, directgov, the Scottish Executive and Government, nidirect; captured by the Wayback Machine), checked against the Royal Proclamations and Northern Ireland Orders in The Gazette (<https://www.thegazette.co.uk/>); for 1974–1999 the proclamations are the authority. Thirteen days in 1975–1990 are returned by rule but could not be checked because the issues of The Gazette that carry them are not online (listed as `unverified` in the test fixture, with the reasons). The sources are listed in [docs/sources/uk-bank-holidays-2000-2011.md](https://github.com/inohan77/bizdays-toolkit/blob/main/docs/sources/uk-bank-holidays-2000-2011.md) (test fixture only; not included in the package).
 
 French public holidays are verified with the "Jours fériés en France" dataset published by DINUM on data.gouv.fr (<https://www.data.gouv.fr/datasets/jours-feries-en-france>, JSON exports for the Métropole and Alsace-Moselle zones; the verification data is a test fixture only; not included in the package).
 
-Contains public sector information licensed under the [Open Government Licence v3.0](https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/), data from data.gov.sg made available under the [Singapore Open Data Licence](https://data.gov.sg/open-data-licence), and data from data.gouv.fr made available under the [Licence Ouverte / Open Licence 2.0](https://www.etalab.gouv.fr/licence-ouverte-open-licence).
+Singapore public holidays are verified with the "Singapore Public Holidays" collection published by the Ministry of Manpower on data.gov.sg (<https://data.gov.sg/collections/691/view>), with the Ministry's press releases as the authority where the two differ (the verification data is a test fixture only; not included in the package).
+
+Contains public sector information licensed under the [Open Government Licence v3.0](https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/), data from data.gouv.fr made available under the [Licence Ouverte / Open Licence 2.0](https://www.etalab.gouv.fr/licence-ouverte-open-licence), and data from data.gov.sg made available under the [Singapore Open Data Licence](https://data.gov.sg/open-data-licence).
 
 ## License
 
-MIT
+This software is released under the MIT License, see [LICENSE](https://github.com/inohan77/bizdays-toolkit/blob/main/LICENSE).

package/dist/uk/rules.d.ts

@@ -7,9 +7,12 @@
  * - 臨時の祝日・移動: 布告ごとの日付をテーブルで持つ
  * - 識別子（key）: 毎年の祝日に GOV.UK の区分名から 1 つ（KnownUkHolidayKey）。振替日は元の祝日の key、臨時の祝日は持たない
  *
- * 対応年のすべての日付と名称が GOV.UK のデータと一致することを、テスト用フィクスチャ
- * （test/fixtures/govuk-bank-holidays.json）で検証している。CONFIRMED_THROUGH より後の年は、
- * 規則による予測（confirmed: false）。
+ * 2012 年以降は、すべての日付と名称が GOV.UK のデータと一致することをテスト用フィクスチャ
+ * （test/fixtures/govuk-bank-holidays.json）で検証している。2000〜2011 年（GOV.UK のデータがない）は、当時の政府の公表一覧
+ * （DTI・BERR・directgov・Scottish Executive/Government・nidirect の Web Archive）を正とし、The Gazette の布告で照合した
+ * フィクスチャ（test/fixtures/uk-2000-2011-government-lists.json）で検証している。政府の一覧にあるが布告が見つからない日
+ * （Scotland の 2010-01-04・2010-12-27・2011-01-04）は、一覧に従って祝日として返す（decisions.md の 49 番）。
+ * CONFIRMED_THROUGH より後の年は、規則による予測（confirmed: false）。
  */
 import type { Holiday } from "../core/types.ts";
 /**
@@ -40,7 +43,7 @@ export type KnownUkHolidayKey = "new-year" | "2nd-january" | "st-patricks" | "go
 export type UkDivision = "england-and-wales" | "scotland" | "northern-ireland";
 /** @internal 対応年 */
 export declare const SUPPORTED_YEARS: Readonly<{
-    from: 2012;
+    from: 1974;
     to: 2099;
 }>;
 /** @internal GOV.UK が日付を公表している最後の年 */

package/dist/uk/rules.js

@@ -7,14 +7,17 @@
  * - 臨時の祝日・移動: 布告ごとの日付をテーブルで持つ
  * - 識別子（key）: 毎年の祝日に GOV.UK の区分名から 1 つ（KnownUkHolidayKey）。振替日は元の祝日の key、臨時の祝日は持たない
  *
- * 対応年のすべての日付と名称が GOV.UK のデータと一致することを、テスト用フィクスチャ
- * （test/fixtures/govuk-bank-holidays.json）で検証している。CONFIRMED_THROUGH より後の年は、
- * 規則による予測（confirmed: false）。
+ * 2012 年以降は、すべての日付と名称が GOV.UK のデータと一致することをテスト用フィクスチャ
+ * （test/fixtures/govuk-bank-holidays.json）で検証している。2000〜2011 年（GOV.UK のデータがない）は、当時の政府の公表一覧
+ * （DTI・BERR・directgov・Scottish Executive/Government・nidirect の Web Archive）を正とし、The Gazette の布告で照合した
+ * フィクスチャ（test/fixtures/uk-2000-2011-government-lists.json）で検証している。政府の一覧にあるが布告が見つからない日
+ * （Scotland の 2010-01-04・2010-12-27・2011-01-04）は、一覧に従って祝日として返す（decisions.md の 49 番）。
+ * CONFIRMED_THROUGH より後の年は、規則による予測（confirmed: false）。
  */
 import { addDays, daysInMonth, easterSunday, formatDate, nthWeekdayOfMonth, weekdayOf, } from "../core/date.js";
 import { rangeError } from "../core/errors.js";
 /** @internal 対応年 */
-export const SUPPORTED_YEARS = Object.freeze({ from: 2012, to: 2099 });
+export const SUPPORTED_YEARS = Object.freeze({ from: 1974, to: 2099 });
 /** @internal GOV.UK が日付を公表している最後の年 */
 export const CONFIRMED_THROUGH = 2028;
 /** @internal 反映済みの GOV.UK のデータの年月（2026 年の Scotland の World Cup bank holiday の追加） */
@@ -32,14 +35,44 @@ const ST_ANDREW = "St Andrew’s Day";
 const CHRISTMAS = "Christmas Day";
 const BOXING = "Boxing Day";
 const ALL = ["england-and-wales", "scotland", "northern-ireland"];
+const NOT_SCOTLAND = ["england-and-wales", "northern-ireland"];
+const SCOTLAND = ["scotland"];
 /** 布告で毎年の祝日の日付を移した年（名称が変わる場合は name） */
 const MOVED = [
-    { year: 2012, from: SPRING, date: "2012-06-04" },
-    { year: 2020, from: EARLY_MAY, date: "2020-05-08", name: "Early May bank holiday (VE day)" },
-    { year: 2022, from: SPRING, date: "2022-06-02" },
+    // 1977 年: Silver Jubilee で England・Wales・NI の Spring を 6 月 6 日に（"in its stead"）。Scotland に Spring はまだない
+    { year: 1977, from: SPRING, date: "1977-06-06", divisions: NOT_SCOTLAND },
+    // 1995 年: VE Day 50 周年で England・Wales・NI の Early May を 5 月 8 日に（5 月 1 日は布告されなかった）。Scotland の 5 月第 1 月曜は附則
+    { year: 1995, from: EARLY_MAY, date: "1995-05-08", divisions: NOT_SCOTLAND },
+    { year: 2002, from: SPRING, date: "2002-06-04", divisions: ALL },
+    { year: 2012, from: SPRING, date: "2012-06-04", divisions: ALL },
+    {
+        year: 2020,
+        from: EARLY_MAY,
+        date: "2020-05-08",
+        name: "Early May bank holiday (VE day)",
+        divisions: ALL,
+    },
+    { year: 2022, from: SPRING, date: "2022-06-02", divisions: ALL },
 ];
 /** 布告による臨時の祝日 */
 const SPECIAL_DAYS = [
+    // 臨時の祝日の名称は布告にはなく（布告は日付だけを指定する）、政府の答弁の呼び方による。固有の呼び方が公式の文書にない日は
+    // 中立の "Additional bank holiday"（docs/sources/uk-bank-holidays-1974-1999.md の名称の節）
+    // 1977 年の Silver Jubilee: England・Wales・NI は 6 月 7 日を追加（Spring は 6 月 6 日に移動）。Scotland は 6 月 6 日だけを追加。
+    // 名称は Hansard 1975-12-18 の公式プログラム "Tuesday 7th (Silver Jubilee Bank Holiday)" と 1977-01-19 "a special Silver Jubilee Bank Holiday"、
+    // Scotland は 1976-06-28 "a Jubilee holiday in Scotland"
+    { date: "1977-06-06", name: "Silver Jubilee bank holiday", divisions: SCOTLAND },
+    { date: "1977-06-07", name: "Silver Jubilee bank holiday", divisions: NOT_SCOTLAND },
+    // 名称は The London Gazette 48690（1981-07-27）の告示の見出し "ROYAL WEDDING BANK HOLIDAY" と Hansard 1981-07-30 の答弁 "the public holiday on 29 July for the Royal Wedding"
+    { date: "1981-07-29", name: "Royal Wedding bank holiday", divisions: ALL },
+    // 1995 年の VE Day 50 周年: England・Wales・NI は Early May を 5 月 8 日に移動、Scotland は 5 月 1 日（附則）に加えて 8 日を追加。
+    // 政府は Scotland の分を "an additional day's bank holiday" とだけ呼び（Hansard 1993-12-16・1995-03-02）、固有の名称はない
+    { date: "1995-05-08", name: "Additional bank holiday", divisions: SCOTLAND },
+    // 政府は "a one-off additional Bank Holiday throughout the United Kingdom on Friday, 31 December 1999" と呼び（Hansard 1998-06-03）、
+    // "Millennium" は質問と Hansard の見出しにあるだけで固有の名称はない
+    { date: "1999-12-31", name: "Additional bank holiday", divisions: ALL },
+    { date: "2002-06-03", name: "Golden Jubilee bank holiday", divisions: ALL },
+    { date: "2011-04-29", name: "Royal Wedding bank holiday", divisions: ALL },
     { date: "2012-06-05", name: "Queen’s Diamond Jubilee", divisions: ALL },
     { date: "2022-06-03", name: "Platinum Jubilee bank holiday", divisions: ALL },
     {
@@ -60,9 +93,112 @@ const SPECIAL_DAYS = [
  * 同じ曜日の並びの 2012・2017 年は、附則どおり 1/2 が 2nd January、1/3 が New Year’s Day の振替
  */
 const RENAMED = [
-    { division: "scotland", date: "2023-01-02", name: NEW_YEAR, kind: "substitute", key: "new-year" },
+    // 12 月 25 日が土曜日の年（1976・1982・1993・1999・2004）: 27 日は附則の「25・26 日が日曜日の年の 27 日」（Boxing Day の代わり）、
+    // 28 日は Christmas Day の代わり。割り当ての文言があるのは 1982・1999 年の Scotland の布告（"in place of Saturday, 25th December"）、
+    // 2004 年の政府の一覧、1976 年の Hansard 1976-07-27 だけで、1993 年と England・Wales・NI の 28 日（布告はどの日の代わりかを書かない）は
+    // それに揃えた（docs/sources/uk-bank-holidays-1974-1999.md の付録 C）
+    { divisions: ALL, date: "1976-12-27", name: BOXING, kind: "substitute", key: "boxing-day" },
+    { divisions: ALL, date: "1976-12-28", name: CHRISTMAS, kind: "substitute", key: "christmas" },
+    // 1 月 1 日が土曜日の年の Scotland（1977・1983・1994・2000・2005）: 3 日は附則の「1 月 2 日が日曜日なら 3 日」、4 日は布告で New Year’s Day の代わり
     {
-        division: "scotland",
+        divisions: SCOTLAND,
+        date: "1977-01-03",
+        name: SECOND_JANUARY,
+        kind: "substitute",
+        key: "2nd-january",
+    },
+    { divisions: SCOTLAND, date: "1977-01-04", name: NEW_YEAR, kind: "substitute", key: "new-year" },
+    // 12 月 25 日が日曜日の年の Scotland（1977・1983・1988・1994・2005）: 26 日は附則の Christmas Day の振替、27 日は布告で追加された Boxing Day
+    {
+        divisions: SCOTLAND,
+        date: "1977-12-26",
+        name: CHRISTMAS,
+        kind: "substitute",
+        key: "christmas",
+    },
+    { divisions: SCOTLAND, date: "1977-12-27", name: BOXING, kind: "substitute", key: "boxing-day" },
+    { divisions: ALL, date: "1982-12-27", name: BOXING, kind: "substitute", key: "boxing-day" },
+    { divisions: ALL, date: "1982-12-28", name: CHRISTMAS, kind: "substitute", key: "christmas" },
+    {
+        divisions: SCOTLAND,
+        date: "1983-01-03",
+        name: SECOND_JANUARY,
+        kind: "substitute",
+        key: "2nd-january",
+    },
+    { divisions: SCOTLAND, date: "1983-01-04", name: NEW_YEAR, kind: "substitute", key: "new-year" },
+    {
+        divisions: SCOTLAND,
+        date: "1983-12-26",
+        name: CHRISTMAS,
+        kind: "substitute",
+        key: "christmas",
+    },
+    { divisions: SCOTLAND, date: "1983-12-27", name: BOXING, kind: "substitute", key: "boxing-day" },
+    {
+        divisions: SCOTLAND,
+        date: "1988-12-26",
+        name: CHRISTMAS,
+        kind: "substitute",
+        key: "christmas",
+    },
+    { divisions: SCOTLAND, date: "1988-12-27", name: BOXING, kind: "substitute", key: "boxing-day" },
+    { divisions: ALL, date: "1993-12-27", name: BOXING, kind: "substitute", key: "boxing-day" },
+    { divisions: ALL, date: "1993-12-28", name: CHRISTMAS, kind: "substitute", key: "christmas" },
+    {
+        divisions: SCOTLAND,
+        date: "1994-01-03",
+        name: SECOND_JANUARY,
+        kind: "substitute",
+        key: "2nd-january",
+    },
+    { divisions: SCOTLAND, date: "1994-01-04", name: NEW_YEAR, kind: "substitute", key: "new-year" },
+    {
+        divisions: SCOTLAND,
+        date: "1994-12-26",
+        name: CHRISTMAS,
+        kind: "substitute",
+        key: "christmas",
+    },
+    { divisions: SCOTLAND, date: "1994-12-27", name: BOXING, kind: "substitute", key: "boxing-day" },
+    { divisions: ALL, date: "1999-12-27", name: BOXING, kind: "substitute", key: "boxing-day" },
+    { divisions: ALL, date: "1999-12-28", name: CHRISTMAS, kind: "substitute", key: "christmas" },
+    // 2000 年・2005 年の Scotland: 布告は 1 月 4 日を「1 月 1 日（土）の代わり」とし、1 月 3 日は附則の「1 月 2 日が日曜日なら 3 日」
+    {
+        divisions: SCOTLAND,
+        date: "2000-01-03",
+        name: SECOND_JANUARY,
+        kind: "substitute",
+        key: "2nd-january",
+    },
+    { divisions: SCOTLAND, date: "2000-01-04", name: NEW_YEAR, kind: "substitute", key: "new-year" },
+    // 2004 年: 12 月 27 日は附則の「25・26 日が日曜日の年の 27 日」（Boxing Day の代わり）、28 日は布告で Christmas Day の代わり
+    { divisions: ALL, date: "2004-12-27", name: BOXING, kind: "substitute", key: "boxing-day" },
+    { divisions: ALL, date: "2004-12-28", name: CHRISTMAS, kind: "substitute", key: "christmas" },
+    {
+        divisions: SCOTLAND,
+        date: "2005-01-03",
+        name: SECOND_JANUARY,
+        kind: "substitute",
+        key: "2nd-january",
+    },
+    { divisions: SCOTLAND, date: "2005-01-04", name: NEW_YEAR, kind: "substitute", key: "new-year" },
+    // 2005 年の Scotland: 12 月 26 日は附則の「Christmas Day が日曜日なら 26 日」、27 日は布告で追加された Boxing Day
+    {
+        divisions: SCOTLAND,
+        date: "2005-12-26",
+        name: CHRISTMAS,
+        kind: "substitute",
+        key: "christmas",
+    },
+    { divisions: SCOTLAND, date: "2005-12-27", name: BOXING, kind: "substitute", key: "boxing-day" },
+    // 2011 年: 当時の政府の一覧（directgov・Scottish Government・nidirect）は 26 日を Christmas Day、27 日を Boxing Day の振替とした
+    { divisions: ALL, date: "2011-12-26", name: CHRISTMAS, kind: "substitute", key: "christmas" },
+    { divisions: ALL, date: "2011-12-27", name: BOXING, kind: "substitute", key: "boxing-day" },
+    // 2023 年の Scotland: GOV.UK の割り当て（1/2 が New Year’s Day、1/3 が 2nd January）に合わせる
+    { divisions: SCOTLAND, date: "2023-01-02", name: NEW_YEAR, kind: "substitute", key: "new-year" },
+    {
+        divisions: SCOTLAND,
         date: "2023-01-03",
         name: SECOND_JANUARY,
         kind: "substitute",
@@ -91,14 +227,13 @@ export function computeUkHolidays(division, year) {
         fixed.push({ month: 3, day: 17, name: ST_PATRICK, key: "st-patricks" });
     if (ni)
         fixed.push({ month: 7, day: 12, name: BOYNE, key: "battle-of-the-boyne" });
-    if (scotland)
+    // St Andrew's Day は St Andrew's Day Bank Holiday (Scotland) Act 2007 で加わった（2007 年から）
+    if (scotland && year >= 2007)
         fixed.push({ month: 11, day: 30, name: ST_ANDREW, key: "st-andrews" });
     fixed.push({ month: 12, day: 25, name: CHRISTMAS, key: "christmas" }, { month: 12, day: 26, name: BOXING, key: "boxing-day" });
     const easter = easterSunday(year);
     const movable = [
         { date: addDays(easter, -2), name: GOOD_FRIDAY, kind: "regular", key: "good-friday" },
-        { date: nthWeekdayOfMonth(year, 5, 1, 1), name: EARLY_MAY, kind: "regular", key: "early-may" },
-        { date: lastMonday(year, 5), name: SPRING, kind: "regular", key: "spring" },
         {
             date: scotland ? nthWeekdayOfMonth(year, 8, 1, 1) : lastMonday(year, 8),
             name: SUMMER,
@@ -114,9 +249,22 @@ export function computeUkHolidays(division, year) {
             key: "easter-monday",
         });
     }
+    // 5 月の第 1 月曜日: Scotland は附則、England・Wales・NI は 1978 年から毎年布告される（Early May bank holiday）
+    if (scotland || year >= 1978) {
+        movable.push({
+            date: nthWeekdayOfMonth(year, 5, 1, 1),
+            name: EARLY_MAY,
+            kind: "regular",
+            key: "early-may",
+        });
+    }
+    // 5 月の最終月曜日: England・Wales・NI は附則、Scotland は 1978 年から毎年布告される
+    if (!scotland || year >= 1978) {
+        movable.push({ date: lastMonday(year, 5), name: SPRING, kind: "regular", key: "spring" });
+    }
     const entries = [];
     for (const e of movable) {
-        const moved = MOVED.find((m) => m.year === year && m.from === e.name);
+        const moved = MOVED.find((m) => m.year === year && m.from === e.name && m.divisions.includes(division));
         entries.push(moved ? { ...e, date: moved.date, name: moved.name ?? e.name } : e);
     }
     for (const s of SPECIAL_DAYS) {
@@ -147,7 +295,7 @@ export function computeUkHolidays(division, year) {
         taken.add(day);
     }
     for (const r of RENAMED) {
-        if (r.division !== division || !r.date.startsWith(`${year}-`))
+        if (!r.divisions.includes(division) || !r.date.startsWith(`${year}-`))
             continue;
         const i = entries.findIndex((e) => e.date === r.date);
         if (i >= 0)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bizdays-toolkit",
-  "version": "0.20.0",
-  "description": "Holidays, business-day calendar and day-by-day schedules (e.g. store hours) with time zone support. Japanese holidays verified against the Cabinet Office data; UK bank holidays (England, Wales, Scotland, Northern Ireland) verified against GOV.UK; Singapore public holidays verified against data.gov.sg; French public holidays (metropole, Alsace-Moselle) verified against data.gouv.fr. / 祝日と営業日のカレンダー（タイムゾーン対応・日本の祝日は内閣府、英国の bank holidays は GOV.UK、シンガポールの祝日は data.gov.sg、フランスの祝日は data.gouv.fr のデータで全日照合）",
+  "version": "0.21.0",
+  "description": "Holidays, business-day calendar and day-by-day schedules (e.g. store hours) with time zone support. Japanese holidays verified against the Cabinet Office data; UK bank holidays (England, Wales, Scotland, Northern Ireland) verified against GOV.UK and The Gazette; French public holidays (metropole, Alsace-Moselle) verified against data.gouv.fr; Singapore public holidays verified against data.gov.sg. / 祝日と営業日のカレンダー（タイムゾーン対応・日本の祝日は内閣府、英国の bank holidays は GOV.UK と The Gazette、フランスの祝日は data.gouv.fr、シンガポールの祝日は data.gov.sg のデータで全日照合）",
   "keywords": [
     "bank-holidays",
     "bizdays",