Make presidential dollars page better

2 files changed, 24 insertions, 7 deletions

diff --git a/scripts/gen-pres b/scripts/gen-pres
index a1e7cb1..fbe1b5d 100755
--- a/scripts/gen-pres
+++ b/scripts/gen-pres
@@ -3,15 +3,32 @@
 gawk '
 @include "scripts/getcls.awk"
 
+function getsup(i,    s)
+{
+	switch (i) {
+	case 1:
+		s = "D"
+		break
+	case 2:
+		s = "P"
+		break
+	case 3:
+		s = "S"
+		break
+	}
+
+	return "@sup{-" s "}"
+}
+
 BEGIN {
 	FS = "\t"
 }
 
 {
-	printf "trX { td .missing colspan=\"1\" {-%s}", $1
+	printf "trX { td .missing colspan=\"2\" {-%s}", $3
 	split($2, a, / /)
 	for (i = 1; i <= length(a); i++)
-		printf "td .%s colspan=\"2\" {-%s}", getcls(a[i]), $3
+		printf "td .%s colspan=\"1\" {-%s%s}", getcls(a[i]), $1, getsup(i)
 	print "}"
 }
 
diff --git a/src/world/coins/us/index.gsp b/src/world/coins/us/index.gsp
index eb8d6dd..68cda5d 100644
--- a/src/world/coins/us/index.gsp
+++ b/src/world/coins/us/index.gsp
@@ -28,13 +28,13 @@ html lang="en" {
 					table .coin-table cellspacing="0" {
 						thead {
 							tr {
-								th colspan="7" {-Presidential Dollars}
+								th colspan="5" {-Presidential Dollars}
 							}
 							tr {
-								th colspan="1" {-Year}
-								th colspan="2" {-Denver}
-								th colspan="2" {-Philadelphia}
-								th colspan="2" {-San Francisco}
+								th colspan="2" {-President}
+								th colspan="1" {-Denver}
+								th colspan="1" {-Philadelphia}
+								th colspan="1" {-San Francisco}
 							}
 						}