3 files changed, 28 insertions, 44 deletions

diff --git a/src/euro/index.ccoins.gsp b/src/euro/index.ccoins.gsp
index 18b5ef4..07c764f 100644
--- a/src/euro/index.ccoins.gsp
+++ b/src/euro/index.ccoins.gsp
@@ -15,7 +15,10 @@ html lang="en" {
 		main {
 			section {
 				header {
-					h1 {-__demonym Euro Coins}
+					h1 {=
+						__name
+						__tr(__altnames)
+					}
 				}
 			}
 
@@ -40,7 +43,7 @@ html lang="en" {
 					p {-
 						As a result of a late joining to the Eurozone, Greece was assisted
 						by the countries of France, Spain, and Finland to mint coins for
-						2002.  For this reason all 2002 coins have two varieties — one with
+						2002.  For this reason all 2002 coins have two varieties – one with
 						a mintmark in the star (‘F’, ‘E’, and ‘S’) and one without.
 					}
 				}
@@ -65,43 +68,14 @@ 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 {
+					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 {
@@ -136,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 {
@@ -152,7 +132,7 @@ html lang="en" {
 				}
 			}
 
-			__ifcode([fi], [
+			__ifextra([
 				section .cl-section .slant-down {
 					div {
 						table
@@ -163,7 +143,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..70f35ce 100644
--- a/src/euro/index.gsp
+++ b/src/euro/index.gsp
@@ -36,36 +36,39 @@ html lang="en" {
 								td {a href="ad" {-Andorra}}
 								td {a href="at" {-Austria}}
 								td {a href="be" {-Belgium}}
-								td {a href="hr" {-Croatia}}
+								td {a href="bg" {-Bulgaria}}
 							}
 							tr {
+								td {a href="hr" {-Croatia}}
 								td {a href="cy" {-Cyprus}}
 								td {a href="ee" {-Estonia}}
 								td {a href="fi" {-Finland}}
-								td {a href="fr" {-France}}
 							}
 							tr {
+								td {a href="fr" {-France}}
 								td {a href="de" {-Germany}}
 								td {a href="gr" {-Greece}}
 								td {a href="ie" {-Ireland}}
-								td {a href="it" {-Italy}}
 							}
 							tr {
+								td {a href="it" {-Italy}}
 								td {a href="lv" {-Latvia}}
 								td {a href="lt" {-Lithuania}}
 								td {a href="lu" {-Luxembourg}}
-								td {a href="mt" {-Malta}}
 							}
 							tr {
+								td {a href="mt" {-Malta}}
 								td {a href="mc" {-Monaco}}
 								td {a href="nl" {-Netherlands}}
 								td {a href="pt" {-Portugal}}
-								td {a href="sm" {-San Marino}}
 							}
 							tr {
+								td {a href="sm" {-San Marino}}
 								td {a href="sk" {-Slovakia}}
 								td {a href="si" {-Slovenia}}
 								td {a href="es" {-Spain}}
+							}
+							tr {
 								td {a href="va" {-Vatican City}}
 							}
 						}
diff --git a/src/euro/nav.ccoins.gsp b/src/euro/nav.ccoins.gsp
index 376f9e2..45062ef 100644
--- a/src/euro/nav.ccoins.gsp
+++ b/src/euro/nav.ccoins.gsp
@@ -2,6 +2,7 @@ ul {
 	li {__link([/euro/ad], [AD])}
 	li {__link([/euro/at], [AT])}
 	li {__link([/euro/be], [BE])}
+	li {__link([/euro/bg], [BG])}
 	li {__link([/euro/cy], [CY])}
 	li {__link([/euro/de], [DE])}
 	li {__link([/euro/ee], [EE])}