From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Wed, 27 May 2009 22:57:54 +0000 (+0100)
Subject: Merge branch 'keyboard'
X-Git-Tag: 1.0~8
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=commitdiff_plain;h=bd2af4a72e41bdec3f416ac7cbcce93d66d74815

Merge branch 'keyboard'
---

bd2af4a72e41bdec3f416ac7cbcce93d66d74815
diff --cc yoweb-scrape
index 40cdad5,d2d194c..d42f427
--- a/yoweb-scrape
+++ b/yoweb-scrape
@@@ -332,17 -348,10 +348,10 @@@ class CrewInfo(SomethingSoupInfo)
  #---------- pretty-printer for tables of pirate puzzle standings ----------
  
  class StandingsTable:
 -	def __init__(self, use_puzzles=None, col_width=6):
 +	def __init__(self, use_puzzles=None, col_width=6, gap_every=5):
  		if use_puzzles is None:
  			if opts.ship_duty:
- 				use_puzzles=[
- 					'Navigating','Battle Navigation',
- 					'Gunning',
- 					['Sailing','Rigging'],
- 					'Bilging',
- 					'Carpentry',
- 					'Treasure Haul'
- 				]
+ 				use_puzzles=duty_puzzles
  			else:
  				use_puzzles=puzzles
  		self._puzzles = use_puzzles