diff options
-rw-r--r-- | GNUmakefile | 13 | ||||
-rw-r--r-- | data/ccs | 66 | ||||
-rw-r--r-- | data/coins | 185 | ||||
-rw-r--r-- | data/country-info | 44 | ||||
-rw-r--r-- | data/errors | 2 | ||||
-rw-r--r-- | data/extras | 14 | ||||
-rw-r--r-- | data/notes | 32 | ||||
-rw-r--r-- | data/world/bqs.us | 2 | ||||
-rw-r--r-- | data/world/ids.us | 4 | ||||
-rw-r--r-- | data/world/nds.us | 1 | ||||
-rw-r--r-- | data/world/olympic.bra | 6 | ||||
-rw-r--r-- | data/world/wqs.us | 5 | ||||
-rw-r--r-- | data/world/xxx.bra | 2 | ||||
-rw-r--r-- | lib.m4 | 6 | ||||
-rwxr-xr-x | scripts/gen-ecoin | 12 | ||||
-rwxr-xr-x | scripts/gen-stats | 34 | ||||
-rw-r--r-- | src/changelog/index.gsp | 255 | ||||
-rw-r--r-- | src/euro/index.ccoins.gsp | 43 | ||||
-rw-r--r-- | src/euro/index.gsp | 11 | ||||
-rw-r--r-- | src/style.css | 16 |
20 files changed, 523 insertions, 230 deletions
diff --git a/GNUmakefile b/GNUmakefile index c5cb884..6807748 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -38,13 +38,15 @@ gspdeps := lib.m4 src/nav.gsp src/head.gsp src/foot.gsp src/table-key.gsp # Dependencies for certain /euro files euroxyzdeps := src/euro/index.xyz.gsp src/euro/nav.xyz.gsp data/country-info -euroccdeps := $(subst xyz,ccoins,$(euroxyzdeps)) data/coins data/ccs data/errors +euroccdeps := $(subst xyz,ccoins,$(euroxyzdeps)) data/coins data/ccs data/extras eurocddeps := $(subst xyz,dcoins,$(euroxyzdeps)) data/coins euronddeps := $(subst xyz,dnotes,$(euroxyzdeps)) data/notes data/note-info eurotndeps := src/euro/index.tnotes.gsp src/euro/nav.dnotes.gsp data/notes -# Macro to get a countries demonym from their country code -demonym = $(shell awk '$$1 == toupper("$1") { print $$2 }' data/country-info) +# Macros to get data to pass to m4 +altnames = $(shell awk 'BEGIN { FS = "\t" } $$1 == toupper("$1") { print $$4 }' data/country-info) +demonym = $(shell awk 'BEGIN { FS = "\t" } $$1 == toupper("$1") { print $$2 }' data/country-info) +percentage = $(shell ./scripts/gen-stats $1) # Macros to handle dependencies for world pages wpath = $(if $(filter $2,o),\ @@ -65,7 +67,10 @@ 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,$*) \ + m4 -P -D__coins -D__code=$* \ + -D__demonym="$(call demonym,$*)" \ + -D__altnames="$(call altnames,$*)" \ + -D__percentage="$(call percentage,$*)" \ lib.m4 src/euro/index.ccoins.gsp | gsp >$@ $(eurocd): out/euro/%/index.html: $(eurocddeps) $(gspdeps) @@ -8,6 +8,7 @@ AD 2020 * * Female Suffrage Ibero-American Summit 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 AT 2005 X State Treaty AT 2007 X Treaty of Rome @@ -52,9 +53,8 @@ DE 2006 D X Schleswig-Holstein DE 2006 F X Schleswig-Holstein DE 2006 G X Schleswig-Holstein DE 2006 J X Schleswig-Holstein -DE 2007 A - X Mecklenburg-Vorpommern Treaty of Rome +DE 2007 A X X Mecklenburg-Vorpommern Treaty of Rome DE 2007 D X X Mecklenburg-Vorpommern Treaty of Rome -DE 2007 D @ Mecklenburg-Vorpommern DE 2007 F X X Mecklenburg-Vorpommern Treaty of Rome DE 2007 G X X Mecklenburg-Vorpommern Treaty of Rome DE 2007 J X X Mecklenburg-Vorpommern Treaty of Rome @@ -93,7 +93,6 @@ DE 2014 D X Niedersachsen DE 2014 F X Niedersachsen DE 2014 G X Niedersachsen DE 2014 J X Niedersachsen -DE 2015 A @ Hessen DE 2015 A X X X Hessen German Reunification EU Flag DE 2015 D X X X Hessen German Reunification EU Flag DE 2015 F X X X Hessen German Reunification EU Flag @@ -140,10 +139,10 @@ DE 2023 F X X Hamburg Karl der Große DE 2023 G X X Hamburg Karl der Große DE 2023 J X X Hamburg Karl der Große DE 2024 A X X Mecklenburg-Vorpommern Paulskirchenverfassung -DE 2024 D X - Mecklenburg-Vorpommern Paulskirchenverfassung -DE 2024 F X - Mecklenburg-Vorpommern Paulskirchenverfassung +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 - Mecklenburg-Vorpommern Paulskirchenverfassung +DE 2024 J X X Mecklenburg-Vorpommern Paulskirchenverfassung EE 2012 X Euro Cash EE 2015 X EU Flag @@ -153,7 +152,7 @@ EE 2018 X X Baltic States Estonian Independence 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 Estonian Literati Ukraine Erasmus Programme +EE 2022 X X X Estonian Literati Ukraine Erasmus Programme EE 2023 - Barn Swallow EE 2024 - The Cornflower @@ -169,12 +168,12 @@ ES 2015 X X Cave of Altamira EU Flag ES 2016 X Segovia Aqueduct ES 2017 - Asturias Churches ES 2018 X - Birthday of Felipe VI Satiago de Compostela -ES 2019 - Avilla +ES 2019 X Avilla ES 2020 X Architecture of Aragon ES 2021 X Toledo -ES 2022 - - - Circumnavigation Garajonay Erasmus Programme +ES 2022 X X X Circumnavigation Garajonay Erasmus Programme ES 2023 X - Cáceres EU Presidency -ES 2024 - - Cathedral of Sevilla National Police +ES 2024 X X Cathedral of Sevilla National Police FI 2004 X EU Enlargement FI 2005 X Finland in the UN @@ -194,7 +193,7 @@ FI 2018 X X Sauna Culture Koli Landscape FI 2019 X Constitution FI 2020 X X University of Turku Väinö Linna FI 2021 X X Journalism Åland Islands -FI 2022 X - X Ballet Climate Research Erasmus Programme +FI 2022 X X X Ballet Climate Research Erasmus Programme FI 2023 - - Nature Conservation Social & Health Services FI 2024 - - Democracy Gesellius, Lindgren, Saarinen @@ -215,7 +214,7 @@ 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 2024 * - Paris Olympics (Wrestling) Olympics & Paralympics GR 2004 X Olympic Games GR 2007 X Treaty of Rome @@ -223,21 +222,21 @@ GR 2009 X European Monetary Union GR 2010 X Battle of Marathon GR 2011 - Special Olympics GR 2012 X Euro Cash -GR 2013 - - Platonic Academy Crete +GR 2013 - 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 -GR 2017 - X Nikos Kazantzakis Philippi +GR 2017 X X Nikos Kazantzakis Philippi GR 2018 X X Dodecanese Union Kostis Palamas GR 2019 X X Manolis Andronicos Andreas Kalvos GR 2020 X X Battle of Thermopylae Thrace Union GR 2021 X Greek Revolution -GR 2022 X - Constitution Erasmus Programme -GR 2023 X - Maria Callas Constantin Carathéodory +GR 2022 X X Constitution Erasmus Programme +GR 2023 X X Maria Callas Constantin Carathéodory GR 2024 - - Penelope Delta Democracy HR 2023 * Introduction of the Euro -HR 2024 ? Varaždin +HR 2024 * Varaždin IE 2007 X Treaty of Rome IE 2009 X European Monetary Union @@ -273,7 +272,7 @@ IT 2024 - - Guarda di Finanza Rita Levi-Montalcini LT 2015 X X Lithuanian Language EU Flag LT 2016 X Baltic Culture LT 2017 X Vilnius -LT 2018 - X Baltic States Song & Dance Celebration +LT 2018 X X Baltic States Song & Dance Celebration LT 2019 - X Multipart Songs Žemaitija LT 2020 X X Hill of Crosses Aukštaitija LT 2021 X X Žuvintas Biosphere Reserve Dzūkija @@ -287,7 +286,7 @@ LU 2006 X Guillaume LU 2007 X X Palais Grand-Ducal Treaty of Rome LU 2008 - Château de Berg LU 2009 - X Accession of Charlotte European Monetary Union -LU 2010 - Grand Duke Henri +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 @@ -330,7 +329,7 @@ MC 2020 * Prince Honoré III MC 2021 * Royal Wedding MC 2022 * Prince Albert I MC 2023 * Prince Rainier III -MC 2024 ? Treaty with Charles V +MC 2024 * Treaty with Charles V MT 2009 X European Monetary Union MT 2011 X First Electives @@ -339,18 +338,14 @@ MT 2013 X Self-Government MT 2014 X - Independence Malta Police Force MT 2015 X X X First Flight Republic of Malta EU Flag MT 2016 X - Ġgantija Temples Love -MT 2016 MM O Ġgantija Temples MT 2017 X X Ħaġar Qim Temples The Peace -MT 2017 MM O O Ħaġar Qim Temples The Peace MT 2018 X - Mnajdra Temples Cultural Heritage MT 2019 X X Ta’ Ħaġrat Temples Nature & Environment -MT 2019 MM O Nature & Environment -MT 2019 F O Ta’ Ħaġrat Temples MT 2020 - X Skorba Temples Games 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 2024 * * Maltese Honeybee Ċittadella Gozo NL 2007 X Treaty of Rome NL 2009 X European Monetary Union @@ -359,7 +354,6 @@ NL 2012 X Euro Cash NL 2013 X X Bicentennial of the Kingdom Abdication of Beatrix NL 2014 X Accession of Willem-Alexander NL 2015 X EU Flag -NL 2019 €5 O Jaap Eden NL 2022 X Erasmus Programme PT 2007 X X EU Presidency Treaty of Rome @@ -372,21 +366,21 @@ PT 2013 - Oporto Clérigos Tower PT 2014 X - Family Farming Carnation Revolution PT 2015 - X X Timor Portuguese Red Cross EU Flag PT 2016 - X April Bridge Rio Olympics -PT 2017 X - Public Security Raul Brandão +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 2021 - - EU Presidency Tokyo Olympics +PT 2021 X - EU Presidency Tokyo Olympics PT 2022 - X Crossing of the South Atlantic Erasmus Programme -PT 2023 - - Peace World Youth Day +PT 2023 X X Peace World Youth Day PT 2024 - - 25th April Revolution Paris Olympic Games SI 2007 X Treaty of Rome -SI 2008 - Primož Trubar +SI 2008 X Primož Trubar SI 2009 X European Monetary Union -SI 2010 - Ljubljana Botanical Garden +SI 2010 X Ljubljana Botanical Garden SI 2011 X Franc Rozman-Stane -SI 2012 - Euro Cash +SI 2012 X Euro Cash SI 2013 X Postojna Cave SI 2014 X Barbara of Celje SI 2015 X X Emona-Ljubljana EU Flag @@ -409,11 +403,11 @@ SK 2015 X X Ľudovít Štúr EU Flag SK 2016 X EU Presidency SK 2017 X Universitas Istropolitana SK 2018 X Slovak Republic -SK 2019 - Milan Rastislav Štefánik -SK 2020 - OECD +SK 2019 X Milan Rastislav Štefánik +SK 2020 X OECD SK 2021 X Alexander Dubček -SK 2022 - - Steam Engine Erasmus Programme -SK 2023 - - Blood Transfusion Vienna-Bratislava Mail +SK 2022 X X Steam Engine Erasmus Programme +SK 2023 X X Blood Transfusion Vienna-Bratislava Mail SK 2024 - Košice Marathon SM 2004 * Borghesi @@ -1,4 +1,4 @@ -AD - - - - X - X - 2014 +XD - - - - X - X - 2014 AD * * * * * * * X 2015 AD * * * * * * X * 2016 AD X X X X X X - X 2017 @@ -13,7 +13,7 @@ AD ? ? ? ? ? ? ? ? 2024 AT X X X X X X X X 2002 AT X X X * X X - X 2003 AT X X X X X X X X 2004 -AT X X X X - X X / 2005 +AT X X X X X X X / 2005 AT X X X X X X X X 2006 AT X X X X X X X / 2007 AT X X X X X X X X 2008 @@ -32,7 +32,7 @@ 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 - - - - - - - - 2024 +AT X X X X X X - X 2024 BE start King Albert II (Series I) BE X * X X * X X * 1999 @@ -67,9 +67,9 @@ BE ? ? ? ? ? ? ? ? 2024 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 - X - - 2011 +CY X - X X - X - X 2011 CY X X - X X X - X 2012 -CY - - - - - - - - 2013 +CY - - - - - - - X 2013 CY - - - - - - - - 2014 CY X - - - - - - - 2015 CY X - - - - X - - 2016 @@ -89,17 +89,17 @@ DE X X X X X X X X 2002 G DE X X X X X X X X 2002 J DE * X * X X O X X 2003 A DE * X * X X X * X 2003 D -DE * X * X X * X X 2003 F +DE * X * X X O X X 2003 F DE * X * X X O * X 2003 G DE * X * X * X X X 2003 J 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 * 2004 G +DE X X X X * X X O 2004 G DE X X X * * * * X 2004 J DE X X X * X * * * 2005 A -DE X X X * X O * O 2005 D -DE X X X * X * * * 2005 F +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 * * * 2006 A @@ -114,7 +114,7 @@ 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 * * X 2008 F +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 DE X X X * X * * / 2009 A @@ -138,7 +138,7 @@ DE X X X * X * * / 2012 F DE X X X * X * * / 2012 G DE X X X @ X * * / 2012 J DE X X X * X * * / 2013 A -DE X X - * X * * / 2013 D +DE X X X * X * * / 2013 D DE X X X * X * * / 2013 F DE X X X * X * * / 2013 G DE X X X * X * * / 2013 J @@ -146,10 +146,10 @@ DE X X X * X * * X 2014 A DE X X X * X * * X 2014 D DE X X X * X * * X 2014 F DE X X X * X * * X 2014 G -DE X - X * X * * X 2014 J +DE X X X * X * * X 2014 J DE X X X * X * * / 2015 A DE X X X * X * * / 2015 D -DE X X X * X * * / 2015 F +DE X X X * X @ * / 2015 F DE X X X * X * * / 2015 G DE X X X * X * * / 2015 J DE X X X * X * * X 2016 A @@ -157,7 +157,7 @@ DE X X X * X * * X 2016 D DE X X X * X * * X 2016 F DE X X X * X * * X 2016 G DE X X X * X * * X 2016 J -DE X X - X X * * X 2017 A +DE X X X X X * * X 2017 A DE X X X X X * * X 2017 D DE X X X X X * * X 2017 F DE X X X X X * * X 2017 G @@ -167,12 +167,12 @@ DE X X X X X * * / 2018 D DE X X X X X * * / 2018 F DE X X X X X * * / 2018 G DE X X X X X * * / 2018 J -DE X - X X X * * X 2019 A +DE X X X X X * * X 2019 A DE X X X X X * * X 2019 D DE X X X X X * * X 2019 F DE X X X X X * * X 2019 G DE X X X X X * * X 2019 J -DE X - X X X * * X 2020 A +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 @@ -183,20 +183,20 @@ 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 * * 2022 D +DE * X X X X X * * 2022 D DE * X - X X X * * 2022 F -DE * X - - X X * * 2022 G +DE * X - X X X * * 2022 G DE * X X X X X * * 2022 J -DE - - - - - - * X 2023 A -DE - - X - X X * X 2023 D +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 2023 J +DE - X - X X X * X 2023 J DE - * - - - - * - 2024 A DE - * - - - - * - 2024 D DE - * - - - - * - 2024 F DE - * - - - - * - 2024 G -DE - * - - - - * - 2024 J +DE X * - - - X * X 2024 J EE X X X X X X X X 2011 EE X X / / / / / / 2012 @@ -205,7 +205,7 @@ EE / / / / / / / / 2014 EE - - / / / / / / 2015 EE * * * * * * * * 2016 EE X X X / X / / / 2017 -EE - X - - - X X X 2018 +EE - X - - X X X X 2018 EE - / / / / / / / 2019 EE / - / / X / / / 2020 EE / - / / - / / / 2021 @@ -224,42 +224,42 @@ ES X X X X X X X X 2005 ES X X X X X X X X 2006 ES X X X X X X X X 2007 ES X X X X X X X X 2008 -ES - X X X X X X X 2009 +ES X X X X X X X X 2009 ES start King Juan Carlos I (Series II) ES X X X X X X X X 2010 -ES X - X X X X X X 2011 +ES X X X X X X X X 2011 ES X X X X X X X X 2012 -ES X X - X X X X X 2013 -ES - - X X X X X X 2014 +ES X X X X X X X X 2013 +ES X X X X X X X X 2014 ES start King Felipe VI -ES X X X - X X X X 2015 +ES X X X X X X X X 2015 ES X X X X X X X X 2016 ES X X X X X X X X 2017 -ES X - X X X X X X 2018 +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 2021 -ES - - - - - - X X 2022 -ES - - - X - - X - 2023 -ES ? ? ? ? ? ? ? ? 2024 +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 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 2002 +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 2008 +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 2013 FI - - - - - - - X 2014 -FI - - - - - - X X 2015 +FI - - - - X - X X 2015 FI - - - - - - X - 2016 FI - - - - - - X X 2017 FI - - - - - - - X 2018 @@ -275,13 +275,13 @@ 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 * * * * 2003 +FR X X X X * * * * 2003 FR X X X - * O * @ 2004 FR X X X X * * * * 2005 -FR X X X X * * * O 2006 +FR X X X X * * O O 2006 FR X X X X X * * * 2007 FR X X X X X * * * 2008 -FR X - X X X * * * 2009 +FR X X X X X * * * 2009 FR X X X X X * * * 2010 FR X X X X X * * X 2011 FR X X X X * * * X 2012 @@ -290,23 +290,23 @@ FR X X X X X * * X 2014 FR X X X X X * * X 2015 FR X X X X * * * X 2016 FR X X X X X * * X 2017 -FR X - X X X X * X 2018 -FR X - X X X X * X 2019 -FR - - X X X X * X 2020 -FR X - X X X X * X 2021 +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 2021 FR start Series II -FR - - X - X X * X 2022 +FR X X X X X X * X 2022 FR - - - - - - * X 2023 -FR ? ? ? - - - ? ? 2024 +FR ? ? ? ? ? ? ? ? 2024 GR X X X X X X X X 2002 GR - - X X X X X X 2002 MM -GR X - - - - - X X 2003 +GR X - - - X X X X 2003 GR 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 2008 +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 @@ -325,7 +325,7 @@ GR - - - - - - - - 2023 GR - - - - - - - - 2024 HR X X X X X X X X 2023 -HR ? ? ? ? ? ? ? ? 2024 +HR - - - ? - ? ? ? 2024 IE X X X X X X X X 2002 IE X X X X X X - X 2003 @@ -340,22 +340,22 @@ IE 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 -IE - - X X X X X X 2015 -IE - - X X X - X X 2016 -IE - - X X - - - X 2017 -IE - - X X - - - X 2018 +IE * - X X X X X X 2015 +IE * * X X X - X X 2016 +IE * * X X - - - X 2017 +IE * * X X - - - X 2018 IE * * X X ? ? ? X 2019 -IE - - X X - - - X 2020 +IE - * X X - - - X 2020 IE ? ? X X ? ? ? ? 2021 IE ? ? ? ? ? ? ? ? 2022 IE ? ? ? ? ? ? ? ? 2023 IE ? ? ? ? ? ? ? ? 2024 IT X X X X X X X X 2002 -IT X - - X X X X X 2003 -IT X X - X - X X X 2004 +IT X - X X X X X X 2003 +IT X X - X X X X X 2004 IT X X X X X X X X 2005 -IT X X X X - X X X 2006 +IT X X X X X X X X 2006 IT X X X X X X X X 2007 IT X X X X X X X X 2008 IT X X X X X X X X 2009 @@ -363,28 +363,28 @@ IT X X X X X X X X 2010 IT X X X X X X X X 2011 IT X X X X X X X X 2012 IT X X X X X X X X 2013 -IT X X X X - X X X 2014 -IT X X X X - X X X 2015 -IT X X X - X X X X 2016 -IT X X X X X - X X 2017 +IT X X X X X X X X 2014 +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 2020 IT * * X X X X X X 2021 -IT * * X - X X - X 2022 -IT * * - - - X - X 2023 -IT ? ? ? ? ? ? ? ? 2024 +IT * * X X X X - X 2022 +IT * * X - X X X X 2023 +IT * * - - - - - - 2024 LT X X X X X X X X 2015 LT - / / / / / / / 2016 -LT X X / X - / / X 2017 +LT X X / X X / / X 2017 LT * * * * * * * * 2018 LT * * * * * * * * 2019 LT * * * * * * * X 2020 LT * * - - * * * X 2021 LT * * X * * * * * 2022 LT * * - - * * * * 2023 -LT ? ? ? ? ? ? ? ? 2024 +LT * * - * * * * - 2024 LU X X X X X X X X 2002 LU X X X X X X X X 2003 @@ -406,7 +406,7 @@ LU - - X X X - X - 2018 LU - - - - - - - X 2019 LU - - X X - - - - 2020 LU - - X - X - - - 2021 -LU - - X X X - - - 2022 +LU - - X X X X - - 2022 LU X X X X X X - X 2023 KNM LU / / / X X / / X 2023 MdP LU - - - - - - - - 2024 @@ -416,11 +416,11 @@ LV * * * * * * * * 2015 LV * * * * * * X * 2016 LV / / / / / / / / 2017 LV * * * * * * * * 2018 -LV * * - * * * * * 2019 +LV * * X * * * * * 2019 LV * * * * * * * * 2020 LV * * * * * * * * 2021 LV * * * * * * * * 2022 -LV * * - * * * * ? 2023 +LV / / - / / / / / 2023 LV * * * * * * * * 2024 MC start Prince Rainier III @@ -432,7 +432,6 @@ MC * * * / / / / / 2005 MC start Prince Albert II MC * * * * * * * * 2006 MC / / / / / / - / 2007 -MC / / / / / / X / 2007 No MM MC / / / / / / / / 2008 MC * * * * * * * X 2009 MC / / / / / / / * 2010 @@ -441,15 +440,15 @@ MC / / / / / / / X 2012 MC * * * * * * * * 2013 MC * * * * * * X X 2014 MC / / / / / / / X 2015 -MC / / / / / / - X 2016 +MC / / / / / / X X 2016 MC * * * * * * * X 2017 MC / / / / / / X X 2018 -MC / / / / / / - X 2019 -MC * * * * * * X X 2020 +MC / / / / / / X X 2019 +MC * * * * * * - X 2020 MC * * * * * * X X 2021 MC / / / / / / X X 2022 MC / / / / / / - - 2023 -MC ? ? ? ? ? ? ? ? 2024 +MC / / / / / / - - 2024 MT X X X X X X X X 2008 MT / / / / / / / / 2009 @@ -471,28 +470,26 @@ MT ? ? ? ? ? ? ? ? 2024 NL start Queen Beatrix NL X X X X X X X X 1999 -NL / / / / / @ / / 1999 NL X X X X X X X X 2000 NL X X X X X X X X 2001 NL - X - - X X X X 2002 NL X X - X X X X X 2003 NL X X O O X O O O 2004 -NL * O X O * O * O 2005 +NL * O X O O O * O 2005 NL * * X * O O * O 2006 -NL / / / / / / / @ 2006 NL * O X * O * * O 2007 NL * O X * * O * O 2008 NL * * X * * O * O 2009 NL * * X * * O * O 2010 NL * * X * * O * O 2011 NL * * X * * * * O 2012 -NL X * X * * * * O 2013 +NL X * X * * * O O 2013 NL start King Willem-Alexander NL * * X X X X X X 2014 NL * O X * * O O O 2015 NL O * X * X * O * 2016 NL * * X X * * * * 2017 -NL * * X X X * * * 2018 +NL * * X X X O * * 2018 NL * * X X * * * * 2019 NL * * X * * * * * 2020 NL * * * * * * * * 2021 @@ -504,13 +501,13 @@ 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 2006 +PT X - X X X X X X 2006 PT X X X * * * X * 2007 PT X X X X X X X * 2008 PT X X X X X X X * 2009 -PT X X - * X X X * 2010 -PT X X - * - * X * 2011 -PT X X X * * * * * 2012 +PT X X X * X X X * 2010 +PT X X X * X * X * 2011 +PT X X X * * O * * 2012 PT * * * * * * * * 2013 PT X X * * * * X * 2014 PT X X * * X X X * 2015 @@ -522,7 +519,7 @@ PT X * X * X * X * 2020 PT * * X X X X * * 2021 PT * * * * * * * * 2022 PT - ? X ? ? ? ? X 2023 -PT ? ? ? ? ? ? ? ? 2024 +PT ? ? - - - ? ? ? 2024 SI X X X X X X X X 2007 SI * * * * * * * O 2008 @@ -539,26 +536,26 @@ SI X X * X * * * * 2018 SI X X X X X * * * 2019 SI X X * * * * * X 2020 SI X X X * * X * * 2021 -SI - - - X X * * X 2022 -SI - - - - X * * - 2023 +SI X X X X X * * X 2022 +SI - X - - X * * X 2023 SI - - - - - - * - 2024 SK X X X X X X X X 2009 -SK X X * * * * * * 2010 +SK X X * * * * * O 2010 SK X X * * * * * X 2011 SK X * * * * * * * 2012 SK X * * * * * * * 2013 SK X X * * * * * * 2014 SK X X * * * * * X 2015 -SK X - * * * * * X 2016 +SK X X * * * * * X 2016 SK X X X * * * * X 2017 -SK X X - * * * * * 2018 +SK X X X * * * * * 2018 SK X X X X * * * * 2019 SK X X X X * * * X 2020 -SK - - - X * * X * 2021 -SK * * - X * * * X 2022 -SK * * - - * * * - 2023 -SK * * - - * * - - 2024 +SK X X X X * * X * 2021 +SK * * X X * * * X 2022 +SK * * - - * * * * 2023 +SK * * - - * * - X 2024 SM start Series I SM * * * * X X - - 2002 @@ -578,7 +575,7 @@ SM * * * * - X X * 2015 SM * * * * - * * X 2016 SM start Series II SM * * * * X * - - 2017 -SM * * * * - X - * 2018 +SM * * * * - X X * 2018 SM * * * * * - - - 2019 SM * * * * * X X X 2020 SM * * * * - - - X 2021 @@ -614,4 +611,4 @@ VA * * * * * X * * 2020 VA * * * * * X * * 2021 VA * * * * * X * * 2022 VA * * * * * - * * 2023 -VA ? ? ? ? ? ? ? ? 2024 +VA * * * * * - * * 2024 diff --git a/data/country-info b/data/country-info index 74449f3..1b5d033 100644 --- a/data/country-info +++ b/data/country-info @@ -1,31 +1,31 @@ AD Andorran Andorra -AT Austrian Austria -BE Belgian Belgium -BG Bulgarian Bulgaria -CY Cypriot Cyprus -DE German Germany -DE-R German Germany -DE-W German Germany -DE-X German Germany -EE Estonian Estonia -ES Spanish Spain -FI Finnish Finland +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 FR French France FR-E French France FR-U French France -GR Greek Greece -HR Croatian Croatia -IE Irish Ireland -IT Italian Italy -LT Lithuanian Lithuania -LU Luxembourgish Luxembourg -LV Latvian Latvia +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 MC Monégasque Monaco MT Maltese Malta -NL Dutch Netherlands +NL Dutch Netherlands Nederland PT Portuguese Portugal -SI Slovene Slovenia -SK Slovak Slovakia +SI Slovene Slovenia Slovenija +SK Slovak Slovakia Slovensko SM Sammarinese San Marino US American United States of America -VA Vatican Vatican City +VA Vatican Vatican City Città del Vaticano diff --git a/data/errors b/data/errors deleted file mode 100644 index 1f286ab..0000000 --- a/data/errors +++ /dev/null @@ -1,2 +0,0 @@ -FI 1999 €2.00 @span style="color: black; font-variant: diagonal-fractions" {-1/3} ‘9’s filled -FI 1999 €2.00 @span style="color: black; font-variant: diagonal-fractions" {-2/3} ‘9’s filled diff --git a/data/extras b/data/extras new file mode 100644 index 0000000..76fa02d --- /dev/null +++ b/data/extras @@ -0,0 +1,14 @@ +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 +FI 1999 €2.00 X @span style="color: black; font-variant: diagonal-fractions" {-1/3} ‘9’s filled +FI 1999 €2.00 X @span style="color: black; font-variant: diagonal-fractions" {-2/3} ‘9’s filled +MC 2007 €1.00 X 2,991 Mintage No-Mintmark Variety +MT 2016 €2.00 O ‘Ġgantija Temples’ with NIFC Mintmark +MT 2017 €2.00 O ‘Ħaġar Qim Temples’ with NIFC Mintmark +MT 2017 €2.00 O ‘The Peace’ with NIFC Mintmark +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 @@ -18,7 +18,7 @@ 5 Europa FR-E / X 5 Europa FR-U X X 5 Europa DE-W X / -5 Europa GR X - +5 Europa GR X X 5 Europa IE X / 5 Europa IT X / 5 Europa PT X X @@ -27,12 +27,12 @@ 10 2002 AT X X / 10 2002 BE - / / 10 2002 FI - / / -10 2002 FR - X / +10 2002 FR X X / 10 2002 DE X X X 10 2002 GR X X - 10 2002 IE X X X 10 2002 IT - - / -10 2002 NL - - / +10 2002 NL - X / 10 2002 PT - - / 10 2002 ES - / / 10 Europa AT X X @@ -42,7 +42,7 @@ 10 Europa DE-R / X 10 Europa DE-W X X 10 Europa DE-X X / -10 Europa GR X - +10 Europa GR X X 10 Europa IE X / 10 Europa IT X / 10 Europa NL X / @@ -53,19 +53,19 @@ 20 2002 BE - / / 20 2002 CY / - - 20 2002 EE / / X -20 2002 FI - X - +20 2002 FI X X X 20 2002 FR X X - -20 2002 DE - X - +20 2002 DE X X - 20 2002 GR - X - 20 2002 IE X - / -20 2002 IT - X - +20 2002 IT - X X 20 2002 MT / - - 20 2002 NL X - X 20 2002 PT - X X 20 2002 SK / - X 20 2002 SI / - - 20 2002 ES - - / -20 Europa AT X - +20 Europa AT X X 20 Europa BE X / 20 Europa BG / X 20 Europa FR-E X X @@ -82,7 +82,7 @@ 50 2002 BE - X X 50 2002 CY / / - 50 2002 EE / / - -50 2002 FI - / X +50 2002 FI X / X 50 2002 FR - / / 50 2002 DE X X X 50 2002 GR X / / @@ -106,9 +106,9 @@ 50 Europa PT X / 50 Europa ES X X -100 2002 AT X - X +100 2002 AT X X X 100 2002 BE - / / -100 2002 FI - - / +100 2002 FI X - / 100 2002 FR X / / 100 2002 DE X X X 100 2002 GR - / / @@ -131,7 +131,7 @@ 200 2002 FR - / / 200 2002 DE X X X 200 2002 GR - / / -200 2002 IT - / / +200 2002 IT X / / 200 2002 NL - / / 200 2002 ES - / / 200 Europa AT X X @@ -139,7 +139,7 @@ 200 Europa FR-U X / 200 Europa IT X / -500 2002 AT - - X +500 2002 AT X - X 500 2002 BE - / / 500 2002 FI - / / 500 2002 FR - / / @@ -152,9 +152,9 @@ TN 5 ZA********** / **** / Jean-Claude Trichet * TN 20 NZ********** / **** / Mario Draghi X -TN 20 S**999****** / S004 / Mario Draghi - -TN 20 VH********** / **** / Mario Draghi - +TN 20 S**999****** / S004 / Mario Draghi X +TN 20 VH********** / **** / Mario Draghi X TN 20 XZ********** / **** / Mario Draghi X -TN 50 VH********** / **** / Mario Draghi - +TN 50 VH********** / **** / Mario Draghi X TN 100 NZ********** / **** / Mario Draghi X TN 200 NZ********** / **** / Mario Draghi X diff --git a/data/world/bqs.us b/data/world/bqs.us index eb7af7d..d713dae 100644 --- a/data/world/bqs.us +++ b/data/world/bqs.us @@ -33,7 +33,7 @@ 2016 X X * / Theodore Roosevelt 2016 - X * / Fort Moultrie 2016 X X * / Harpers Ferry -2017 - X * / Frederick Douglas +2017 X X * / Frederick Douglas 2017 X X * / Effigy Mounds 2017 - X * / George Rogers Clark 2017 X X * / Ozark Riverways diff --git a/data/world/ids.us b/data/world/ids.us index dcb850e..2cc5396 100644 --- a/data/world/ids.us +++ b/data/world/ids.us @@ -19,3 +19,7 @@ 2023 * * * Louisiana 2023 * * * Indiana 2023 * * * Mississippi +2024 * * * Alabama +2024 * * * Illinois +2024 * * * Maine +2024 * * * Missouri diff --git a/data/world/nds.us b/data/world/nds.us index d597eef..cbaa657 100644 --- a/data/world/nds.us +++ b/data/world/nds.us @@ -13,3 +13,4 @@ 2021 * * * / US Military 2022 * * * / Ely Samuel Parker 2023 * * * / Ballet +2024 * * * / Indian Citizenship Act diff --git a/data/world/olympic.bra b/data/world/olympic.bra index 9ccc945..f886953 100644 --- a/data/world/olympic.bra +++ b/data/world/olympic.bra @@ -8,10 +8,10 @@ 2015 X Paracanoe 2015 X Rugby 2015 X Football -2015 - Volleyball +2015 X Volleyball 2015 - Paralympic Athletics 2015 - Judo 2016 - Boxing 2016 - Paralympic Swimming -2016 - Olympic Mascot -2016 - Paralympic Mascot +2016 X Olympic Mascot +2016 X Paralympic Mascot diff --git a/data/world/wqs.us b/data/world/wqs.us index 22f7926..9f0e68e 100644 --- a/data/world/wqs.us +++ b/data/world/wqs.us @@ -8,3 +8,8 @@ 2023 - - * Eleanor Roosevelt 2023 - - * Jovita Idar 2023 - - * Maria Tallchief +2024 - - * Celia Cruz +2024 - - * Dr. Mary Edwards Walker +2024 - - * Patsy Takemoto Mink +2024 - - * Rev. Dr. Pauli Murray +2024 - - * Zitkala-Ša diff --git a/data/world/xxx.bra b/data/world/xxx.bra index 6ac8ade..31f5beb 100644 --- a/data/world/xxx.bra +++ b/data/world/xxx.bra @@ -2,4 +2,4 @@ 2002 X Juscelino Kubitschek 2005 X 40 Years of the Central Bank 2015 X 50 Years of the Central Bank -2019 - 25 Years of the Real +2019 X 25 Years of the Real @@ -4,6 +4,12 @@ m4_changequote([,]) m4_dnl Output ‘$2’ if the country code matches ‘$1’ m4_define(__ifcode, [m4_ifelse(__code, [$1], [$2])]) +m4_dnl Output ‘$1’ if the country with code ‘__code’ has extra coins +m4_define(__ifextra, [ + m4_syscmd(grep -iq '^__code' data/extras) + m4_ifelse(m4_sysval, 0, [$1]) +]) + m4_dnl Execute the script ‘$1’ in the ‘scripts/’ directory m4_define(__esyscmd, [m4_esyscmd([scripts/$1])]) diff --git a/scripts/gen-ecoin b/scripts/gen-ecoin index 9d39205..190725a 100755 --- a/scripts/gen-ecoin +++ b/scripts/gen-ecoin @@ -1,12 +1,20 @@ #!/bin/sh gawk -v CC=$1 ' +@include "scripts/getcls.awk" + BEGIN { FS = "\t" CC = toupper(CC) } $1 == CC { - printf "tr {td{-%s} td{-%s} td .have colspan=\"5\" {-%s}}", $2, $3, $4 + if (split($2, a, " ") == 1) { + printf "tr {td{-%s} td{-%s} td .%s colspan=\"5\" {-%s}}", \ + $2, $3, getcls($4), $5 + } else { + printf "tr {td{-%s @sup{-%s}} td{-%s} td .%s colspan=\"5\" {-%s}}", \ + a[1], a[2], $3, getcls($4), $5 + } } -' data/errors +' data/extras diff --git a/scripts/gen-stats b/scripts/gen-stats new file mode 100755 index 0000000..46148d4 --- /dev/null +++ b/scripts/gen-stats @@ -0,0 +1,34 @@ +#!/bin/sh + +gawk -v CC=$1 ' +@include "scripts/getcls.awk" + +function hndl(x) { + if (x == "/") + return + if (x ~ /[XO@]/) + have++ + cnt++ +} + +BEGIN { + CC = toupper(CC) +} + +FILENAME == "data/coins" && $1 == CC && $2 != "start" { + split($0, xs) + for (i = 2; i < length(xs); i++) + hndl(xs[i]) +} + +FILENAME == "data/ccs" && $1 == CC { + gsub(/([A-Z]{2} [0-9]{4}( [A-Za-z]+)?|\t.*)/, " ") + split($0, xs) + for (i = 1; i <= length(xs); i++) + hndl(xs[i]) +} + +END { + printf "%d/%d (%d%%)\n", have, cnt, have / cnt * 100 +} +' data/coins data/ccs diff --git a/src/changelog/index.gsp b/src/changelog/index.gsp index f3f0dcd..6056064 100644 --- a/src/changelog/index.gsp +++ b/src/changelog/index.gsp @@ -22,6 +22,261 @@ html lang="en" { } } + __entry([31-07-2024], [ + p {- + Keeping with the momentum of the past few days I decided to + have another go at the €1 denomination. For the most part + the 20 rolls were very boring, but one of them got me a + German coin from 2008 with the ‘F’ mintmark. Not only is it + a new NIFC for my collection, but it marks the 8@sup{-th} + mintmark I’ve found this week! + } + p {- + Also as if to make it even better, the coin deposit machines + had €5.24 euros lying in the return trays. That’s almost + enough money to cover the costs of withdrawing all the rolls + I hunted through. + } + ]) + + __entry([30-07-2024], [ + p {- + I did a quick €1 coin hunt today. Usually this is a rather + dull denomination to hunt, but this time that was definitely + not the case. I managed to grab myself 4 new dates (with 3 + of them being NIFCs!). The finds were: France 2006 (NIFC), + Germany 2005 D (NIFC), Monaco 2016, and Netherlands 2013 + (NIFC). + } + p {- + @strong{-UPDATE:} + So it’s later in the day and I decided to get some more coin + rolls and hunt some €2- and 50c coins. It’s a really good + thing I did because I got 4 new finds. These are Germany €2 + 2024 J, Greece 50c 2003, Italy 50c 2017, and the best find + of the entire day… Portugal 50c 2012 (NIFC!). I am super + happy to have found that Portuguese NIFC, they are certainly + one of the most rare NIFCs to find! + } + ]) + + __entry([29-07-2024], [ + p {- + Today I met up with The_Fighter from the Euro-Coins discord + server! We had a nice time in the Hague and he got me 3 new + German coins. Those coins were 2024-J 1c, and the + ‘Paulskirchenverfassung’ commemorative coin with mintmarks D + and J. With these new additions I have now fully completed + the German commemorative mintmarks for the first time! + } + ]) + + __entry([25-07-2024], [ + p {- + Quick update for yesterday. I went to the coin deposit + machine to deposit the leftovers of my previous hunts, and + decided to do a quick €2 hunt while the coins were + depositing (the deposit machine is very slow). During this + hunt I found some great doubles, and I also found €2 Germany + 2005 F, an NIFC that is new for my collection! + } + ]) + + __entry([23-07-2024], [ + p {- + Today I had an absolute monster of a hunt. I hunted through + 20 rolls of 50c coins and this resulted in a monster result + of 2 NIFCs, 1 Proof-NIFC, and two new dates. These finds + are as follows: + + @ul { + li {= Germany 2003 F (NIFC)} + li {= Germany 2015 F (Proof; NIFC)} + li {= Germany 2024 J} + li {= Netherlands 2018 (NIFC; 15,000 mintage)} + li {= Luxembourg 2022 (50,000 mintage)} + } + } + + p {- + On top of this, I got a new American quarter (Frederick + Douglas; Denver) which someone had left at the coin deposit + machine. + } + ]) + + __entry([18-07-2024], [ + p {- + From the 13@sup{-th} to the 14@sup{-th} of this month the + second ‘official’ Eurocoins meetup took place in Madrid. + The first meetup occured in Frankfurt and the related + changelog entry is @a href="#02-10-2023" {-here}. Just like + that meetup, this meetup was great and saw a lot of new + additions to my collection! I spent most of my time in + Madrid just doing general tourism as opposed to active + hunting, but despite that my collection got a huge boost as + you’ll see in this changelog entry. + } + + p {- + After the Madrid meetup my collection grew by 114 coins (88 + standard issues, 26 commemorative issues) and 16 banknotes! + Additionally this included 3 new NIFC coins and 3 testnotes. + With these new additions I also now have completed my + collection of testnotes with the exception of the + exceptionally rare €5 NIFC note. + } + + p {- + There is a lot of stuff to go through so I will be breaking + them down by denomination. The new coins and banknotes + added to my collection are as follows: + + @ul { + li {= + €0.01 + @ul { + li {-Austria 2024} + li {-France 2020, 2022} + li {-Germany 2023 D} + li {-Greece 2008} + li {-Slovakia 2021} + li {-Slovenia 2022} + li {-Spain 2009, 2014, 2021, 2022, 2023, 2024} + } + } + li {= + €0.02 + @ul { + li {-Austria 2024} + li {-France 2003, 2009, 2018, 2019, 2021, 2022} + li {-Germany 2014 J, 2019 A, 2020 A} + li {-Slovakia 2016, 2021} + li {-Slovenia 2022, 2023} + li {-Spain 2011, 2014, 2018, 2021, 2022, 2023} + } + } + li {= + €0.05 + @ul { + li {-Austria 2024} + li {-Germany 2013 D, 2017 A, 2022 D} + li {-Italy 2003, 2023} + li {-Latvia 2019} + li {-Portugal 2010, 2011} + li {-Slovakia 2018, 2021, 2022} + li {-Slovenia 2022} + li {-Spain 2013, 2022, 2023} + } + } + li {= + €0.10 + @ul { + li {-Austria 2024} + li {-France 2022} + li {-Germany 2022 D, 2022 G} + li {-Italy 2016, 2022} + li {-Portugal 2006} + li {-Spain 2015, 2022, 2024} + } + } + li {= + €0.20 + @ul { + li {-Austria 2005, 2024} + li {-Estonia 2018} + li {-Finland 2015} + li {-Greece 2003} + li {-Italy 2004, 2006, 2014, 2015, 2023} + li {-Lithuania 2017} + li {-Netherlands 2005 (NIFC)} + li {-Portugal 2011} + li {-Spain 2022, 2023} + } + } + li {= + €0.50 + @ul { + li {-Austria 2024} + li {-Germany 2023 A} + li {-Spain 2021} + } + } + li {= + €1.00 + @ul { + li {-Finland 2008} + li {-Italy 2023} + li {-San Marino 2018} + } + } + li {= + €2.00 Standard + @ul { + li {-Austria 2024} + li {-Cyprus 2011, 2013} + li {-Germany 2004 G (NIFC)} + li {-Slovakia 2010 (NIFC), 2024} + li {-Slovenia 2023} + li {-Spain 2023} + } + } + li {= + €2.00 Commemoratives + @ul { + li {-Estonia 2022 ‘Ukraine’} + li {-Finland 2022 ‘Climate Research’} + li {-Germany 2007 A ‘Mecklenburg-Vorpommern’} + li {-Germany 2024 D ‘Paulskirchenverfassung’} + li {-Greece 2013 ‘Crete’} + li {-Greece 2017 ‘Nikos Kazantzakis’} + li {-Greece 2022 ‘Erasmus Programme’} + li {-Greece 2023 ‘Constantin Carathéodory’} + li {-Portugal 2021 ‘EU Presidency’} + li {-Portugal 2023 ‘Peace’} + li {-Portugal 2023 ‘World Youth Day’} + li {-Slovakia 2019 ‘Milan Rastislav Štefánik’} + li {-Slovakia 2020 ‘OECD’} + li {-Slovakia 2022 ‘Erasmus Programme’} + li {-Slovakia 2022 ‘Steam Engine’} + li {-Slovakia 2023 ‘Blood Transfusion’} + li {-Slovakia 2023 ‘Vienna-Bratislava Mail’} + li {-Slovenia 2008 ‘Primož Trubar’} + li {-Slovenia 2010 ‘Ljubljana Botanical Garden’} + li {-Slovenia 2012 ‘Euro Cash’} + li {-Spain 2019 ‘Avilla’} + li {-Spain 2022 ‘Circumnavigation’} + li {-Spain 2022 ‘Erasmus Programme’} + li {-Spain 2022 ‘Garajonay’} + li {-Spain 2024 ‘Cathedral of Sevilla’} + li {-Spain 2024 ‘National Police’} + } + } + li {= + Banknotes + @ul { + li {-€5 Europa (Greece; Lagarde)} + li {-€10 2002 (France; Duisenberg)} + li {-€10 2002 (Netherlands; Trichet)} + li {-€10 Europa (Greece; Lagarde)} + li {-€20 2002 (Finland; Duisenberg)} + li {-€20 2002 (Finland; Draghi)} + li {-€20 2002 (Germany; Duisenberg)} + li {-€20 2002 (Italy; Draghi)} + li {-€20 Testnote (S**999****** / S004)} + li {-€20 Testnote (VH********** / ****)} + li {-€50 2002 (Finland; Duisenberg)} + li {-€50 Testnote (VH********** / ****)} + li {-€100 2002 (Austria; Trichet)} + li {-€100 2002 (Finland; Duisenberg)} + li {-€200 2002 (Italy; Duisenberg)} + li {-€500 (Austria; Duisenberg)} + } + } + } + } + ]) + __entry([04-07-2024], [ p {- I got some mail again today, this time from Eurosthetics diff --git a/src/euro/index.ccoins.gsp b/src/euro/index.ccoins.gsp index 18b5ef4..ae16426 100644 --- a/src/euro/index.ccoins.gsp +++ b/src/euro/index.ccoins.gsp @@ -16,6 +16,10 @@ html lang="en" { section { header { h1 {-__demonym Euro Coins} + h3 { + span {-__altnames} + span {-__percentage} + } } } @@ -65,41 +69,6 @@ html lang="en" { } ]) - __ifcode([mc], [ - section .blurb { - p {- - In 2007 Monaco released two varieties of their €1 coin. One of - them has mintmarks around the year while the other one doesn’t. - The variety without the mintmarks is suffixed with ‘No MM’. - } - } - ]) - - __ifcode([mt], [ - section .blurb { - p {- - Many Maltese commemoratives have different mintmarks depending on - if they were intended for circulation, coincards, or sets. Any - years listed on this page suffixed with ‘MM’ bear a mintmark - representing an NIFC release. Typically this is seen as either two - mintmarks around the year, or an ‘F’ in one of the outer stars. - Some years have multiple NIFC varieties — one with an ‘F’ and one - with regular mintmarks — these are labeled with ‘F’ and ‘MM’ - respectively. - } - } - ]) - - __ifcode([nl], [ - section .blurb { - p {- - Besides just the standard €2 commemorative releases, the Koninklijke - Nederlandse Munt (Royal Dutch Mint) also sells NIFC €5 - commemorative coins; these coins are suffixed with ‘€5’. - } - } - ]) - section .cl-section .slant-down { div { table .coin-table cellspacing="0" { @@ -152,7 +121,7 @@ html lang="en" { } } - __ifcode([fi], [ + __ifextra([ section .cl-section .slant-down { div { table @@ -163,7 +132,7 @@ html lang="en" { { thead { tr { - th colspan="7" {-Error Coins} + th colspan="7" {-Extra Coins} } tr { th {-Year} diff --git a/src/euro/index.gsp b/src/euro/index.gsp index c970e51..4501d60 100644 --- a/src/euro/index.gsp +++ b/src/euro/index.gsp @@ -15,17 +15,6 @@ html lang="en" { } } - section { - p {- - There are various examples of euro coins that have slight varieties - between their standard circulation releases and their coincard/set - releases, such as different mintmarks. In these cases, the NIFC - variety will @strong{-not} be listed on this site @em{-unless} I - happen to get one for my collection (see @a href="mt" {-Malta} for an - example). The same applies to error coins. - } - } - section .cl-section .slant-up { div { h2 {-Euro Coins} diff --git a/src/style.css b/src/style.css index e2e5f20..6d00b54 100644 --- a/src/style.css +++ b/src/style.css @@ -113,9 +113,13 @@ nav { width: 100%; } + +a:link, a:visited { + color: inherit; +} + nav a:link, nav a:visited { text-decoration: inherit; - color: inherit; } nav ul { @@ -222,6 +226,16 @@ header h1 { margin-bottom: 0; } +header h3 { + margin-top: 0; + display: flex; + justify-content: space-between; +} + +header p { + color: lightgrey; +} + @media only screen and (min-width: 1000px) { header h1 { font-size: 2.5rem; |