Add more stuff

9 files changed, 159 insertions, 3 deletions

diff --git a/data/world/fao.bra b/data/world/fao.bra
new file mode 100644
index 0000000..56e80e2
--- /dev/null
+++ b/data/world/fao.bra
@@ -0,0 +1,2 @@
+1995	-	Seedling
+1995	-	Farmer Working
diff --git a/data/world/pds.us b/data/world/pds.us
new file mode 100644
index 0000000..756555a
--- /dev/null
+++ b/data/world/pds.us
@@ -0,0 +1,40 @@
+2007	X X *	George Washington
+2007	X X *	John Adams
+2007	X X *	Thomas Jefferson
+2007	X X *	James Madison
+2008	X X *	James Monroe
+2008	X X *	John Quincy Adams
+2008	X X *	Andrew Jackson
+2008	X X *	Martin van Buren
+2009	X X *	William Henry Harrison
+2009	X X *	John Tyler
+2009	X X *	James K. Polk
+2009	X X *	Zachary Taylor
+2010	X X *	Millard Fillmore
+2010	X X *	Franklin Pierce
+2010	X X *	James Buchanan
+2010	X X *	Abraham Lincoln
+2011	X X *	Andrew Johnson
+2011	X X *	Ulysses S. Grant
+2011	X X *	Rutherford B. Hayes
+2011	X X *	James Garfield
+2012	* O *	Chester Arthur
+2012	* * *	Grover Cleveland (1st Term)
+2012	* * *	Benjamin Harrison
+2012	* * *	Grover Cleveland (2nd Term)
+2013	* * *	William McKinley
+2013	* * *	Theodore Roosevelt
+2013	* * *	William Howard Taft
+2013	* * *	Woodrow Wilson
+2014	* * *	Warren G. Harding
+2014	* * *	Calvin Coolidge
+2014	* O *	Herbert Hoover
+2014	* * *	Franklin D. Roosevelt
+2015	* * *	Harry S. Truman
+2015	* * *	Dwight D. Eisenhower
+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
diff --git a/data/world/xxx.bra b/data/world/xxx.bra
new file mode 100644
index 0000000..6ac8ade
--- /dev/null
+++ b/data/world/xxx.bra
@@ -0,0 +1,5 @@
+1998	-	Human Rights
+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
diff --git a/scripts/gen-pres b/scripts/gen-pres
new file mode 100755
index 0000000..a1e7cb1
--- /dev/null
+++ b/scripts/gen-pres
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+gawk '
+@include "scripts/getcls.awk"
+
+BEGIN {
+	FS = "\t"
+}
+
+{
+	printf "trX { td .missing colspan=\"1\" {-%s}", $1
+	split($2, a, / /)
+	for (i = 1; i <= length(a); i++)
+		printf "td .%s colspan=\"2\" {-%s}", getcls(a[i]), $3
+	print "}"
+}
+
+END {
+	print "__MARKER__"
+}
+' data/world/pds.us \
+| scripts/last-of-design.sed
diff --git a/scripts/gen-olympic-reais b/scripts/gen-reais
index 3efd8b2..53d0387 100755
--- a/scripts/gen-olympic-reais
+++ b/scripts/gen-reais
@@ -15,5 +15,5 @@ BEGIN {
 END {
 	print "__MARKER__"
 }
-' data/world/olympic.bra \
+' data/world/$1.bra \
 | scripts/last-of-design.sed
diff --git a/src/world/coins/br/index.gsp b/src/world/coins/br/index.gsp
index 8d7f672..0045ff3 100644
--- a/src/world/coins/br/index.gsp
+++ b/src/world/coins/br/index.gsp
@@ -28,7 +28,7 @@ html lang="en" {
 					table .coin-table cellspacing="0" {
 						thead {
 							tr {
-								th colspan="7" {-R$1 Olympic Reais}
+								th colspan="7" {-Food & Agriculture Organization Reais}
 							}
 							tr {
 								th colspan="1" {-Year}
@@ -36,7 +36,43 @@ html lang="en" {
 							}
 						}
 
-						tbody { __esyscmd(gen-olympic-reais) }
+						tbody { __esyscmd(gen-reais fao) }
+					}
+				}
+			}
+
+			section .cl-section .slant-down {
+				div {
+					table .coin-table cellspacing="0" {
+						thead {
+							tr {
+								th colspan="7" {-R$1 Olympic Commemoratives}
+							}
+							tr {
+								th colspan="1" {-Year}
+								th colspan="6" {-Topic}
+							}
+						}
+
+						tbody { __esyscmd(gen-reais olympic) }
+					}
+				}
+			}
+
+			section .cl-section .slant-down {
+				div {
+					table .coin-table cellspacing="0" {
+						thead {
+							tr {
+								th colspan="7" {-Other R$1 Commemoratives}
+							}
+							tr {
+								th colspan="1" {-Year}
+								th colspan="6" {-Topic}
+							}
+						}
+
+						tbody { __esyscmd(gen-reais xxx) }
 					}
 				}
 			}
diff --git a/src/world/coins/us/index.gsp b/src/world/coins/us/index.gsp
new file mode 100644
index 0000000..eb8d6dd
--- /dev/null
+++ b/src/world/coins/us/index.gsp
@@ -0,0 +1,49 @@
+html lang="en" {
+	head {
+		__include(head.gsp)
+		title {-American Coins}
+	}
+
+	body {
+		nav {
+			__include(nav.gsp)
+			__include(world/nav.coins.gsp)
+		}
+
+		main {
+			section {
+				header {
+					h1 {-American Coins}
+				}
+			}
+
+			br{}br{}
+
+			section { __include(table-key.gsp) }
+
+			br{}br{}
+
+			section .cl-section .slant-down {
+				div {
+					table .coin-table cellspacing="0" {
+						thead {
+							tr {
+								th colspan="7" {-Presidential Dollars}
+							}
+							tr {
+								th colspan="1" {-Year}
+								th colspan="2" {-Denver}
+								th colspan="2" {-Philadelphia}
+								th colspan="2" {-San Francisco}
+							}
+						}
+
+						tbody { __esyscmd(gen-pres) }
+					}
+				}
+			}
+
+			section { __include(foot.gsp) }
+		}
+	}
+}
diff --git a/src/world/index.gsp b/src/world/index.gsp
index 26dcb4b..7591e7f 100644
--- a/src/world/index.gsp
+++ b/src/world/index.gsp
@@ -23,6 +23,7 @@ html lang="en" {
 						tbody {
 							tr {
 								td {a href="coins/br" {-Brazil}}
+								td {a href="coins/us" {-United States of America}}
 							}
 						}
 					}
diff --git a/src/world/nav.coins.gsp b/src/world/nav.coins.gsp
index eb552c9..ac4fa1c 100644
--- a/src/world/nav.coins.gsp
+++ b/src/world/nav.coins.gsp
@@ -1,3 +1,4 @@
 ul {
 	li {__link([/world/coins/br], [BR])}
+	li {__link([/world/coins/us], [US])}
 }