diff options
| -rw-r--r-- | GNUmakefile | 2 | ||||
| -rw-r--r-- | data/ccs | 5 | ||||
| -rw-r--r-- | data/coins | 1 | ||||
| -rw-r--r-- | data/errors | 2 | ||||
| -rw-r--r-- | data/extras | 14 | ||||
| -rw-r--r-- | lib.m4 | 8 | ||||
| -rwxr-xr-x | scripts/gen-ecoin | 6 | ||||
| -rw-r--r-- | src/euro/index.ccoins.gsp | 39 |
8 files changed, 29 insertions, 48 deletions
diff --git a/GNUmakefile b/GNUmakefile index 31ff619..b1cdd28 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -38,7 +38,7 @@ 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 @@ -338,13 +338,9 @@ 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 @@ -358,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 @@ -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 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..7aa13d9 --- /dev/null +++ b/data/extras @@ -0,0 +1,14 @@ +DE 2007 D €2.00 @ ‘Mecklenburg-Vorpommern’ Circulated Proof +DE 2012 J €2.00 X @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" {=‘Euro Cash’ with ‘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 @@ -4,6 +4,14 @@ m4_changequote([,]) m4_dnl Output ‘$2’ if the country code matches ‘$1’ m4_define(__ifcode, [m4_ifelse(__code, [$1], [$2])]) +m4_define(__ifextra, [ + m4_syscmd(grep -iq '^__code' data/extras) + m4_ifelse(m4_sysval, 0, [$1]) +]) + +m4_dnl Expand ‘$3’ if ‘$1’ is a substring of ‘$2’ +m4_define(__ifhas, [m4_ifelse(m4_index([$2], [$1]), -1, [], [$3])]) + 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..18512b8 100755 --- a/scripts/gen-ecoin +++ b/scripts/gen-ecoin @@ -1,12 +1,14 @@ #!/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 + printf "tr {td{-%s} td{-%s} td .%s colspan=\"5\" {-%s}}", $2, $3, getcls($4), $5 } -' data/errors +' data/extras diff --git a/src/euro/index.ccoins.gsp b/src/euro/index.ccoins.gsp index 3e0bbe3..a8dcc00 100644 --- a/src/euro/index.ccoins.gsp +++ b/src/euro/index.ccoins.gsp @@ -66,41 +66,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" { @@ -153,7 +118,7 @@ html lang="en" { } } - __ifcode([fi], [ + __ifextra([ section .cl-section .slant-down { div { table @@ -164,7 +129,7 @@ html lang="en" { { thead { tr { - th colspan="7" {-Error Coins} + th colspan="7" {-Extra Coins} } tr { th {-Year} |