summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--GNUmakefile34
-rw-r--r--data/ccs94
-rw-r--r--data/coins251
-rw-r--r--data/country-info44
-rw-r--r--data/extras12
-rw-r--r--data/notes18
-rw-r--r--data/world/bqs.us62
-rw-r--r--data/world/ids.us4
-rw-r--r--data/world/nds.us1
-rw-r--r--data/world/pds.us8
-rw-r--r--data/world/sds.us9
-rw-r--r--data/world/sqs.us56
-rw-r--r--data/world/tqs.us8
-rw-r--r--data/world/wns.us4
-rw-r--r--data/world/wqs.us19
-rw-r--r--data/world/xxx.bra2
-rw-r--r--lib.m46
-rwxr-xr-xscripts/completion56
-rwxr-xr-xscripts/gen-america11
-rwxr-xr-xscripts/gen-stats4
-rw-r--r--scripts/getcls.awk8
-rwxr-xr-xscripts/tr6
-rw-r--r--src/changelog/index.gsp306
-rw-r--r--src/euro/index.ccoins.gsp21
-rw-r--r--src/style.css53
-rw-r--r--src/table-key.gsp14
-rw-r--r--src/world/coins/br/index.gsp7
-rw-r--r--src/world/coins/us/index.gsp23
-rw-r--r--src/world/notes/ez/index.gsp4
29 files changed, 833 insertions, 312 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 6807748..4d2804d 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -3,19 +3,19 @@ MAKEFLAGS := -j$(shell nproc)
# Eurozone coin and -banknote types
eznotes := 5e 10e 20e 50e 100e 200e 500e
ezcoins := 1c 2c 5c 10c 20c 50c 1e 2e
-ezcodes := $(shell \
- grep -Eo '^[A-Z]{2}' data/coins \
- | sort \
- | uniq \
- | tr A-Z a-z \
+ezcodes := $(shell \
+ grep -Eo '^[A-Z]{2}' data/coins \
+ | sort \
+ | uniq \
+ | tr A-Z a-z \
)
# Source files that aren’t dynamically generated
-sources := $(shell find src -type f \( \
- -name 'index.gsp' -or \
- -name '*.css' -or \
- -name '*.svg' -or \
- -name '*.woff2' \
+sources := $(shell find src -type f \( \
+ -name 'index.gsp' -or \
+ -name '*.css' -or \
+ -name '*.svg' -or \
+ -name '*.woff2' \
\))
# Different euro coin and -banknote page types
@@ -45,6 +45,7 @@ eurotndeps := src/euro/index.tnotes.gsp src/euro/nav.dnotes.gsp data/notes
# Macros to get data to pass to m4
altnames = $(shell awk 'BEGIN { FS = "\t" } $$1 == toupper("$1") { print $$4 }' data/country-info)
+name = $(shell awk 'BEGIN { FS = "\t" } $$1 == toupper("$1") { print $$3 }' data/country-info)
demonym = $(shell awk 'BEGIN { FS = "\t" } $$1 == toupper("$1") { print $$2 }' data/country-info)
percentage = $(shell ./scripts/gen-stats $1)
@@ -67,10 +68,11 @@ out/%.html: src/%.gsp $(gspdeps)
m4 -P lib.m4 $< | gsp >$@
$(eurocc): out/euro/%/index.html: $(gspdeps) $(euroccdeps)
- m4 -P -D__coins -D__code=$* \
- -D__demonym="$(call demonym,$*)" \
- -D__altnames="$(call altnames,$*)" \
- -D__percentage="$(call percentage,$*)" \
+ m4 -P -D__coins -D__code=$* \
+ -D__demonym="$(call demonym,$*)" \
+ -D__name="$(call name,$*)" \
+ -D__altnames="$(call altnames,$*)" \
+ -D__percentage="$(call percentage,$*)" \
lib.m4 src/euro/index.ccoins.gsp | gsp >$@
$(eurocd): out/euro/%/index.html: $(eurocddeps) $(gspdeps)
@@ -90,7 +92,7 @@ out/%: src/%
cp $< $@
check:
- LANG=en_US.UTF-8 find src -name '*.gsp' -exec \
+ LANG=en_US.UTF-8 find src -name '*.gsp' -exec \
aspell --home-dir=./ --ignore-case check {} \;
clean:
@@ -99,4 +101,4 @@ clean:
serve:
darkhttpd out --daemon
-.PHONY: all check clean serve
+.PHONY: all check clean serve \ No newline at end of file
diff --git a/data/ccs b/data/ccs
index fe3b1f5..046c09d 100644
--- a/data/ccs
+++ b/data/ccs
@@ -9,6 +9,7 @@ AD 2021 * * Our Lady of Meritxell Elderly in COVID-19
AD 2022 * * Charlemagne Currency Agreement
AD 2023 * * Andorra in the UN Summer Solstice Festival
AD 2024 * * Skiing Mountain Bike World Cup
+AD 2025 * * Bearded Vulture Games of the Small States of Europe
AT 2005 X State Treaty
AT 2007 X Treaty of Rome
@@ -38,16 +39,17 @@ BE 2020 X * Year of Plant Health Jan van Eyck
BE 2021 * * Carolus V Coins Economic Union
BE 2022 X X Healthcare in COVID-19 Erasmus Programme
BE 2023 * * Art Nouveau Women’s Suffrage
-BE 2024 - - EU Presidency Fight Against Cancer
+BE 2024 X X EU Presidency Fight Against Cancer
+BE 2025 - ? National Lottery Spa-Francorchamps
CY 2009 X European Monetary Union
CY 2012 X Euro Cash
CY 2015 X EU Flag
CY 2017 X Paphos
CY 2020 - Neurology & Genetics
-CY 2022 - Erasmus Programme
+CY 2022 X Erasmus Programme
CY 2023 - Central Bank
-CY 2024 ? Cyprus in the EU
+CY 2024 * Cyprus in the EU
DE 2006 A X Schleswig-Holstein
DE 2006 D X Schleswig-Holstein
@@ -144,11 +146,11 @@ DE 2024 D X X Mecklenburg-Vorpommern Paulskirchenverfassung
DE 2024 F X X Mecklenburg-Vorpommern Paulskirchenverfassung
DE 2024 G X X Mecklenburg-Vorpommern Paulskirchenverfassung
DE 2024 J X X Mecklenburg-Vorpommern Paulskirchenverfassung
-DE 2025 A ? ? Saarland German Reunification
-DE 2025 D ? ? Saarland German Reunification
-DE 2025 F ? ? Saarland German Reunification
-DE 2025 G ? ? Saarland German Reunification
-DE 2025 J ? ? Saarland German Reunification
+DE 2025 A X - Saarland German Reunification
+DE 2025 D X - Saarland German Reunification
+DE 2025 F X - Saarland German Reunification
+DE 2025 G X - Saarland German Reunification
+DE 2025 J X - Saarland German Reunification
EE 2012 X Euro Cash
EE 2015 X EU Flag
@@ -159,9 +161,9 @@ EE 2019 X X Estonian Song Festival University of Tartu
EE 2020 X X Antarctica Tartu Peace Treaty
EE 2021 X X Finno-Urgic Peoples Wolf
EE 2022 X X X Estonian Literati Ukraine Erasmus Programme
-EE 2023 - Barn Swallow
-EE 2024 - The Cornflower
-EE 2025 ? First Estonian Text
+EE 2023 X Barn Swallow
+EE 2024 X The Cornflower
+EE 2025 X First Estonian Text
ES 2005 X Don Quixote
ES 2007 X Treaty of Rome
@@ -173,15 +175,15 @@ ES 2013 X El Escorial
ES 2014 X X Park Güell Accession of Felipe VI
ES 2015 X X Cave of Altamira EU Flag
ES 2016 X Segovia Aqueduct
-ES 2017 - Asturias Churches
+ES 2017 X Asturias Churches
ES 2018 X - Birthday of Felipe VI Satiago de Compostela
ES 2019 X Avilla
ES 2020 X Architecture of Aragon
ES 2021 X Toledo
ES 2022 X X X Circumnavigation Garajonay Erasmus Programme
-ES 2023 X - Cáceres EU Presidency
+ES 2023 X X Cáceres EU Presidency
ES 2024 X X Cathedral of Sevilla National Police
-ES 2025 ? Salamanca
+ES 2025 - Salamanca
FI 2004 X EU Enlargement
FI 2005 X Finland in the UN
@@ -203,7 +205,8 @@ FI 2020 X X University of Turku Väinö Linna
FI 2021 X X Journalism Åland Islands
FI 2022 X X X Ballet Climate Research Erasmus Programme
FI 2023 - - Nature Conservation Social & Health Services
-FI 2024 - - Democracy Gesellius, Lindgren, Saarinen
+FI 2024 - X Democracy Gesellius, Lindgren, Saarinen
+FI 2025 - - Diplomacy & Foreign Policy FI/SE Athletics Tournament
FR 2007 X Treaty of Rome
FR 2008 X EU Presidency
@@ -222,16 +225,16 @@ FR 2020 X * Charles de Gaulle Medical Research
FR 2021 X * UNICEF Paris Olympics (Running)
FR 2022 X * X Jacques Chirac Paris Olympics (Discus) Erasmus Programme
FR 2023 X * Rugby World Cup Paris Olympics (Boxing)
-FR 2024 * - Paris Olympics (Wrestling) Olympics & Paralympics
-FR 2025 * The Louvre
+FR 2024 * X Paris Olympics (Wrestling) Olympics & Paralympics
+FR 2025 * - The Louvre Notre Dame Cathedral
GR 2004 X Olympic Games
GR 2007 X Treaty of Rome
GR 2009 X European Monetary Union
GR 2010 X Battle of Marathon
-GR 2011 - Special Olympics
+GR 2011 X Special Olympics
GR 2012 X Euro Cash
-GR 2013 - X Platonic Academy Crete
+GR 2013 X X Platonic Academy Crete
GR 2014 X X Domenikos Theotokopoulos Ionian Islands
GR 2015 X X Spyridon Louis EU Flag
GR 2016 X X Dimitris Mitropoulos Arkadi Monastery
@@ -242,11 +245,12 @@ GR 2020 X X Battle of Thermopylae Thrace Union
GR 2021 X Greek Revolution
GR 2022 X X Constitution Erasmus Programme
GR 2023 X X Maria Callas Constantin Carathéodory
-GR 2024 - - Penelope Delta Democracy
+GR 2024 X X Penelope Delta Democracy
GR 2025 - - Mikis Theodorakis Manos Hadjidakis
-HR 2023 * Introduction of the Euro
-HR 2024 * * Varaždin Marco Marulić
+HR 2023 O Introduction of the Euro
+HR 2024 * * Varaždin Marko Marulić
+HR 2025 ? ? Pula Croatia and King Tomislav
IE 2007 X Treaty of Rome
IE 2009 X European Monetary Union
@@ -276,8 +280,9 @@ IT 2019 X Leonardo da Vinci
IT 2020 X X Maria Montessori Firefighter Corps
IT 2021 X X Rome Health Professionals
IT 2022 X X X National Police Falcone & Borsellino Erasmus Programme
-IT 2023 - X Air Force Alessandro Manzoni
+IT 2023 X X Air Force Alessandro Manzoni
IT 2024 - - Guarda di Finanza Rita Levi-Montalcini
+IT 2025 - - Jubilee of 2025 Amerigo Vespicci
LT 2015 X X Lithuanian Language EU Flag
LT 2016 X Baltic Culture
@@ -288,24 +293,24 @@ LT 2020 X X Hill of Crosses Aukštaitija
LT 2021 X X Žuvintas Biosphere Reserve Dzūkija
LT 2022 X X X Basketball Suvalkija Erasmus Programme
LT 2023 - Ukrainian Sunflower
-LT 2024 - Sodai Straw Gardens
-LT 2025 - Defense of Lithuania
+LT 2024 X Sodai Straw Gardens
+LT 2025 - - Defense of Lithuania Mažoji Lietuva
LU 2004 X Monogramme
LU 2005 X Henri & Adolphe
LU 2006 X Guillaume
-LU 2007 - X Palais Grand-Ducal Treaty of Rome
-LU 2008 - Château de Berg
-LU 2009 - X Accession of Charlotte European Monetary Union
+LU 2007 X X Palais Grand-Ducal Treaty of Rome
+LU 2008 X Château de Berg
+LU 2009 X X Accession of Charlotte European Monetary Union
LU 2010 X Grand Duke Henri
LU 2011 X Jean de Luxemburg
LU 2012 - - - Death of William IV Royal Wedding Euro Cash
-LU 2013 - National Anthem
+LU 2013 X National Anthem
LU 2014 X X 175 Years of Luxembourg Golden Jubilee
-LU 2015 - X - Accession Nassau-Weilburg EU Flag
+LU 2015 - X X Accession Nassau-Weilburg EU Flag
LU 2016 X Grand Duchess Charlotte Bridge
LU 2017 - - Volunteer Army William III
-LU 2018 X - Constitution William I
+LU 2018 X X Constitution William I
LU 2019 X X Voting Rights Grand Duchess Charlotte
LU 2020 - X Prince Charles Prince Henri
LU 2020 P - Prince Charles
@@ -314,7 +319,7 @@ LU 2021 P X - Royal Marriage Grand Duke Jean
LU 2022 - - - Grand-Ducal Wedding Luxembourg Flag Erasmus Programme
LU 2023 MdP - - First Constitution Olympic Committee
LU 2024 - - Death of Guillaume II Feierstëppeler on Coins
-LU 2025 ? ? Accession of Grand Duke Henri Schuman Declaration
+LU 2025 - - Accession of Grand Duke Henri Schuman Declaration
LV 2014 X Rīga
LV 2015 X X X Stork EU Council Presidency EU Flag
@@ -324,9 +329,10 @@ LV 2018 X X Baltic States Zemgale
LV 2019 - Rising Sun
LV 2020 X Latgalian Ceramics
LV 2021 X Latvian Recognition
-LV 2022 - - Financial Literacy Erasmus Programme
+LV 2022 X X Financial Literacy Erasmus Programme
LV 2023 - Ukrainian Sunflower
-LV 2024 - Latvian Puzuris
+LV 2024 X Latvian Puzuris
+LV 2025 - Sēlija
MC 2007 * Grace Kelly
MC 2011 - Royal Wedding
@@ -342,6 +348,7 @@ MC 2021 * Royal Wedding
MC 2022 * Prince Albert I
MC 2023 * Prince Rainier III
MC 2024 * Treaty with Charles V
+MC 2025 * * Comté de Carladés Les Baux-de-Provence
MT 2009 X European Monetary Union
MT 2011 X First Electives
@@ -358,6 +365,7 @@ MT 2021 - - Tarxien Temples Heroes of the Pandemic
MT 2022 X - - Ħal-Saflieni Hypogeum Peace & Security Erasmus Programme
MT 2023 - - Nicolaus Copernicus Napoleon Bonaparte
MT 2024 * * Maltese Honeybee Ċittadella Gozo
+MT 2025 - - Maltese Ox L-Imdina
NL 2007 X Treaty of Rome
NL 2009 X European Monetary Union
@@ -381,11 +389,12 @@ PT 2016 - X April Bridge Rio Olympics
PT 2017 X X Public Security Raul Brandão
PT 2018 - - Garden of Ajuda National Mint
PT 2019 X - Magellan Circumnavigation Maderia Archipelago
-PT 2020 - - University of Coimbra United Nations
+PT 2020 X - University of Coimbra United Nations
PT 2021 X - EU Presidency Tokyo Olympics
PT 2022 - X Crossing of the South Atlantic Erasmus Programme
PT 2023 X X Peace World Youth Day
-PT 2024 - - 25th April Revolution Paris Olympic Games
+PT 2024 X - 25th April Revolution Paris Olympic Games
+PT 2025 - - Sustainable Development World Scouting and Youth Movements
SI 2007 X Treaty of Rome
SI 2008 X Primož Trubar
@@ -403,12 +412,12 @@ SI 2019 X University of Ljubljana
SI 2020 X Adam Bohorič
SI 2021 X Museum for Carniola
SI 2022 X X Jože Plečnik Erasmus Programme
-SI 2023 - Josip Plemelj
-SI 2024 ? National- and University Library
-SI 2025 ? Miki Muster
+SI 2023 X Josip Plemelj
+SI 2024 - National- and University Library
+SI 2025 - Miki Muster
SK 2009 X X Freedom European Monetary Union
-SK 2011 - Visegrad Group
+SK 2011 X Visegrád Group
SK 2012 X Euro Cash
SK 2013 X Constantine & Methodius
SK 2014 X European Union
@@ -421,8 +430,8 @@ SK 2020 X OECD
SK 2021 X Alexander Dubček
SK 2022 X X Steam Engine Erasmus Programme
SK 2023 X X Blood Transfusion Vienna-Bratislava Mail
-SK 2024 - Košice Marathon
-SK 2025 ? First Ice Hockey Tournament
+SK 2024 X Košice Marathon
+SK 2025 - First Ice Hockey Tournament
SM 2004 * Borghesi
SM 2005 * Physics
@@ -467,3 +476,4 @@ VA 2021 * * Caravaggio Dante Alighieri
VA 2022 * * Pope Paul VI Mother Teresa
VA 2023 * * Alessandro Manzoni Pietro Perugino
VA 2024 * * Gugliemo Marconi Thomas Aquinas
+VA 2025 * Sede Vacante \ No newline at end of file
diff --git a/data/coins b/data/coins
index 1af5a88..ecafbe1 100644
--- a/data/coins
+++ b/data/coins
@@ -1,4 +1,4 @@
-XD - - - - X - X - 2014
+AD - - - - X - X - 2014
AD * * * * * * * X 2015
AD * * * * * * X * 2016
AD X X X X X X - X 2017
@@ -7,8 +7,9 @@ AD X X X X X X * X 2019
AD * * * X - X * X 2020
AD - - * X X X - X 2021
AD - X - X X - * X 2022
-AD * * * * * * * - 2023
-AD * - - - - - - - 2024
+AD * * * * * * * X 2023
+AD * - - - - - - X 2024
+AD ? ? ? ? ? ? ? ? 2025
AT X X X X X X X X 2002
AT X X X * X X - X 2003
@@ -32,7 +33,8 @@ AT X X X X X X X X 2020
AT X X X X X X X X 2021
AT X X X X X X X X 2022
AT X X X X X X X X 2023
-AT X X X X X X - X 2024
+AT X X X X X X X X 2024
+AT ? ? ? ? X X X X 2025
BE start King Albert II (Series I)
BE X * X X * X X * 1999
@@ -60,27 +62,30 @@ BE * * X X * * O * 2018
BE * * X X X X * X 2019
BE * * * * * * * * 2020
BE * * * * * * * * 2021
-BE * * X * * * * * 2022
-BE * * - - - * * * 2023
-BE * * - * * - * * 2024
+BE * * X * * * * * 2022 IVH
+BE / / X / / / / / 2022 GVV
+BE * * ^ X X * * * 2023
+BE * * - * * X * * 2024
+BE * * - - - * * * 2025
CY X X X X X X X X 2008
CY X - X X X X X X 2009
-CY - - - - - - X - 2010
+CY - - - - X - X X 2010
CY X - X X - X - X 2011
-CY X X - X X X - X 2012
+CY X X - X X X X X 2012
CY - - - - - - - X 2013
-CY - - - - - - - - 2014
+CY - - - - - - - X 2014
CY X - - - - - - - 2015
-CY X - - - - X - - 2016
+CY X - - - - X - X 2016
CY - - - - - - - - 2017
CY X - X - - - - X 2018
CY X X X X X X - X 2019
-CY - X - X X - - X 2020
-CY - - - - - X - - 2021
+CY - X X X X X - X 2020
+CY X X X - - X - - 2021
CY - - - - - - - - 2022
CY - - - - - - - - 2023
CY - - - - - - - - 2024
+CY - - - - - - - - 2025
DE X X X X X X X X 2002 A
DE X X X X X X X X 2002 D
@@ -96,12 +101,12 @@ DE X X X * * X X X 2004 A
DE X X X X X * X X 2004 D
DE X X X X * X X O 2004 F
DE X X X X * X X O 2004 G
-DE X X X * * * * X 2004 J
+DE X X X * * O * X 2004 J
DE X X X * X * * * 2005 A
DE X X X * X O O O 2005 D
DE X X X * X * * O 2005 F
-DE X X X * - O * * 2005 G
-DE X X X * X * X * 2005 J
+DE X X X * X O * O 2005 G
+DE X X X * X O X * 2005 J
DE * X X * X * * * 2006 A
DE * X X * X * * O 2006 D
DE * X X * X * * * 2006 F
@@ -113,7 +118,7 @@ DE X X X * X O * / 2007 F
DE X X X * X * * / 2007 G
DE X X X * X * * / 2007 J
DE X X X * X * * X 2008 A
-DE X X X * X * * X 2008 D
+DE X X X * X O * X 2008 D
DE X X X * X * O X 2008 F
DE X X X * X * * X 2008 G
DE X X X * X * * X 2008 J
@@ -176,42 +181,48 @@ DE X X X X X * * X 2020 A
DE X X X X X * * X 2020 D
DE X X X X X * * X 2020 F
DE X X X X X * * X 2020 G
-DE X X - X X * * X 2020 J
+DE X X X X X * * X 2020 J
DE X X X X X * * X 2021 A
DE X X X X X * * X 2021 D
DE X X X X X * * X 2021 F
DE X X X X X * * X 2021 G
DE X X X X X * * X 2021 J
-DE * - X X X X * * 2022 A
+DE * X X X X X * * 2022 A
DE * X X X X X * * 2022 D
-DE * X - X X X * * 2022 F
-DE * X - X X X * * 2022 G
+DE * X X X X X * * 2022 F
+DE * X X X X X * * 2022 G
DE * X X X X X * * 2022 J
-DE - - - - - X * X 2023 A
-DE X - X X X X * X 2023 D
-DE - X X - X X * X 2023 F
-DE X - - - - X * X 2023 G
-DE - X - X X X * X 2023 J
-DE - * - - - - * - 2024 A
-DE - * - - - - * - 2024 D
-DE - * - - - - * - 2024 F
-DE - * - - - - * - 2024 G
-DE X * - - - X * X 2024 J
+DE - - - X - X * X 2023 A
+DE X X X X X X * X 2023 D
+DE X X X X X X * X 2023 F
+DE X - - - X X * X 2023 G
+DE X X - X X X * X 2023 J
+DE - * - - - X * X 2024 A
+DE X * X X X X * X 2024 D
+DE - * - X - X * X 2024 F
+DE - * X X X X * X 2024 G
+DE X * - X - X * X 2024 J
+DE * * * * * - * X 2025 A
+DE * * * * * X * - 2025 D
+DE * * * * * - * - 2025 F
+DE * * * * * - * - 2025 G
+DE * * * * * X * - 2025 J
EE X X X X X X X X 2011
EE X X / / / / / / 2012
EE / / / / / / / / 2013
EE / / / / / / / / 2014
-EE - - / / / / / / 2015
+EE X X / / / / / / 2015
EE * * * * * * * * 2016
EE X X X / X / / / 2017
-EE - X - - X X X X 2018
-EE - / / / / / / / 2019
-EE / - / / X / / / 2020
-EE / - / / - / / / 2021
-EE - - - - * * * * 2022
-EE / / - - - / / - 2023
-EE ? ? ? ? ? ? ? ? 2024
+EE - X X X X X X X 2018
+EE X / / / / / / / 2019
+EE / X / / X / / / 2020
+EE / X / / X / / / 2021
+EE X X X X * * * * 2022
+EE / / - - - / / X 2023
+EE / / / / / / / / 2024
+EE / / / / / / / / 2025
ES start King Juan Carlos I (Series I)
ES X X X X X X X X 1999
@@ -239,44 +250,46 @@ ES X X X X X X X X 2018
ES X X X X X X X X 2019
ES X X X X X X X X 2020
ES X X X X X X X X 2021
-ES X X X X X - X X 2022
-ES X X X X X - X X 2023
-ES X - - X - - - - 2024
+ES X X X X X X X X 2022
+ES X X X X X X X X 2023
+ES X - X X X X X X 2024
+ES ? ? ? - X ? - - 2025
FI X - X X X X X X 1999
-FI X - X X X X X X 2000
-FI - - X X X X X X 2001
+FI X X X X X X X X 2000
+FI X - X X X X X X 2001
FI - - X - X X X X 2002
-FI - X - - - X - X 2003
-FI X X - - - - X X 2004
-FI - - - - - X X X 2005
-FI X - - - - X X X 2006
-FI - - - - - X X X 2007
+FI X X - - - X - X 2003
+FI X X - - - X X X 2004
+FI - X - - - X X X 2005
+FI X X - - - X X X 2006
+FI X X - - - X X X 2007
FI - - - X X X X X 2008
-FI - - X - - X - X 2009
-FI - - - - X X X X 2010
-FI - - - - X X X X 2011
-FI X X - X X - X X 2012
+FI - - X - - X X X 2009
+FI - - X - X X X X 2010
+FI - X - - X X X X 2011
+FI X X - X X X X X 2012
FI - - - X - - X X 2013
-FI - - - - - - - X 2014
+FI - - X - - - - X 2014
FI - - - - X - X X 2015
FI - - - - - - X - 2016
-FI - - - - - - X X 2017
+FI - - X - - - X X 2017
FI - - - - - - - X 2018
FI / / X / / / / - 2019
FI * * * * * * * * 2020
FI * * * * * * * * 2021
FI * * * * * * * * 2022
FI * * * * * * * * 2023
-FI ? ? ? ? ? ? ? ? 2024
+FI * * * * * * * * 2024
+FI * * * * * * * * 2025
FR start Series I
FR X X X X X X X X 1999
FR X X X X X X X X 2000
FR X X X X X X X X 2001
FR - - X X X X X X 2002
-FR X X X X * * * * 2003
-FR X X X - * O * @ 2004
+FR X X X X * O * * 2003
+FR X X X X * O * @ 2004
FR X X X X * * * * 2005
FR X X X X * * O O 2006
FR X X X X X * * * 2007
@@ -292,25 +305,26 @@ FR X X X X * * * X 2016
FR X X X X X * * X 2017
FR X X X X X X * X 2018
FR X X X X X X * X 2019
-FR X - X X X X * X 2020
+FR X X X X X X * X 2020
FR X X X X X X * X 2021
FR start Series II
FR X X X X X X * X 2022
-FR - - - - - - * X 2023
-FR ? ? ? ? ? ? ? ? 2024
+FR - X X X X X * X 2023
+FR - - - - - - * - 2024
+FR ? ? ? ? ? ? * ? 2025
GR X X X X X X X X 2002
-GR - - X X X X X X 2002 MM
+GR X X X X X X X X 2002 MM
GR X - - - X X X X 2003
-GR X X - X - - X * 2004
+GR X X - X - X X * 2004
GR X - X X - X X X 2005
-GR X X X X - X X X 2006
-GR - X X X - X X * 2007
+GR X X X X X X X X 2006
+GR X X X X - X X * 2007
GR X X X X X X X X 2008
GR X X X X X X X X 2009
GR X X X X X X X X 2010
-GR X X X - - X X * 2011
-GR X - - * * * * * 2012
+GR X X X - X X X * 2011
+GR X X X * * * * * 2012
GR X X * X * * * * 2013
GR X X X * * * * * 2014
GR X X X * * * * * 2015
@@ -319,16 +333,18 @@ GR X X X X * * * * 2017
GR X X X X * * * * 2018
GR X X X X X X * * 2019
GR X X X X X X * * 2020
-GR - X X * X X * * 2021
-GR - - - * - * * * 2022
-GR - - - - - - - - 2023
-GR - - - - - - - - 2024
+GR X X X * X X * * 2021
+GR - X X * X * * * 2022
+GR ^ ^ - X X X ^ X 2023
+GR ^ ^ - ^ ^ - ^ ^ 2024
+GR - - ^ - ^ - - - 2025
HR X X X X X X X X 2023
-HR - - - - - - - - 2024
+HR X - X - X X X X 2024
+HR - - * X X * * * 2025
IE X X X X X X X X 2002
-IE X X X X X X - X 2003
+IE X X X X X X X X 2003
IE X X X X X X X X 2004
IE X X X X X X X X 2005
IE X X X X X X X X 2006
@@ -336,7 +352,7 @@ IE X X X X X X X X 2007
IE X X X X X X X X 2008
IE X X X X X X X X 2009
IE X - - - X X X X 2010
-IE X - - X X X X X 2011
+IE X X X X X X X X 2011
IE X X - X X X X X 2012
IE X X - X X X X X 2013
IE X X X X X X X X 2014
@@ -346,10 +362,11 @@ IE ? ? X X - - - X 2017
IE ? ? X X - - - X 2018
IE ? ? X X - - - X 2019
IE ? ? X X - - - X 2020
-IE ? ? X X ? ? ? ? 2021
-IE ? ? ? ? ? ? ? ? 2022
-IE ? ? ? ? ? ? ? ? 2023
-IE ? ? ? - ? ? ? ? 2024
+IE ? ? X X - - - - 2021
+IE ? ? - - - - - - 2022
+IE ? ? - X - - - - 2023
+IE ? ? - X - - - - 2024
+IE ? ? - - - - - - 2025
IT X X X X X X X X 2002
IT X - X X X X X X 2003
@@ -368,23 +385,25 @@ IT X X X X X X X X 2015
IT X X X X X X X X 2016
IT X X X X X X X X 2017
IT * * X X X X X X 2018
-IT * * X X X X - X 2019
+IT * * X X X X X X 2019
IT * * X X X X X X 2020
IT * * X X X X X X 2021
-IT * * X X X X - X 2022
-IT * * X - X X X X 2023
-IT * * - - - - - - 2024
+IT * * X X X X X X 2022
+IT * * X X X X X X 2023
+IT * * X X - X - X 2024
+IT * * ? ? ? ? ? ? 2025
LT X X X X X X X X 2015
-LT - / / / / / / / 2016
+LT X / / / / / / / 2016
LT X X / X X / / X 2017
LT * * * * * * * * 2018
LT * * * * * * * * 2019
LT * * * * * * * X 2020
-LT * * X - * * * X 2021
+LT * * X X * * * X 2021
LT * * X * * * * * 2022
-LT * * - - * * * * 2023
-LT * * - * * * * - 2024
+LT * * X X * * * * 2023
+LT * * - * * * * X 2024
+LT ? ? ? ? ? ? ? ? 2025
LU X X X X X X X X 2002
LU X X X X X X X X 2003
@@ -404,12 +423,13 @@ LU X X X X X X X X 2016
LU - - - - - - - X 2017
LU - - X X X - X - 2018
LU - - - - - - - X 2019
-LU - - X X - - - - 2020
-LU - - - - X - - - 2021
+LU - - X X - - - X 2020
+LU - - ^ - X - - - 2021
LU - - X X X X - - 2022
LU X X X X X X - X 2023 KNM
LU / / / X X / / X 2023 MdP
-LU - - - - - - - - 2024
+LU - - - - - - - ^ 2024
+LU - - - - - - - - 2025
LV X X X X X X X X 2014
LV * * * * * * * * 2015
@@ -420,8 +440,9 @@ LV * * X * * * * * 2019
LV * * * * * * * * 2020
LV * * * * * * * * 2021
LV * * * * * * * * 2022
-LV / / - / / / / / 2023
+LV / / X / / / / / 2023
LV * * * * * * * * 2024
+LV ? ? ? ? ? ? ? ? 2025
MC start Prince Rainier III
MC - X X - - - - X 2001
@@ -447,8 +468,9 @@ MC / / / / / / X X 2019
MC * * * * * * - X 2020
MC * * * * * * X X 2021
MC / / / / / / X X 2022
-MC / / / / / / - - 2023
+MC / / / / / / X X 2023
MC / / / / / / - - 2024
+MC ? ? ? ? ? ? ? ? 2025
MT X X X X X X X X 2008
MT / / / / / / / / 2009
@@ -464,9 +486,10 @@ MT X X * * * * * * 2018
MT X * X X X X X * 2019
MT * X X X X X X * 2020
MT X X X X X X X * 2021
-MT - X X - X * * * 2022
-MT * * - - - - - * 2023
-MT ? ? ? ? ? ? ? ? 2024
+MT - X X X X * * * 2022
+MT * * X - - - X * 2023
+MT * * * * X - * * 2024
+MT ? ? ? ? ? ? ? ? 2025
NL start Queen Beatrix
NL X X X X X X X X 1999
@@ -483,7 +506,7 @@ NL * * X * * O * O 2009
NL * * X * * O * O 2010
NL * * X * * O * O 2011
NL * * X * * * * O 2012
-NL X * X * * * O O 2013
+NL X * X * * O O O 2013
NL start King Willem-Alexander
NL * * X X X X X X 2014
NL * O X * * O O O 2015
@@ -495,12 +518,13 @@ NL * * X * * * * * 2020
NL * * * * * * * * 2021
NL * * X X X * * * 2022
NL * * X - X - * * 2023
-NL ? ? ? ? ? ? ? ? 2024
+NL * * X X - * * X 2024
+NL ? ? ? ? - ? ? X 2025
PT X X X X X X X X 2002
PT * * * X X X X X 2003
PT X - X - - X X X 2004
-PT X - X X X X X X 2005
+PT X X X X X X X X 2005
PT X - X X X X X X 2006
PT X X X * * * X * 2007
PT X X X X X X X * 2008
@@ -519,7 +543,8 @@ PT X * X * X * X * 2020
PT * * X X X X * * 2021
PT * * * * * * * * 2022
PT X * X * * * * X 2023
-PT ? ? - - X ? - ? 2024
+PT * * - X - * X * 2024
+PT ? ? ? ? ? ? ? ? 2025
SI X X X X X X X X 2007
SI * * * * * * * O 2008
@@ -537,8 +562,9 @@ SI X X X X X * * * 2019
SI X X * * * * * X 2020
SI X X X * * X * * 2021
SI X X X X X * * X 2022
-SI - X - - X * * X 2023
-SI - - - - - - * - 2024
+SI X X X X X * * X 2023
+SI X X - X - - * X 2024
+SI - - * * * * * * 2025
SK X X X X X X X X 2009
SK X X * * * * * O 2010
@@ -554,8 +580,9 @@ SK X X X X * * * * 2019
SK X X X X * * * X 2020
SK X X X X * * X * 2021
SK * * X X * * * X 2022
-SK * * - - * * * * 2023
-SK * * - - * * - X 2024
+SK * * X X * * * * 2023
+SK * * X X * * X X 2024
+SK * * - - * * - X 2025
SM start Series I
SM * * * * X X - - 2002
@@ -563,10 +590,10 @@ SM * * * * - X * * 2003
SM X X - - * * - * 2004
SM * * * * - - * O 2005
SM * O * * * - * * 2006
-SM * * * O * - * * 2007
+SM * * * O O - * * 2007
SM * * * * - X * O 2008
SM * * * * * * - * 2009
-SM * * * * * * - * 2010
+SM * * * * * * X * 2010
SM * * * * * * * - 2011
SM * * * * * * * X 2012
SM * * * * - - - X 2013
@@ -574,14 +601,15 @@ SM * * * * * - X * 2014
SM * * * * - X X * 2015
SM * * * * - * * X 2016
SM start Series II
-SM * * * * X * - - 2017
-SM * * * * - X X * 2018
-SM * * * * * - - - 2019
+SM * * * * X * X - 2017
+SM * * * * X X X * 2018
+SM * * * * * - X - 2019
SM * * * * * X X X 2020
-SM * * * * - - - X 2021
+SM * * * * - - X X 2021
SM * * * * - X - - 2022
SM * * * * - - X - 2023
SM * * * * - - - - 2024
+SM * * * * - - - - 2025
VA start Pope John Paul II
VA * * * * * * * * 2002
@@ -591,7 +619,7 @@ VA * * O * * * * * 2005
VA start Sede Vacante
VA * * * * O * * * 2005
VA start Pope Benedict XVI
-VA * * * * * * * * 2006
+VA * * * * * O * * 2006
VA * * * * * * * * 2007
VA * * * * * * * * 2008
VA * * * * * * * * 2009
@@ -610,5 +638,6 @@ VA * * * * * X * * 2019
VA * * * * * X * * 2020
VA * * * * * X * * 2021
VA * * * * * X * * 2022
-VA * * * * * - * * 2023
-VA * * * * * - * * 2024
+VA * * * * * X * * 2023
+VA ? ? ? ? ? - ? ? 2024
+VA ? ? ? ? ? ? ? ? 2025 \ No newline at end of file
diff --git a/data/country-info b/data/country-info
index 1b5d033..a3445aa 100644
--- a/data/country-info
+++ b/data/country-info
@@ -1,31 +1,31 @@
AD Andorran Andorra
-AT Austrian Austria Österreich
-BE Belgian Belgium België / Belgique / Belgien
-BG Bulgarian Bulgaria България
-CY Cypriot Cyprus Κύπρος / Kıbrıs
-DE German Germany Deutschland
-DE-R German Germany Deutschland
-DE-W German Germany Deutschland
-DE-X German Germany Deutschland
-EE Estonian Estonia Eesti
-ES Spanish Spain España
-FI Finnish Finland Suomi
+AT Austrian Austria de:Österreich
+BE Belgian Belgium nl:België,fr:Belgique,de:Belgien
+BG Bulgarian Bulgaria bg:България
+CY Cypriot Cyprus el:Κύπρος,tr:Kıbrıs
+DE German Germany de:Deutschland
+DE-R German Germany de:Deutschland
+DE-W German Germany de:Deutschland
+DE-X German Germany de:Deutschland
+EE Estonian Estonia ee:Eesti
+ES Spanish Spain es:España
+FI Finnish Finland fi:Suomi
FR French France
FR-E French France
FR-U French France
-GR Greek Greece Ελλάδα
-HR Croatian Croatia Hrvatska
-IE Irish Ireland Éire
-IT Italian Italy Italia
-LT Lithuanian Lithuania Lietuva
-LU Luxembourgish Luxembourg Lëtzebuerg / Luxemburg
-LV Latvian Latvia Latvija
+GR Greek Greece el:Ελλάδα
+HR Croatian Croatia hr:Hrvatska
+IE Irish Ireland ga:Éire
+IT Italian Italy it:Italia
+LT Lithuanian Lithuania lt:Lietuva
+LU Luxembourgish Luxembourg lb:Lëtzebuerg,de:Luxemburg
+LV Latvian Latvia lv:Latvija
MC Monégasque Monaco
MT Maltese Malta
-NL Dutch Netherlands Nederland
+NL Dutch Netherlands nl:Nederland
PT Portuguese Portugal
-SI Slovene Slovenia Slovenija
-SK Slovak Slovakia Slovensko
+SI Slovene Slovenia sl:Slovenija
+SK Slovak Slovakia sk:Slovensko
SM Sammarinese San Marino
US American United States of America
-VA Vatican Vatican City Città del Vaticano
+VA Vatican Vatican City it:Città del Vaticano,la:Civitas Vaticana \ No newline at end of file
diff --git a/data/extras b/data/extras
index 76fa02d..cfd161a 100644
--- a/data/extras
+++ b/data/extras
@@ -1,3 +1,13 @@
+AT 2012 €10.00 O ‘Steiermark’ €10 Commemorative
+AT 2014 €5.00 O ‘Arctic Adventure’ €5 Commemorative
+AT 2015 €5.00 O ‘Operetta Bat and the Ball’ €5 Commemorative
+AT 2021 €10.00 O ‘Rose’ €10 Commemorative
+AT 2022 €5.00 O ‘New Year’ €5 Commemorative
+AT 2024 €5.00 O ‘Alpine Work Ski Championships’ €5 Commemorative
+AT 2025 €5.00 O ‘Dance Away’ €5 Commemorative
+AT 2025 €5.00 O ‘Narcissus’ €5 Commemorative
+AT 2025 €10.00 O ‘Aufdirndln — Linen’ €10 Commemorative
+DE 2004 F €0.10 @ Circulated Proof
DE 2007 D €2.00 @ ‘Mecklenburg-Vorpommern’ Circulated Proof
DE 2012 J €2.00 X ‘Euro Cash’ with the @a href="https://forum.emuenzen.de/threads/wer-ist-jk-der-die-m%C3%BCnzen-punzt-wir-untersuchen-ein-ph%C3%A4nomen.94119/" target="_blank" {=‘JK’ Engraving}
DE 2015 A €2.00 @ ‘Hessen’ Circulated Proof
@@ -11,4 +21,4 @@ MT 2019 €2.00 O ‘Nature & Environment’ with NIFC Mintmark
MT 2019 €2.00 O ‘Ta’ Ħaġrat Temples’ with NIFC ‘F’ in Star
NL 1999 €0.50 @ Circulated Proof
NL 2006 €2.00 @ Circulated Proof
-NL 2019 €5.00 O ‘Jaap Eden’ €5 Commemorative
+NL 2019 €5.00 O ‘Jaap Eden’ €5 Commemorative \ No newline at end of file
diff --git a/data/notes b/data/notes
index 4fa79ac..5e5a735 100644
--- a/data/notes
+++ b/data/notes
@@ -11,7 +11,7 @@
5 2002 NL X X
5 2002 PT X X
5 2002 SK / -
-5 2002 SI / -
+5 2002 SI / X
5 2002 ES - X
5 Europa AT X X
5 Europa BE X /
@@ -49,7 +49,7 @@
10 Europa PT / X
10 Europa ES X X
-20 2002 AT - - /
+20 2002 AT ^ X /
20 2002 BE - / /
20 2002 CY / - -
20 2002 EE / / X
@@ -60,18 +60,18 @@
20 2002 IE X - /
20 2002 IT - X X
20 2002 MT / - -
-20 2002 NL X - X
+20 2002 NL X X X
20 2002 PT - X X
20 2002 SK / - X
20 2002 SI / - -
-20 2002 ES - - /
+20 2002 ES X X /
20 Europa AT X X
20 Europa BE X /
20 Europa BG / X
20 Europa FR-E X X
20 Europa FR-U X X
20 Europa DE-R X X
-20 Europa DE-W X -
+20 Europa DE-W X X
20 Europa DE-X X /
20 Europa IE X /
20 Europa IT X X
@@ -87,9 +87,9 @@
50 2002 DE X X X
50 2002 GR X / /
50 2002 IE X / /
-50 2002 IT - X X
+50 2002 IT X X X
50 2002 MT / / X
-50 2002 NL - X X
+50 2002 NL X X X
50 2002 PT - / /
50 2002 SK / / X
50 2002 SI / / X
@@ -126,7 +126,7 @@
100 Europa ES X /
200 2002 AT X / /
-200 2002 BE - / -
+200 2002 BE - / X
200 2002 FI - / /
200 2002 FR - / /
200 2002 DE X X X
@@ -157,4 +157,4 @@ TN 20 VH********** / **** / Mario Draghi X
TN 20 XZ********** / **** / Mario Draghi X
TN 50 VH********** / **** / Mario Draghi X
TN 100 NZ********** / **** / Mario Draghi X
-TN 200 NZ********** / **** / Mario Draghi X
+TN 200 NZ********** / **** / Mario Draghi X \ No newline at end of file
diff --git a/data/world/bqs.us b/data/world/bqs.us
index 9d92414..60054ab 100644
--- a/data/world/bqs.us
+++ b/data/world/bqs.us
@@ -1,37 +1,37 @@
-2010 - - * / Hot Springs
-2010 - - * / Grand Canyon
-2010 - - * / Yosemite
-2010 - - * / Mount Hood
+2010 X X * / Hot Springs
+2010 - X * / Grand Canyon
+2010 X X * / Yosemite
+2010 - X * / Mount Hood
2010 - X * / Yellowstone
-2011 X - * / Vicksburg
+2011 X X * / Vicksburg
2011 - X * / Glacier
-2011 - X * / Chickasaw
-2011 X - * / Gettysburg
-2011 X - * / Olympic
+2011 X X * / Chickasaw
+2011 X X * / Gettysburg
+2011 X X * / Olympic
2012 X X * / Denali
2012 X X * / Hawai‘i Volcanoes
2012 X X * / Acadia
-2012 - - * / Chaco Culture
-2012 - X * / El Yunque
-2013 - - * / Fort McHenry
-2013 - X * / White Mountain
+2012 - X * / Chaco Culture
+2012 X X O / El Yunque
+2013 X X * / Fort McHenry
+2013 X X * / White Mountain
2013 X X * / Great Basin
-2013 - X * / Perry’s Victory
-2013 - X * / Mount Rushmore
+2013 X X * / Perry’s Victory
+2013 X X * / Mount Rushmore
2014 X X * / Great Sand Dunes
-2014 - - * / Everglades
-2014 - - * / Great Smoky Mountains
+2014 X X * / Everglades
+2014 X X * / Great Smoky Mountains
2014 X X * / Arches
2014 X X * / Shenandoah
-2015 - X * / Bombay Hook
+2015 X X * / Bombay Hook
2015 X X * / Kisatchie
2015 X X * / Blue Ridge Parkway
2015 X X * / Homestead
2015 X X * / Saratoga
-2016 - X * / Shawnee
-2016 - X * / Cumberland Gap
+2016 X X * / Shawnee
+2016 X X * / Cumberland Gap
2016 X X * / Theodore Roosevelt
-2016 - X * / Fort Moultrie
+2016 X X * / Fort Moultrie
2016 X X * / Harpers Ferry
2017 X X * / Frederick Douglas
2017 X X * / Effigy Mounds
@@ -39,18 +39,18 @@
2017 X X * / Ozark Riverways
2017 X X * / Ellis Island
2018 X X * / Cumberland Island
-2018 - X * / Pictured Rocks
+2018 X X * / Pictured Rocks
2018 X X * / Voyageurs
2018 X X * / Block Island
2018 X X * / Apostle Islands
-2019 - X * - War in the Pacific
-2019 - X * - River of No Return
-2019 - X * - Lowell
-2019 - X * - American Memorial Park
+2019 X X * - War in the Pacific
+2019 X X * - River of No Return
+2019 X X * - Lowell
+2019 X X * - American Memorial Park
2019 X X * - San Antonio Missions
-2020 - X * - National Park
-2020 - X * - Weir Farm
-2020 - - * - Tallgrass Prairie
-2020 X X * - Salt River Bay
-2020 X X * - Marsh-Billings-Rockefeller
-2021 X X * / Tuskegee Airmen
+2020 X X * - American Samoa National Park
+2020 X X * - Weir Farm
+2020 X X * - Tallgrass Prairie
+2020 X X * X Salt River Bay
+2020 X X * X Marsh-Billings-Rockefeller
+2021 X X * / Tuskegee Airmen \ No newline at end of file
diff --git a/data/world/ids.us b/data/world/ids.us
index 2cc5396..db036c1 100644
--- a/data/world/ids.us
+++ b/data/world/ids.us
@@ -23,3 +23,7 @@
2024 * * * Illinois
2024 * * * Maine
2024 * * * Missouri
+2025 * * * Arkansas
+2025 * * * Texas
+2025 * * * Florida
+2025 * * * Michigan \ No newline at end of file
diff --git a/data/world/nds.us b/data/world/nds.us
index fe582af..243cc4f 100644
--- a/data/world/nds.us
+++ b/data/world/nds.us
@@ -14,3 +14,4 @@
2022 * * * / Ely Samuel Parker
2023 * * * / Ballet
2024 * * * / Indian Citizenship Act
+2025 * * * / Mary Kawena Pukui \ No newline at end of file
diff --git a/data/world/pds.us b/data/world/pds.us
index 756555a..641894c 100644
--- a/data/world/pds.us
+++ b/data/world/pds.us
@@ -19,7 +19,7 @@
2011 X X * Rutherford B. Hayes
2011 X X * James Garfield
2012 * O * Chester Arthur
-2012 * * * Grover Cleveland (1st Term)
+2012 O * * Grover Cleveland (1st Term)
2012 * * * Benjamin Harrison
2012 * * * Grover Cleveland (2nd Term)
2013 * * * William McKinley
@@ -35,6 +35,6 @@
2015 O * * John F. Kennedy
2015 * * * Lyndon B. Johnson
2016 * * * Richard M. Nixon
-2016 * * * Gerald R. Ford
-2016 * * * Ronald Reagan
-2020 * * * George H. W. Bush
+2016 O * * Gerald R. Ford
+2016 * O * Ronald Reagan
+2020 * * * George H. W. Bush \ No newline at end of file
diff --git a/data/world/sds.us b/data/world/sds.us
new file mode 100644
index 0000000..5e5d0cb
--- /dev/null
+++ b/data/world/sds.us
@@ -0,0 +1,9 @@
+2000 X X *
+2001 - - *
+2002 * O *
+2003 O * *
+2004 O O *
+2005 * O *
+2006 * * *
+2007 O O *
+2008 O * * \ No newline at end of file
diff --git a/data/world/sqs.us b/data/world/sqs.us
index 2c6a5c8..754d0b7 100644
--- a/data/world/sqs.us
+++ b/data/world/sqs.us
@@ -1,6 +1,6 @@
1999 X X * Connecticut
1999 X X * Delaware
-1999 X - * Georgia
+1999 X X * Georgia
1999 X X * New Jersey
1999 X X * Pennsylvania
2000 X X * Massachusetts
@@ -8,43 +8,43 @@
2000 X X * New Hampshire
2000 X X * South Carolina
2000 X X * Virginia
-2001 X - * Kentucky
-2001 - X * North Carolina
+2001 X X * Kentucky
+2001 X X * North Carolina
2001 X X * New York
2001 X X * Rhode Island
2001 X X * Vermont
-2002 - X * Indiana
+2002 X X * Indiana
2002 X X * Louisiana
2002 X X * Mississippi
-2002 X - * Ohio
-2002 - X * Tennessee
-2003 - - * Alabama
-2003 X - * Arkansas
-2003 - - * Illinois
+2002 X X * Ohio
+2002 X X * Tennessee
+2003 X X * Alabama
+2003 X X * Arkansas
+2003 X X * Illinois
2003 X X * Maine
-2003 X - * Missouri
-2004 - X * Florida
-2004 - - * Iowa
+2003 X X * Missouri
+2004 X X * Florida
+2004 X X * Iowa
2004 X X * Michigan
2004 X X * Texas
-2004 - - * Wisconsin
-2005 - - * California
+2004 X X * Wisconsin
+2005 X X * California
2005 X X * Kansas
-2005 - X * Minnesota
-2005 - X * Oregon
-2005 X - * West Virginia
-2006 - X * Colorado
-2006 X - * North Dakota
-2006 - X * Nebraska
-2006 - X * Nevada
-2006 - X * South Dakota
-2007 - X * Idaho
+2005 X X * Minnesota
+2005 X X * Oregon
+2005 X X * West Virginia
+2006 X X * Colorado
+2006 X X * North Dakota
+2006 X X * Nebraska
+2006 X X * Nevada
+2006 X X * South Dakota
+2007 X X * Idaho
2007 X X * Montana
-2007 - X * Utah
+2007 X X * Utah
2007 X X * Washington
-2007 - X * Wyoming
-2008 - X * Alaska
+2007 X X * Wyoming
+2008 X X * Alaska
2008 X X * Arizona
2008 X X * Hawaii
-2008 - X * New Mexico
-2008 X X * Oklahoma
+2008 X X * New Mexico
+2008 X X * Oklahoma \ No newline at end of file
diff --git a/data/world/tqs.us b/data/world/tqs.us
index 249dbeb..66c006e 100644
--- a/data/world/tqs.us
+++ b/data/world/tqs.us
@@ -1,6 +1,6 @@
2009 X X * American Samoa
-2009 - X * District of Columbia
-2009 - X * Guam
-2009 - - * Northern Mariana Islands
+2009 X X * District of Columbia
+2009 X X * Guam
+2009 X - * Northern Mariana Islands
2009 X X * Puerto Rico
-2009 - - * Virgin Islands
+2009 X X * Virgin Islands \ No newline at end of file
diff --git a/data/world/wns.us b/data/world/wns.us
index 04ca1ce..475baac 100644
--- a/data/world/wns.us
+++ b/data/world/wns.us
@@ -1,4 +1,4 @@
2004 X X * Louisiana Purchase
-2004 - X * Keelboat
+2004 X X * Keelboat
2005 X X * Bison
-2005 X X * Ocean View
+2005 X X * Ocean View \ No newline at end of file
diff --git a/data/world/wqs.us b/data/world/wqs.us
index aebb361..e4c435d 100644
--- a/data/world/wqs.us
+++ b/data/world/wqs.us
@@ -4,12 +4,17 @@
2022 X X * Sally Ride
2022 X X * Wilma Mankiller
2023 X X * Bessie Coleman
-2023 - X * Edith Kanaka‘ole
+2023 X X * Edith Kanaka‘ole
2023 - X * Eleanor Roosevelt
2023 X X * Jovita Idar
-2023 - X * Maria Tallchief
-2024 - - * Celia Cruz
-2024 - - * Dr. Mary Edwards Walker
-2024 - - * Patsy Takemoto Mink
-2024 - - * Rev. Dr. Pauli Murray
-2024 - - * Zitkala-Ša
+2023 X X * Maria Tallchief
+2024 X X * Celia Cruz
+2024 X X * Dr. Mary Edwards Walker
+2024 X X * Patsy Takemoto Mink
+2024 X X * Rev. Dr. Pauli Murray
+2024 X - * Zitkala-Ša
+2025 X X * Dr. Vera Rubin
+2025 X X * Ida B. Wells
+2025 X X * Juliette Gordon Low
+2025 - - * Stacey Milbern
+2025 - - * Althea Gibson \ No newline at end of file
diff --git a/data/world/xxx.bra b/data/world/xxx.bra
index 31f5beb..4b312ab 100644
--- a/data/world/xxx.bra
+++ b/data/world/xxx.bra
@@ -3,3 +3,5 @@
2005 X 40 Years of the Central Bank
2015 X 50 Years of the Central Bank
2019 X 25 Years of the Real
+2024 - 30 Years of the Real
+2025 - 60 Years of the Central Bank
diff --git a/lib.m4 b/lib.m4
index 02ae9ef..99f45cc 100644
--- a/lib.m4
+++ b/lib.m4
@@ -11,7 +11,7 @@ m4_define(__ifextra, [
])
m4_dnl Execute the script ‘$1’ in the ‘scripts/’ directory
-m4_define(__esyscmd, [m4_esyscmd([scripts/$1])])
+m4_define(__esyscmd, [m4_esyscmd([scripts/$*])])
m4_dnl Include the file ‘$1’ in the ‘src/’ directory, while also keeping track
m4_dnl of who called ‘__include’. This is required sometimes when expanding
@@ -58,3 +58,7 @@ m4_define(__entry, [
}
}
])
+
+m4_define(__tr, [__esyscmd(tr "$*")])
+
+m4_define(__stats, [__esyscmd(completion __code $1 $2)]) \ No newline at end of file
diff --git a/scripts/completion b/scripts/completion
new file mode 100755
index 0000000..0b9881e
--- /dev/null
+++ b/scripts/completion
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+gawk -v CC="$1" -v TYPE="$2" -v MODE="$3" '
+function hndl(x)
+{
+ if (x == "/")
+ return
+ if (x ~ /X/) {
+ have_c++
+ cnt_c++
+ } else if (x ~ /[O@]/) {
+ have_n++
+ cnt_n++
+ } else if (x ~ /[-^]/) {
+ cnt_c++
+ } else if (x ~ /[*%+]/) {
+ cnt_n++
+ } else if (x == "?") {
+ cnt_u++
+ }
+}
+
+function gen(have, cnt)
+{
+ if (cnt == 0)
+ print "N/A"
+ else
+ printf "%d/%d (%d%%)\n", have, cnt, have / cnt * 100
+}
+
+BEGIN {
+ CC = toupper(CC)
+}
+
+FILENAME == "data/coins" && $1 == CC && TYPE == "s" && $2 != "start" {
+ split($0, xs)
+ for (i = 2; i < length(xs); i++)
+ hndl(xs[i])
+}
+
+FILENAME == "data/ccs" && $1 == CC && TYPE == "c" {
+ gsub(/([A-Z]{2} [0-9]{4} |\t.*)/, " ")
+ split($0, xs)
+ for (i = 1; i <= length(xs); i++)
+ hndl(xs[i])
+}
+
+END {
+ if (MODE == "circ")
+ gen(have_c, cnt_c)
+ else if (MODE == "nifc")
+ gen(have_n, cnt_n)
+ else if (MODE == "comb")
+ gen(have_c + have_n, cnt_c + cnt_n + cnt_u)
+}
+' data/coins data/ccs \ No newline at end of file
diff --git a/scripts/gen-america b/scripts/gen-america
index bc7bd95..59eebf0 100755
--- a/scripts/gen-america
+++ b/scripts/gen-america
@@ -1,6 +1,6 @@
#!/bin/sh
-gawk '
+gawk -vfile="$1" '
@include "scripts/getcls.awk"
function getsup(i, s)
@@ -28,10 +28,13 @@ BEGIN {
}
{
- printf "trX { td .missing colspan=\"2\" {-%s}", $3
+ if (file == "sds")
+ printf "trX {"
+ else
+ printf "trX { td .missing colspan=\"2\" {-%s}", $3
split($2, a, / /)
for (i = 1; i <= length(a); i++)
- printf "td .%s colspan=\"1\" {-%s %s}", getcls(a[i]), $1, getsup(i)
+ printf "td .%s colspan=\"1\" {-%s %s}", getcls(a[i]), $1, getsup(i)
print "}"
}
@@ -39,4 +42,4 @@ END {
print "__MARKER__"
}
' data/world/$1.us \
-| scripts/last-of-design.sed
+| scripts/last-of-design.sed \ No newline at end of file
diff --git a/scripts/gen-stats b/scripts/gen-stats
index 46148d4..f51e19c 100755
--- a/scripts/gen-stats
+++ b/scripts/gen-stats
@@ -22,7 +22,7 @@ FILENAME == "data/coins" && $1 == CC && $2 != "start" {
}
FILENAME == "data/ccs" && $1 == CC {
- gsub(/([A-Z]{2} [0-9]{4}( [A-Za-z]+)?|\t.*)/, " ")
+ gsub(/([A-Z]{2} [0-9]{4} |\t.*)/, " ")
split($0, xs)
for (i = 1; i <= length(xs); i++)
hndl(xs[i])
@@ -31,4 +31,4 @@ FILENAME == "data/ccs" && $1 == CC {
END {
printf "%d/%d (%d%%)\n", have, cnt, have / cnt * 100
}
-' data/coins data/ccs
+' data/coins data/ccs \ No newline at end of file
diff --git a/scripts/getcls.awk b/scripts/getcls.awk
index f53dc14..fd18e37 100644
--- a/scripts/getcls.awk
+++ b/scripts/getcls.awk
@@ -11,6 +11,12 @@ function getcls(c)
return "have-nifc"
case "@":
return "have-proof"
+ case "^":
+ return "getting"
+ case "%":
+ return "getting-nifc"
+ case "+":
+ return "getting-proof"
case "?":
return "unknown"
case "/":
@@ -18,4 +24,4 @@ function getcls(c)
default:
return "error"
}
-}
+} \ No newline at end of file
diff --git a/scripts/tr b/scripts/tr
new file mode 100755
index 0000000..63e600b
--- /dev/null
+++ b/scripts/tr
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+echo "$1" | sed -E '
+ s/((..):([^,]+))/@span lang="\2" .translation {-\3}/g
+ s/,//g
+' \ No newline at end of file
diff --git a/src/changelog/index.gsp b/src/changelog/index.gsp
index ab45081..9476853 100644
--- a/src/changelog/index.gsp
+++ b/src/changelog/index.gsp
@@ -22,6 +22,312 @@ html lang="en" {
}
}
+ __entry([25-08-2025], [
+ p {-
+ For the last week I’ve been in Zadar, Croatia. Overall it was
+ a pretty relaxing trip, with very little hunting. I did find 3
+ new finds though. Those new finds were 5c 2024, 10c 2025, and
+ 20c 2025, all from Croatia.
+ }
+ ])
+
+ __entry([10-08-2025], [
+ p {-
+ This is going to be a big update! To quickly start with some
+ site-related news, the pages for my Euro coin collection now
+ show more detailed completion statistics. Check them out!
+ }
+ p {-
+ On the 8–10@sup{-th} of August the
+ @a
+ href="https://discord.com/invite/dM3rHy4ANk"
+ target="_blank"
+ {-Euro Coins discord server} hosted the Brasitlava–Vienna
+ meetup. It was a great meeting with lots of us coming together
+ to meet, trade, and go coin roll hunting. For me, this meant
+ completing a lot of trades, and receiving a huge batch of coins
+ from Phillip (Austrian Euro Coin Hunter) which both made huge
+ impacts to my collection. The list of new finds below will
+ include all of these coins. Unfortunately it won’t contain
+ coins and banknotes I got during my trip to Austria a few weeks
+ prior, as the update logs for this site are a big of a mess.
+ }
+
+ p {-
+ Obviously a huge thanks to everyone that showed up. It was
+ incredibly fun to meet everyone, and my collection grew @em{-a
+ lot}, which was surprising considering how complete my
+ collection is starting to become.
+ }
+
+ p {-
+ The meeting and trip saw the following increases in the size of
+ my collection:
+ }
+
+ ul {
+ li {-121 circulating dates}
+ li {-4 NIFC dates}
+ li {-24 circulating commemoratives}
+ li {-1 NIFC commemorative}
+ li {-9 €5/€10 Austrian NIFC commemoratives}
+ li {-2 banknotes}
+ li {-1 circulating American nickel}
+ li {-91 circulating American quarters}
+ li {-1 NIFC American quarter}
+ li {-9 NIFC American dollars}
+ }
+
+ p {-
+ Now for the list of all the finds, which will only include
+ Euros (because I don’t want to type @em{-all} that out)
+ }
+
+ ul {
+ li {=
+ Standard Coins
+ @ul {
+ li {-Austria 2024 €1}
+ li {-Austria 2025 20c, 50c, €1}
+ li {-Belgium 2022 GVV 5c}
+ li {-Belgium 2023 20c}
+ li {-Croatia 2024 1c, 20c, 50c}
+ li {-Cyprus 2010 20c, €2}
+ li {-Cyprus 2012 €1}
+ li {-Cyprus 2014 €2}
+ li {-Cyprus 2016 €2}
+ li {-Cyprus 2020 5c, 50c}
+ li {-Cyprus 2021 1c, 2c, 5c}
+ li {-Estonia 2015 1c}
+ li {-Estonia 2018 5c, 10c}
+ li {-Estonia 2019 1c}
+ li {-Estonia 2020 2c}
+ li {-Estonia 2021 2c, 20c}
+ li {-Estonia 2022 1c, 2c, 5c, 10c}
+ li {-Estonia 2023 €2}
+ li {-Finland 2000 2c}
+ li {-Finland 2001 1c}
+ li {-Finland 2003 1c}
+ li {-Finland 2005 2c}
+ li {-Finland 2006 2c}
+ li {-Finland 2007 1c, 2c}
+ li {-Finland 2009 €1}
+ li {-Finland 2010 5c}
+ li {-Finland 2011 2c}
+ li {-Finland 2014 5c}
+ li {-Finland 2017 5c}
+ li {-France 2004 10c}
+ li {-France 2020 2c}
+ li {-France 2023 2c, 5c}
+ li {-Germany 2004 J 50c @strong{-NIFC}}
+ li {-Germany 2005 G 20c, €2 @strong{-NIFC}}
+ li {-Germany 2008 D 50c @strong{-NIFC}}
+ li {-Germany 2020 J 5c}
+ li {-Germany 2022 A 2c}
+ li {-Germany 2022 F 2c}
+ li {-Germany 2022 G 2c}
+ li {-Germany 2023 D 2c}
+ li {-Germany 2023 F 1c}
+ li {-Germany 2023 J 1c}
+ li {-Germany 2024 D 1c, 5c, 20c}
+ li {-Germany 2024 F 10c}
+ li {-Germany 2024 G 5c, 20c, 50c}
+ li {-Germany 2024 J 10c}
+ li {-Germany 2025 A €2}
+ li {-Greece 2002 F 1c, 2c}
+ li {-Greece 2004 50c}
+ li {-Greece 2006 20c}
+ li {-Greece 2007 1c}
+ li {-Greece 2011 20c}
+ li {-Greece 2012 2c, 5c}
+ li {-Greece 2021 1c}
+ li {-Greece 2022 2c, 20c}
+ li {-Greece 2023 20c, €2}
+ li {-Ireland 2003 €1}
+ li {-Ireland 2011 2c, 5c}
+ li {-Ireland 2023 10c}
+ li {-Ireland 2024 10c}
+ li {-Italy 2019 €1}
+ li {-Italy 2022 €1}
+ li {-Italy 2023 10c}
+ li {-Italy 2024 5c, 10c, €2}
+ li {-Latvia 2023 5c}
+ li {-Lithuania 2016 1c}
+ li {-Lithuania 2021 10c}
+ li {-Lithuania 2023 5c, 10c}
+ li {-Lithuania 2024 €2}
+ li {-Malta 2022 10c}
+ li {-Malta 2023 5c, €1}
+ li {-Malta 2024 20c}
+ li {-Monaco 2023 €1, €2}
+ li {-Portugal 2005 2c}
+ li {-Portugal 2024 10c}
+ li {-San Marino 2007 20c @strong{-NIFC}}
+ li {-San Marino 2010 €1}
+ li {-San Marino 2017 €1}
+ li {-San Marino 2018 20c}
+ li {-San Marino 2019 €1}
+ li {-Slovakia 2023 5c, 10c}
+ li {-Slovakia 2024 5c, 10c, €1}
+ li {-Slovakia 2025 €2}
+ li {-Slovenia 2023 1c, 5c, 10c}
+ li {-Slovenia 2024 1c, 2c, 10c}
+ li {-Spain 2022 50c}
+ li {-Spain 2024 €2}
+ li {-Vatican City 2023 50c}
+ }
+ }
+ li {=
+ Commemorative Coins
+ @ul {
+ li {-Croatia 2023 ‘Introduction of the Euro’ @strong{-NIFC}}
+ li {-Cyprus 2022 ‘Erasmus Programme’}
+ li {-Estonia 2023 ‘Barn Swallow’}
+ li {-Estonia 2024 ‘The Cornflower’}
+ li {-Estonia 2025 ‘First Estonian Text’}
+ li {-Finland 2024 ‘Gesellius, Lindgren, Saarinen’}
+ li {-Germany 2025 ‘Saarland’ (A & F)}
+ li {-Greece 2011 ‘Special Olympics’}
+ li {-Greece 2024 ‘Democracy’}
+ li {-Greece 2024 ‘Penelope Delta’}
+ li {-Italy 2023 ‘Air Force’}
+ li {-Latvia 2022 ‘Erasmus Programme’}
+ li {-Latvia 2024 ‘Latvian Puzuris’}
+ li {-Lithuania 2024 ‘Sodai Straw Gardens’}
+ li {-Luxembourg 2007 ‘Palais Grand-Ducal’}
+ li {-Luxembourg 2009 ‘Accession of Charlotte’}
+ li {-Luxembourg 2013 ‘National Anthem’}
+ li {-Luxembourg 2015 ‘EU Flag’}
+ li {-Luxembourg 2018 ‘William I’}
+ li {-Portugal 2020 ‘University of Coimbra’}
+ li {-Portugal 2024 ‘25@sup{-th} April Revolution’}
+ li {-Slovenia 2023 ‘Josip Plemelj’}
+ li {-Spain 2017 ‘Asturias Churches’}
+ li {-Spain 2023 ‘EU Presidency’}
+ }
+ }
+ li {=
+ Austrian €5/€10 Commemorative Coins
+ @ul {
+ li {-Austria 2012 €10 ‘Steiermark’ @strong{-NIFC}}
+ li {-Austria 2014 €5 ‘Arctic Adventure’ @strong{-NIFC}}
+ li {-Austria 2015 €5 ‘Operetta Bat and the Ball’ @strong{-NIFC}}
+ li {-Austria 2021 €10 ‘Rose’ @strong{-NIFC}}
+ li {-Austria 2022 €5 ‘New Year’ @strong{-NIFC}}
+ li {-Austria 2024 €5 ‘Alpine Work Ski Championships’ @strong{-NIFC}}
+ li {-Austria 2025 €10 ‘Aufdirndln — Linen’ @strong{-NIFC}}
+ li {-Austria 2025 €5 ‘Dance Away’ @strong{-NIFC}}
+ li {-Austria 2025 €5 ‘Narcissus’ @strong{-NIFC}}
+ }
+ }
+ li {=
+ Banknotes
+ @ul {
+ li {-Italy €50 (2002; Wim Duisenberg)}
+ li {-Netherlands €50 (2002; Wim Duisenberg)}
+ }
+ }
+ }
+ ])
+
+ __entry([07-08-2025], [
+ p {-
+ Yesterday I met up with Wukongo from the
+ @a
+ href="https://discord.com/invite/dM3rHy4ANk"
+ target="_blank"
+ {-Euro Coins discord server}. It was a quick meeting where we
+ did a small swap and also exchanged Dutch and Spanish coin
+ rolls with each other. After the exchange and hunting all the
+ rolls, I ended up with 8 new finds, which are as follows:
+ }
+
+ ul {
+ li {= Spain 2024 5c}
+ li {= France 2023 20c}
+ li {= Spain 2024 20c}
+ li {= Spain 2025 20c}
+ li {= Spain 2023 50c}
+ li {= Spain 2024 50c}
+ li {= Spain 2024 €1}
+ li {= Andorra 2024 €2}
+ }
+
+ p {-
+ After our meeting I took the train to work and stopped at the
+ grocery store to get a drink. In my change I received a 2024 5c
+ coin from the Netherlands which was also a new find for me!
+ }
+
+ p {-
+ Before this meeting and back when I was still in Austria, I
+ also met some collectors in Vienna where I got a bunch of new
+ coins, but those will be documented in the next changelog
+ update.
+ }
+ ])
+
+ __entry([09-07-2025], [
+ p {-
+ I’m in Salzburg in Austria, and I met up with Gusovici from
+ the
+ @a
+ href="https://discord.com/invite/dM3rHy4ANk"
+ target="_blank"
+ {-Euro Coins discord server}. We visited Bank Austria and
+ did a bunch of coin roll hunting where we got some pretty
+ incredible finds! New for me from the hunts and swapping
+ with him were the following:
+ }
+
+ ul {
+ li {= Andorra 2023 €2}
+ li {= Austria 2025 €2}
+ li {= Croatia 2024 €1}
+ li {= Luxembourg 2008 €2 (Château de Berg)}
+ li {= Luxembourg 2020 €2 (50.000 mintage)}
+ li {= Slovakia 2011 €2 (Visegrád Group)}
+ li {= Slovenia 2024 €2}
+ }
+
+ p {-
+ The best find was definitely the incredibly Luxembourg 2020
+ which was found by Gusovici who was generous enough to swap
+ it with me for two Finnish- and Portuguese commemoratives I
+ had found.
+ }
+
+ p {-
+ We later went to Volksbank to get banknotes to track for
+ @a
+ href="https://eurobilltracker.com"
+ target="_blank"
+ {-EuroBillTracker}, and I also got myself a German (W) €20
+ note bearing the signature of Christine Lagarde, which was
+ the last of the Europa €20 notes I needed!
+ }
+ ])
+
+ __entry([02-07-2025], [
+ p {-
+ Did a 40 roll hunt of €0,10 coins today, and I got 8 new
+ finds. The finds were: Belgium 2023, France 2023, Germany
+ 2023 (A), Germany 2024 (D), Germany 2024 (G), Greece 2023,
+ and Netherlands 2024. The 8@sup{-th} and final find was a
+ Germany 2004 (F) circulated proof!
+ }
+ ])
+
+ __entry([30-06-2025], [
+ p {-
+ After nearly a year out of the Eurozone, I am back for the
+ summer. I went for a quick hunt today, and I got two new
+ finds. Germany €2 2024 (F), and Germany €2 2025 (D)
+ ‘Saarland’. There were some other nice finds too, but all
+ duplicates.
+ }
+ ])
+
__entry([15-11-2024], [
p {-
Today I got a letter in the mail with a small Numista swap of
diff --git a/src/euro/index.ccoins.gsp b/src/euro/index.ccoins.gsp
index ae16426..d6d117c 100644
--- a/src/euro/index.ccoins.gsp
+++ b/src/euro/index.ccoins.gsp
@@ -15,10 +15,9 @@ html lang="en" {
main {
section {
header {
- h1 {-__demonym Euro Coins}
- h3 {
- span {-__altnames}
- span {-__percentage}
+ h1 {=
+ __name
+ __tr(__altnames)
}
}
}
@@ -71,6 +70,12 @@ html lang="en" {
section .cl-section .slant-down {
div {
+ ul .stats-list {
+ li {-Circulating: __stats(s, circ)}
+ li {-NIFC: __stats(s, nifc)}
+ li {-Combined: __stats(s, comb)}
+ }
+
table .coin-table cellspacing="0" {
thead {
tr {
@@ -105,6 +110,12 @@ html lang="en" {
section .cl-section .slant-down {
div {
+ ul .stats-list {
+ li {-Circulating: __stats(c, circ)}
+ li {-NIFC: __stats(c, nifc)}
+ li {-Combined: __stats(c, comb)}
+ }
+
table .coin-table .commemorative-table cellspacing="0" {
thead {
tr {
@@ -150,4 +161,4 @@ html lang="en" {
section { __include(foot.gsp) }
}
}
-}
+} \ No newline at end of file
diff --git a/src/style.css b/src/style.css
index 6d00b54..ae908ba 100644
--- a/src/style.css
+++ b/src/style.css
@@ -222,8 +222,11 @@ nav ul > * {
}
header h1 {
+ display: flex;
+ flex-direction: column;
font-size: 1.5rem;
margin-bottom: 0;
+ line-height: 1.1;
}
header h3 {
@@ -455,22 +458,28 @@ main section {
text-align: right;
}
-.nifc { background-color: pink; }
-.have { background-color: green; }
-.have-nifc { background-color: #5DBB63; }
-.not-minted { background-color: black; }
-.unknown { background-color: grey; }
-.error { background-color: red; }
+.nifc { background-color: pink; }
+.have { background-color: green; }
+.have-nifc { background-color: #5DBB63; }
+.not-minted { background-color: black; }
+.unknown { background-color: grey; }
+.error { background-color: red; }
+.getting { background-color: yellow; }
+.getting-nifc { background-color: khaki; }
.have-proof {
background-color: #5DBB63;
position: relative;
}
+.getting-proof {
+ background-color: khaki;
+ position: relative;
+}
-.have-proof:before { animation: slide 2s linear 1s infinite; }
-.have-proof:after { animation: slide 2s linear 0s infinite; }
+:is(.have-proof, .getting-proof):before { animation: slide 2s linear 1s infinite; }
+:is(.have-proof, .getting-proof):after { animation: slide 2s linear 0s infinite; }
-.have-proof:before,
-.have-proof:after {
+:is(.have-proof, .getting-proof):before,
+:is(.have-proof, .getting-proof):after {
content: '';
top: 0;
left: 0;
@@ -653,6 +662,11 @@ div .country-table:not(:first-child) {
border-radius: 16px 16px 16px 16px;
}
+.stats-list {
+ list-style: none;
+ margin-bottom: 32px;
+}
+
.coin-table {
width: calc(95% + 32px);
white-space: nowrap;
@@ -728,11 +742,16 @@ div .country-table:not(:first-child) {
background-color: var(--tertiary-color);
}
-.coin-table .have,
-.coin-table .nifc,
-.coin-table .have-nifc,
-.coin-table .have-proof,
-.coin-table .not-minted {
+.coin-table :is(
+ .have,
+ .nifc,
+ .have-nifc,
+ .have-proof,
+ .not-minted,
+ .getting,
+ .getting-nifc,
+ .getting-proof
+) {
color: black;
}
@@ -876,3 +895,7 @@ div .country-table:not(:first-child) {
flex-direction: column;
align-items: center;
}
+
+.translation {
+ opacity: 50%;
+} \ No newline at end of file
diff --git a/src/table-key.gsp b/src/table-key.gsp
index ba551a8..db726b1 100644
--- a/src/table-key.gsp
+++ b/src/table-key.gsp
@@ -16,6 +16,18 @@ table #table-key cellspacing="0" {
td {-In my collection (proof)}
}
tr {
+ td {div .getting {}}
+ td {-Getting for my collection}
+ }
+ tr {
+ td {div .getting-nifc {}}
+ td {-Getting for my collection (NIFC)}
+ }
+ tr {
+ td {div .getting-proof {}}
+ td {-Getting for my collection (proof)}
+ }
+ tr {
td {div .unknown {}}
td {-Circulation status unknown}
}
@@ -23,4 +35,4 @@ table #table-key cellspacing="0" {
m4_dnl td {div .not-minted {}}
m4_dnl td {-m4_ifdef([__coins], [Not minted], [Not printed])}
m4_dnl }
-}
+} \ No newline at end of file
diff --git a/src/world/coins/br/index.gsp b/src/world/coins/br/index.gsp
index 0045ff3..2e9950b 100644
--- a/src/world/coins/br/index.gsp
+++ b/src/world/coins/br/index.gsp
@@ -13,7 +13,10 @@ html lang="en" {
main {
section {
header {
- h1 {-Brazilian Coins}
+ h1 {=
+ Brazil
+ @span lang="pt" .translation {-Brasil}
+ }
}
}
@@ -80,4 +83,4 @@ html lang="en" {
section { __include(foot.gsp) }
}
}
-}
+} \ No newline at end of file
diff --git a/src/world/coins/us/index.gsp b/src/world/coins/us/index.gsp
index ef5a612..6d27e25 100644
--- a/src/world/coins/us/index.gsp
+++ b/src/world/coins/us/index.gsp
@@ -13,7 +13,7 @@ html lang="en" {
main {
section {
header {
- h1 {-American Coins}
+ h1 {-United States of America}
}
}
@@ -169,6 +169,25 @@ html lang="en" {
table .coin-table cellspacing="0" {
thead {
tr {
+ th colspan="3" {-Sacagawea Dollars}
+ }
+ tr {
+ th {-Denver}
+ th {-Philadelphia}
+ th {-San Francisco}
+ }
+ }
+
+ tbody { __esyscmd(gen-america sds) }
+ }
+ }
+ }
+
+ section .cl-section .slant-down {
+ div {
+ table .coin-table cellspacing="0" {
+ thead {
+ tr {
th colspan="6" {-Native American Dollars}
}
tr {
@@ -228,4 +247,4 @@ html lang="en" {
section { __include(foot.gsp) }
}
}
-}
+} \ No newline at end of file
diff --git a/src/world/notes/ez/index.gsp b/src/world/notes/ez/index.gsp
index c62db8c..5139cad 100644
--- a/src/world/notes/ez/index.gsp
+++ b/src/world/notes/ez/index.gsp
@@ -13,7 +13,7 @@ html lang="en" {
main {
section {
header {
- h1 {-Eurozone Banknotes}
+ h1 {-Eurozone}
}
}
@@ -57,4 +57,4 @@ html lang="en" {
section { __include(foot.gsp) }
}
}
-}
+} \ No newline at end of file