Update lots of shit

12 files changed, 379 insertions, 16 deletions

diff --git a/Makefile b/Makefile
index 611a214..13e5828 100644
--- a/Makefile
+++ b/Makefile
@@ -10,9 +10,9 @@ ezcodes := $(shell \
 
 # Source files that aren’t dynamically generated
 sources := \
-	$(shell find src -type f -name 'index.gsp') \
-	$(shell find src -type f -name '*.css')     \
-	$(shell find src -type f -name '*.svg')     \
+	$(shell find src -type f -name 'index.gsp') $(copysrc) \
+	$(shell find src -type f -name '*.css') \
+	$(shell find src -type f -name '*.svg') \
 	$(shell find src -type f -name '*.woff2')
 
 # Different euro coin and -banknote page types
@@ -43,11 +43,21 @@ 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 handle dependencies for world pages
+wpath = $(if $(filter $2,o),\
+	out/world/$(if $(filter $2,c),coins,notes)/$1/index.html,\
+	src/world/$(if $(filter $2,c),coins,notes)/$1/index.gsp\
+)
+wout = $(foreach x,$1,$(call wpath,$x,o $2))
+_wdeps = $(wildcard data/world/*.$(if $(filter $1,br),bra,$1))
+wdeps = $(call wpath,$1,$2) $(call _wdeps,$1) $(gspdeps)
+
 all: $(outdirs) $(outputs)
 
 $(outdirs)&:
 	mkdir -p $(outdirs)
 
+$(call wout,ez): $(call wdeps,ez)
 out/%.html: src/%.gsp $(gspdeps)
 	m4 -P lib.m4 $< | gsp >$@
 
@@ -55,24 +65,23 @@ $(eurocc): out/euro/%/index.html: $(gspdeps) $(euroccdeps)
 	m4 -P -D__coins -D__code=$* -D__demonym=$(call demonym,$*) \
 		lib.m4 src/euro/index.ccoins.gsp | gsp >$@
 
-$(eurocd): out/euro/%/index.html: $(gspdeps) $(eurocddeps)
-	m4 -P -D__coins -D__denom=$* lib.m4 src/euro/index.dcoins.gsp | gsp >$@
-
-$(eurond): out/euro/%/index.html: $(gspdeps) $(euronddeps)
-	m4 -P -D__notes -D__denom=$* lib.m4 src/euro/index.dnotes.gsp | gsp >$@
+$(eurocd): $(eurocddeps) $(gspdeps)
+$(eurond): $(euronddeps) $(gspdeps)
+$(eurocd) $(eurond): out/euro/%/index.html:
+	m4 -P -D__notes -D__denom=$* lib.m4 $< | gsp >$@
 
-$(euront): out/euro/%/index.html: $(gspdeps) $(eurotndeps)
-	m4 -P -D__notes lib.m4 src/euro/index.tnotes.gsp | gsp >$@
+$(euront): out/euro/%/index.html: $(eurotndeps) $(gspdeps)
+	m4 -P -D__notes lib.m4 $< | gsp >$@
 
-out/world/coins/br/index.html: src/world/coins/br/index.gsp $(gspdeps)
-	m4 -P -D__coins lib.m4 src/world/coins/br/index.gsp | gsp >$@
+$(call wout,br,c): $(call wdeps,br,c)
+$(call wout,us,c): $(call wdeps,us,c)
+$(call wout,br us,c):
+	m4 -P -D__coins lib.m4 $< | gsp >$@
 
 out/%.css: src/%.css
 	cp $< $@
-
 out/%.svg: src/%.svg
 	cp $< $@
-
 out/%.woff2: src/%.woff2
 	cp $< $@
 
diff --git a/data/world/bcs.us b/data/world/bcs.us
new file mode 100644
index 0000000..16cd181
--- /dev/null
+++ b/data/world/bcs.us
@@ -0,0 +1,3 @@
+1976	X X *	Drummer Boy (25¢)
+1976	X X *	Independence Hall (50¢)
+1976	X X *	Liberty Bell ($1)
diff --git a/data/world/bqs.us b/data/world/bqs.us
new file mode 100644
index 0000000..eb7af7d
--- /dev/null
+++ b/data/world/bqs.us
@@ -0,0 +1,56 @@
+2010	- - * /	Hot Springs
+2010	- - * /	Grand Canyon
+2010	- - * /	Yosemite
+2010	- - * /	Mount Hood
+2010	- X * /	Yellowstone
+2011	- - * /	Vicksburg
+2011	- - * /	Glacier
+2011	- X * /	Chickasaw
+2011	- - * /	Gettysburg
+2011	- - * /	Olympic
+2012	X X * /	Denali
+2012	- - * /	Hawai‘i Volcanoes
+2012	X - * /	Acadia
+2012	- - * /	Chaco Culture
+2012	- - * /	El Yunque
+2013	- - * /	Fort McHenry
+2013	- X * /	White Mountain
+2013	- X * /	Great Basin
+2013	- X * /	Perry’s Victory
+2013	- X * /	Mount Rushmore
+2014	X X * /	Great Sand Dunes
+2014	- - * /	Everglades
+2014	- - * /	Great Smoky Mountains
+2014	X X * /	Arches
+2014	X - * /	Shenandoah
+2015	- X * /	Bombay Hook
+2015	X X * /	Kisatchie
+2015	X X * /	Blue Ridge Parkway
+2015	X X * /	Homestead
+2015	X X * /	Saratoga
+2016	- X * /	Shawnee
+2016	- X * /	Cumberland Gap
+2016	X X * /	Theodore Roosevelt
+2016	- X * /	Fort Moultrie
+2016	X X * /	Harpers Ferry
+2017	- X * /	Frederick Douglas
+2017	X X * /	Effigy Mounds
+2017	- X * /	George Rogers Clark
+2017	X X * /	Ozark Riverways
+2017	X X * /	Ellis Island
+2018	- X * /	Cumberland Island
+2018	- X * /	Pictured Rocks
+2018	X X * /	Voyageurs
+2018	X X * /	Block Island
+2018	X X * /	Apostle Islands
+2019	- X * -	War in the Pacific
+2019	- X * -	River of No Return
+2019	- X * -	Lowell
+2019	- X * -	American Memorial Park
+2019	X X * -	San Antonio Missions
+2020	- X * -	National Park
+2020	- X * -	Weir Farm
+2020	- - * -	Tallgrass Prairie
+2020	X X * -	Salt River Bay
+2020	X X * -	Marsh-Billings-Rockefeller
+2021	X X * /	Tuskegee Airmen
diff --git a/data/world/ids.us b/data/world/ids.us
new file mode 100644
index 0000000..dcb850e
--- /dev/null
+++ b/data/world/ids.us
@@ -0,0 +1,21 @@
+2018	* * *	Introduction
+2019	* * *	Delaware
+2019	* * *	Pennsylvania
+2019	* * *	New Jersey
+2019	* * *	Georgia
+2020	* * *	Connecticut
+2020	* * *	Massachusetts
+2020	* * *	Maryland
+2020	* * *	South Carolina
+2021	* * *	New Hampshire
+2021	* * *	Virginia
+2021	* * *	North Carolina
+2021	* * *	New York
+2022	* * *	Rhode Island
+2022	* * *	Kentucky
+2022	* * *	Vermont
+2022	* * *	Tennessee
+2023	* * *	Ohio
+2023	* * *	Louisiana
+2023	* * *	Indiana
+2023	* * *	Mississippi
diff --git a/data/world/lps.us b/data/world/lps.us
new file mode 100644
index 0000000..b03e6bf
--- /dev/null
+++ b/data/world/lps.us
@@ -0,0 +1,4 @@
+2009	X X *	Birth and Early Childhood
+2009	X X *	Formative Years
+2009	- X *	Professional Life
+2009	- - *	Presidency
diff --git a/data/world/nds.us b/data/world/nds.us
new file mode 100644
index 0000000..d597eef
--- /dev/null
+++ b/data/world/nds.us
@@ -0,0 +1,15 @@
+2009	X X * /	Agriculture
+2010	X X * /	Great Law of Peace
+2011	X X * /	Wampanoag Treaty
+2012	* * * /	Trade Routes
+2013	* * * /	Treaty with the Delawares
+2014	* * * /	Lewis & Clark Expedition
+2015	* * * *	Mohawk Ironworkers
+2016	* * * /	WWI & WWII Code Talkers
+2017	* O * /	Sequoyah
+2018	* * * /	Jim Thorpe
+2019	O * * /	Space Program
+2020	* * * /	Elizabeth Peratrovich
+2021	* * * /	US Military
+2022	* * * /	Ely Samuel Parker
+2023	* * * /	Ballet
diff --git a/data/world/sqs.us b/data/world/sqs.us
new file mode 100644
index 0000000..49fd9f6
--- /dev/null
+++ b/data/world/sqs.us
@@ -0,0 +1,50 @@
+1999	X X *	Connecticut
+1999	X X *	Delaware
+1999	X - *	Georgia
+1999	X X *	New Jersey
+1999	X X *	Pennsylvania
+2000	X X *	Massachusetts
+2000	X X *	Maryland
+2000	X X *	New Hampshire
+2000	X X *	South Carolina
+2000	X X *	Virginia
+2001	X - *	Kentucky
+2001	- X *	North Carolina
+2001	X X *	New York
+2001	X X *	Rhode Island
+2001	X X *	Vermont
+2002	- X *	Indiana
+2002	X X *	Louisiana
+2002	X X *	Mississippi
+2002	X - *	Ohio
+2002	- X *	Tennessee
+2003	- - *	Alabama
+2003	X - *	Arkansas
+2003	- - *	Illinois
+2003	X X *	Maine
+2003	X - *	Missouri
+2004	- X *	Florida
+2004	- - *	Iowa
+2004	X X *	Michigan
+2004	X - *	Texas
+2004	- - *	Wisconsin
+2005	- - *	California
+2005	- X *	Kansas
+2005	- X *	Minnesota
+2005	- X *	Oregon
+2005	X - *	West Virginia
+2006	- X *	Colorado
+2006	- - *	North Dakota
+2006	- X *	Nebraska
+2006	- X *	Nevada
+2006	- X *	South Dakota
+2007	- X *	Idaho
+2007	X X *	Montana
+2007	- X *	Utah
+2007	X X *	Washington
+2007	- X *	Wyoming
+2008	- - *	Alaska
+2008	X - *	Arizona
+2008	X - *	Hawaii
+2008	- X *	New Mexico
+2008	- - *	Oklahoma
diff --git a/data/world/tqs.us b/data/world/tqs.us
new file mode 100644
index 0000000..ecdd60e
--- /dev/null
+++ b/data/world/tqs.us
@@ -0,0 +1,6 @@
+2009	X - *	American Samoa
+2009	- - *	District of Columbia
+2009	- - *	Guam
+2009	- - *	Northern Mariana Islands
+2009	X X *	Puerto Rico
+2009	- - *	Virgin Islands
diff --git a/data/world/wns.us b/data/world/wns.us
new file mode 100644
index 0000000..81e2cb1
--- /dev/null
+++ b/data/world/wns.us
@@ -0,0 +1,4 @@
+2004	- X *	Louisiana Purchase
+2004	- - *	Keelboat
+2005	X X *	Bison
+2005	- X *	Ocean View
diff --git a/data/world/wqs.us b/data/world/wqs.us
new file mode 100644
index 0000000..22f7926
--- /dev/null
+++ b/data/world/wqs.us
@@ -0,0 +1,10 @@
+2022	- X *	Anna May Wong
+2022	X X *	Maya Angelou
+2022	- X *	Nina Otero-Warren
+2022	X X *	Sally Ride
+2022	- X *	Wilma Mankiller
+2023	- X *	Bessie Coleman
+2023	- X *	Edith Kanaka‘ole
+2023	- - *	Eleanor Roosevelt
+2023	- - *	Jovita Idar
+2023	- - *	Maria Tallchief
diff --git a/scripts/gen-pres b/scripts/gen-america
index 6106b99..bc7bd95 100755
--- a/scripts/gen-pres
+++ b/scripts/gen-america
@@ -15,6 +15,9 @@ function getsup(i,    s)
 	case 3:
 		s = "S"
 		break
+	case 4:
+		s = "W"
+		break
 	}
 
 	return "@sup{-" s "}"
@@ -35,5 +38,5 @@ BEGIN {
 END {
 	print "__MARKER__"
 }
-' data/world/pds.us \
+' data/world/$1.us \
 | scripts/last-of-design.sed
diff --git a/src/world/coins/us/index.gsp b/src/world/coins/us/index.gsp
index 68cda5d..ef5a612 100644
--- a/src/world/coins/us/index.gsp
+++ b/src/world/coins/us/index.gsp
@@ -28,6 +28,168 @@ html lang="en" {
 					table .coin-table cellspacing="0" {
 						thead {
 							tr {
+								th colspan="5" {-Bicentennial Commemoratives}
+							}
+							tr {
+								th colspan="2" {-Topic}
+								th colspan="1" {-Denver}
+								th colspan="1" {-Philadelphia}
+								th colspan="1" {-San Francisco}
+							}
+						}
+
+						tbody { __esyscmd(gen-america bcs) }
+					}
+				}
+			}
+
+			section .cl-section .slant-down {
+				div {
+					table .coin-table cellspacing="0" {
+						thead {
+							tr {
+								th colspan="5" {-Lincoln Pennies}
+							}
+							tr {
+								th colspan="2" {-Topic}
+								th colspan="1" {-Denver}
+								th colspan="1" {-Philadelphia}
+								th colspan="1" {-San Francisco}
+							}
+						}
+
+						tbody { __esyscmd(gen-america lps) }
+					}
+				}
+			}
+
+			section .cl-section .slant-down {
+				div {
+					table .coin-table cellspacing="0" {
+						thead {
+							tr {
+								th colspan="5" {-Westward Journey Nickels}
+							}
+							tr {
+								th colspan="2" {-Topic}
+								th colspan="1" {-Denver}
+								th colspan="1" {-Philadelphia}
+								th colspan="1" {-San Francisco}
+							}
+						}
+
+						tbody { __esyscmd(gen-america wns) }
+					}
+				}
+			}
+
+			section .cl-section .slant-down {
+				div {
+					table .coin-table cellspacing="0" {
+						thead {
+							tr {
+								th colspan="5" {-State Quarters}
+							}
+							tr {
+								th colspan="2" {-State}
+								th colspan="1" {-Denver}
+								th colspan="1" {-Philadelphia}
+								th colspan="1" {-San Francisco}
+							}
+						}
+
+						tbody { __esyscmd(gen-america sqs) }
+					}
+				}
+			}
+
+			section .cl-section .slant-down {
+				div {
+					table .coin-table cellspacing="0" {
+						thead {
+							tr {
+								th colspan="5" {-D.C.- & Territory Quarters}
+							}
+							tr {
+								th colspan="2" {-Territory}
+								th colspan="1" {-Denver}
+								th colspan="1" {-Philadelphia}
+								th colspan="1" {-San Francisco}
+							}
+						}
+
+						tbody { __esyscmd(gen-america tqs) }
+					}
+				}
+			}
+
+			section .cl-section .slant-down {
+				div {
+					table .coin-table cellspacing="0" {
+						thead {
+							tr {
+								th colspan="6" {-America The Beautiful Quarters}
+							}
+							tr {
+								th colspan="2" {-Topic}
+								th colspan="1" {-Denver}
+								th colspan="1" {-Philadelphia}
+								th colspan="1" {-San Francisco}
+								th colspan="1" {-West Point}
+							}
+						}
+
+						tbody { __esyscmd(gen-america bqs) }
+					}
+				}
+			}
+
+			section .cl-section .slant-down {
+				div {
+					table .coin-table cellspacing="0" {
+						thead {
+							tr {
+								th colspan="5" {-Women Quarters}
+							}
+							tr {
+								th colspan="2" {-Woman}
+								th colspan="1" {-Denver}
+								th colspan="1" {-Philadelphia}
+								th colspan="1" {-San Francisco}
+							}
+						}
+
+						tbody { __esyscmd(gen-america wqs) }
+					}
+				}
+			}
+
+			section .cl-section .slant-down {
+				div {
+					table .coin-table cellspacing="0" {
+						thead {
+							tr {
+								th colspan="6" {-Native American Dollars}
+							}
+							tr {
+								th colspan="2" {-Topic}
+								th colspan="1" {-Denver}
+								th colspan="1" {-Philadelphia}
+								th colspan="1" {-San Francisco}
+								th colspan="1" {-West Point}
+							}
+						}
+
+						tbody { __esyscmd(gen-america nds) }
+					}
+				}
+			}
+
+			section .cl-section .slant-down {
+				div {
+					table .coin-table cellspacing="0" {
+						thead {
+							tr {
 								th colspan="5" {-Presidential Dollars}
 							}
 							tr {
@@ -38,7 +200,27 @@ html lang="en" {
 							}
 						}
 
-						tbody { __esyscmd(gen-pres) }
+						tbody { __esyscmd(gen-america pds) }
+					}
+				}
+			}
+
+			section .cl-section .slant-down {
+				div {
+					table .coin-table cellspacing="0" {
+						thead {
+							tr {
+								th colspan="5" {-Innovation Dollars}
+							}
+							tr {
+								th colspan="2" {-State}
+								th colspan="1" {-Denver}
+								th colspan="1" {-Philadelphia}
+								th colspan="1" {-San Francisco}
+							}
+						}
+
+						tbody { __esyscmd(gen-america ids) }
 					}
 				}
 			}