data.base formatting

Give all the attribution lines more indentation than a single tab so
that they never line up exactly the same as the text which precedes them.

Combine some attribution lines that had been split across two or three
lines but could reasonably fit on one or two.

Include a second boomerang quote from Pratchett--currently commented out
since the first boomerang quote is also from him.

dat/data.base

@@ -222,8 +222,7 @@ apelike creature
 	he thought of it.  Yes.  Apes should be strong.  Apes should
 	be masters.  Apes should be proud.  Apes should make the
 	Earth shake when they walked.  Apes should _rule_ the Earth.
-		[ Battle for the Planet of the Apes,
+	  [ Battle for the Planet of the Apes, by David Gerrold ]
-			by David Gerrold ]
 apple
 	NEWTONIAN, adj.  Pertaining to a philosophy of the universe
 	invented by Newton, who discovered that an apple will fall
@@ -278,8 +277,7 @@ arioch
 	I found the arrow still unbroke;
 	And the song, from beginning to end,
 	I found again in the heart of a friend.
-		[ The Arrow and the Song,
+	  [ The Arrow and the Song, by Henry Wadsworth Longfellow ]
-		  by Henry Wadsworth Longfellow ]
 ashikaga takauji
 	Ashikaga Takauji was a daimyo of the Minamoto clan who
 	joined forces with the Go-Daigo to defeat the Hojo armies.
@@ -557,6 +555,17 @@ candelabrum*
 	(Enter all the Friars to sing the dirge)
 		[ Doctor Faustus and Other Plays, by Christopher Marlowe ]
 boomerang
+#: this one is commented out because two from the same source feels a
+#: bit excessive; if uncommented, it should be first since the punchline
+#: is about coming back while the other one is disdainful about that, so
+#: if this one came second, its joke would be weakened
+#	"It's a boomerang," said Vimes.  "You find something like this
+#	all over the world.  You have to wave it carefully and suddenly
+#	your opponent gets it in the back.  I've heard that there's a lad
+#	in Fourecks who can throw a boomerang with such precision that it
+#	can get the morning paper and come back with it."
+#		[ Raising Steam, by Terry Pratchett ]
+#
 	Rincewind pulled himself up and thought about reaching for his
 	stick.  And then he thought again.  The man had a couple of spears
 	stuck in the ground, and people here were good at spears, because
@@ -1055,15 +1064,14 @@ crom
 	his weapon, and mutters under his breath:
 	"By Crom, there will be blood spilt today."
 
-	[ Conan the Avenger by Robert E. Howard, Bjorn Nyberg, and
+	    [ Conan the Avenger by Robert E. Howard, Bjorn Nyberg,
-	  L. Sprague de Camp ]
+		and L. Sprague de Camp ]
 crossbow*
 	"God save thee, ancient Mariner!
 	From the fiends, that plague thee thus! -
 	Why look'st thou so?" - With my cross-bow
 	I shot the Albatross.
-		[ The Rime of the Ancient Mariner, by Samuel Taylor
+	  [ The Rime of the Ancient Mariner, by Samuel Taylor Coleridge ]
-		  Coleridge ]
 crystal ball
 	You look into one of these and see _vapours swirling like
 	clouds_.  These shortly clear away to show a sort of video
@@ -1231,7 +1239,8 @@ dingo
 	A wolflike wild dog, Canis dingo, of Australia, having a
 	reddish- or yellowish-brown coat, believed to have been
 	introduced by the aborigines.
