commit - cbe9506ccba945b561430b5fb0c961304d0cc85c
commit + 3ed0a3494ce12b9df823e3427f620ffa54563163
blob - 0313180beb1a2c1fe0cc84a36892757ef52df2dd
blob + 4c6e8d07d17abe9e8d4868c55a7b493418fed6c0
--- Makefile
+++ Makefile
@@ -18,15 +18,14 @@ WL = ${W}.wordlist
 TARGETS = ${DW}.pdf ${DW}.fb.a4 ${DW}.body.a4
 TOCLEAN = ${TARGETS} ${DW}.fb.pdf ${DW}.body.pdf
 
-all: title.pdf dw
+all: title.pdf dw dw_eff
 dw: ${TARGETS}
 
-.for W in beale eff dys2p
+.for W in beale eff german dys2p
 dw = dw_${W}
 .PHONY: ${dw}
 ${dw}:
 	${MAKE} W=${W} dw
-all: ${dw}
 TOCLEAN :+= ${dw}.pdf ${dw}.fb.a4 ${dw}.body.a4 ${dw}.fb.pdf ${dw}.body.pdf
 .endfor
 
@@ -40,7 +39,7 @@ ${DW}.fb.pdf: ${DW}.pdf
 ${DW}.body.pdf: ${DW}.pdf
 	psselect 5-76 ${DW}.pdf ${DW}.body.pdf
 
-${DW}.pdf: difficulty.eps ${WL}
+${DW}.pdf: dw.troff ${WL} difficulty.eps
 	W=${W} troff -mpictures dw.troff | dpost | ps2pdf - $@
 
 
blob - 816e89f7cef55abed0ad604193880f2c23e950f9
blob + 74bdd3d82879432d7d411872e3022a7ebf9d7b84
--- README
+++ README
@@ -25,10 +25,8 @@ dw.body.a4
 	Body of dw.pdf on A4 sheets, for duplex printing.
 	PDF format (never mind the extension).
 
-dw_beale.*
 dw_eff.*
-dw_dys2p.*
-	Same as above using other word lists (see below).
+	Same as above using the EFF word list (see below).
 
 title.pdf
 	A title page for Reinhold's original word list PDF.
@@ -41,6 +39,8 @@ title.pdf
 
 WORD LISTS
 
+Arbitrary other word lists can be used by building with 'make W=name'.
+
 diceware.wordlist   Original word list by Arnold Reinhold
 beale.wordlist      Alternative word list by Alan Beale
 eff.wordlist        EFF word list (five-dice version)
blob - f3522c768049c498462bf6156118273b93c11417
blob + f389bf724ffcf81b7bab9d70523e1acb15362387
--- dw.troff
+++ dw.troff
@@ -19,7 +19,7 @@
 .ie '\VW'' diceware.com
 .el .ie '\VW'beale' Beale
 .el .ie '\VW'eff' EFF
-.el .ie '\VW'de-7776' de-7776
+.el .ie '\VW'dys2p' dys2p
 .el
 .ft
 .sp 3p
@@ -132,7 +132,7 @@ Based on Diceware by Arnold Reinhold, \fBdiceware.com\
 .feature R +zero			\" slashed zero, just for CC0
 .ie '\VW'beale' Alternative word list by Alan Beale.
 .el .ie '\VW'eff' EFF word list (five-dice version).
-.el .ie '\VW'de-7776' Mnemonic German word list by dys2p, CC0.
+.el .ie '\VW'dys2p' Mnemonic German word list by dys2p, CC0.
 .el User-provided word list.\}
 [\fM\*(WL\fP]
 .nf