Expo Leaders page

scripts/make-folklist.py

@@ -25,7 +25,7 @@ yearnow = date.today().year
 slug_cache = {}
 def troggle_slugify(longname):
     """Uniqueness enforcement too. Yes we have had two "Dave Johnson"s
-    This function copied instact from troggle/parsers/people/py
+    This function copied intact from troggle/parsers/people/py
     """
     slug = longname.strip().lower().replace(" ","-")
     slug = re.sub(r'\([^\)]*\)','',slug) # remove nickname in brackets
@@ -129,7 +129,7 @@ def collapse(m):
 
 #output = re.sub(r'(<td></td>)+',collapse, output)
 
-lastyear=1976+1+len([t for t in headcounts_byyear if t > 0]) # no expo in 1986 or 2020
+lastyear=1976+2+len([t for t in headcounts_byyear if t > 0]) # no expo in 1986 or 2020 or 2021
 
 # moved to main.css
 #<style type="text/css">
@@ -181,7 +181,10 @@ face icon indicates a link to a mugshot (and brief notes) in our
 Rogues' Gallery. Two of the members listed are inanimate objects - no prizes for
 guessing which without looking at the photos :-)</p>
 
-<p>The table doesn't include the local cavers who have caved with us at various
+<p>Leaders: while there was there was little or no role for a leader on the earlier expeditions, 
+in recent decades we have formalised this: <a href="leaders.html">Expo Leaders through the years</a>
+
+<p>The table below does not include the local cavers who have caved with us at various
 times. These include particularly Karl Gaisberger
 <a href="i/karl_gaisberger.jpg"><img alt=":-)" src="i/mug.png" /></a>,
 Gunter Graf, Arndt Karger, Sepp
@@ -191,16 +194,16 @@ src="i/mug.png" /></a>.</p>
 
 y2 = lastyear-2
 y1 = lastyear-1
-print("""
-<p>Links to recent expos: <a href="http://expo.survex.com/expedition/%s">previous expo</a>. There was no expo in 1986, 2020 or 2021.  
+print(f"""
+<p>Links to recent expos: <a href="http://expo.survex.com/expedition/{y1}">previous expo</a>. There was no expo in 1986, 2020 or 2021.  
 <hr /><table class="fancy">
-""" % y1)
+""")
 
 print(output)
 
 print("<tr><td colspan=4><strong>Expo head count</strong></td>", end=' ')
 for y in headcounts_byyear:
-    print('<td style="text-align: right">%d</td>' % y, end=' ')
+    print(f'<td style="text-align: right">{y}</td>', end=' ')
 
 print("""
 <td></td></tr>