-	[Webster's Encyclopedic Unabridged Dictionary of the English Language]
+		[ Webster's Encyclopedic Unabridged Dictionary
+		    of the English Language ]
 disenchanter
 	Ask not, what your magic can do to it.  Ask what it can do
 	to your magic.
@@ -2572,8 +2581,8 @@ jellyfish
 	I do not care to share the seas
 	With jellyfishes such as these;
 	Particularly Portuguese.
-		[ Lines on Meeting a Portuguese Man-o'-war while
+	  [ Lines on Meeting a Portuguese Man-o'-war while Bathing,
-			Bathing, by Michael Flanders ]
+	      by Michael Flanders ]
 juiblex
 jubilex
 	Little is known about the Faceless Lord, even the correct
@@ -2688,8 +2697,7 @@ knight
 	And was a bugbear in men's eyes;
 	But had the fortune in his age
 	To live a fool and die a sage.
-		[ Don Quixote of La Mancha, by Miquel de
+	  [ Don Quixote of La Mancha, by Miquel de Cervantes Saavedra ]
-		  Cervantes Saavedra ]
 ~kobold ??m*
 *kobold*
 	The race of kobolds are reputed to be an artificial creation
@@ -2805,8 +2813,7 @@ lance
 	his lance into shivers, carrying him and his horse after it,
 	and finally tumbled him a good way off from it on the field in
 	evil plight.
-		[ Don Quixote of La Mancha, by Miquel de
+	  [ Don Quixote of La Mancha, by Miquel de Cervantes Saavedra ]
-		  Cervantes Saavedra ]
 land mine
 	Your heart is intact, your brain is not badly damaged, but the rest
 	of your injuries are comparable to stepping on a land mine.  You'd
@@ -3029,10 +3036,12 @@ bad luck
 	that?"
 	Jack shrugged [...].  "Bad grace, I suppose.  Just because I
 	shot off his ear and made him jump into a pit full of spikes."
-			[ the hollow chocolate bunnies of
+		[ the hollow chocolate bunnies of the apocalypse,
-			  the apocalypse, by Robert Rankin ]
+		    by Robert Rankin ]
-#			[no relation... both cover and title page list
+#		[no relation... both cover and title page list this
-#			 this book's title in all lower case]
+#		 book's title in all lower case; however, its sequel,
+#		 "the toyminator", refers to it using conventional
+#		 capitalization in a couple of early footnotes]
 lug*
 	Lugh, or Lug, was the sun god of the Irish Celts.  One of his
 	weapons was a rod-sling which worshippers sometimes saw in
@@ -3307,9 +3316,8 @@ mit*ra*
 	and contracts.  He is attributed with the creation of both
 	plants and animals.  His chief adversary is Ahriman, the
 	power of darkness.
-		[ The Encyclopaedia of Myths and Legends of All
+	    [ The Encyclopaedia of Myths and Legends of All Nations,
-			Nations, by Herbert Spencer Robinson and
+		by Herbert Spencer Robinson and Knox Wilson ]
-			Knox Wilson ]
 *mithril*
 	_Mithril_!  All folk desired it.  It could be beaten like
 	copper, and polished like glass; and the Dwarves could make
@@ -3556,9 +3564,8 @@ ninja-to
 	good condition by placing fresh earth around it daily.  In her
 	fury, Skuld often spoiled the work of her sisters by tearing
 	the web to shreds.
-		[ The Encyclopedia of Myths and Legends of All
+	    [ The Encyclopedia of Myths and Legends of All Nations
-			Nations by Herbert Spencer Robinson and Knox
+		by Herbert Spencer Robinson and Knox Wilson ]
-			Wilson ]
 nunchaku
 	A nunchaku is two sections of wood (or metal in modern
 	incarnations) connected by a cord or chain.  There is much
@@ -3951,8 +3958,8 @@ poseido*n
 	shake the earth, a power which makes him the god of
 	earthquakes as well.  Physically, he is shown as a strong and
 	powerful ruler, every inch a king.
-		[ The Encyclopedia of Myths and Legends of All
+	    [ The Encyclopedia of Myths and Legends of All Nations,
-		  Nations, by Herbert Robinson and Knox Wilson ]
+		by Herbert Robinson and Knox Wilson ]
 ~*sleeping
 ~*booze
 *potion*
@@ -4685,8 +4692,8 @@ javelin
 	of Rome in Nero's time, for instance?  Why, it would merely
 	say 'Town burned down; no insurance; boy brast a window,
 	fireman brake his neck!'  Why, that ain't a picture!
-		[ A Connecticut Yankee in King Arthur's Court, by Mark
+		[ A Connecticut Yankee in King Arthur's Court,
-		  Twain ]
+		    by Mark Twain ]
 *spellbook*
 	The Book of Three lay closed on the table.  Taran had never
 	been allowed to read the volume for himself; now he was sure
@@ -5026,8 +5033,7 @@ towel
 	wave your towel in emergencies as a distress signal, and of
 	course dry yourself off with it if it still seems to be clean
 	enough.
-		[ The Hitchhiker's Guide to the Galaxy,
+	  [ The Hitchhiker's Guide to the Galaxy, by Douglas Adams ]
-		  by Douglas Adams ]
 *tower
 *tower of darkness
 	Towers (_brooding_, _dark_) stand alone in Waste Areas and
@@ -5208,9 +5214,8 @@ valkyrie
 	without restraint and fighting over again the battles in
 	which they died and in which they had won their deathless
 	fame.
-		[ The Encyclopaedia of Myths and Legends of All
+	    [ The Encyclopaedia of Myths and Legends of All Nations,
-			Nations, by Herbert Robinson and Knox
+		by Herbert Robinson and Knox Wilson ]
-			Wilson ]
 vampire
 ~vampire bat
 vampire lord
@@ -5322,8 +5327,7 @@ water
 	And all the boards did shrink;
 	Water, water, everywhere
 	Nor any drop to drink.
-		[ The Rime of the Ancient Mariner, by Samuel Taylor
+	  [ The Rime of the Ancient Mariner, by Samuel Taylor Coleridge ]
-		  Coleridge ]
 water demon
 	[ The monkey king ] walked along the bank, around the pond.
 	He examined the footprints of the animals that had gone into
@@ -5422,8 +5426,8 @@ wolf
 	some of these plants, which yield a poisonous alkaloid that
 	was formerly used medicinally.  In both senses also called
 	monkshood.
-	[ The American Heritage Dictionary of the English Language,
+		[ The American Heritage Dictionary of
-	  Fourth Edition. ]
+		    the English Language, Fourth Edition. ]
 wood golem
 	Come, old broomstick, you are needed,
 	Take these rags and wrap them round you!