Remove more unneeded blank lines.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5406 c06c8d41-db1a-0410-9941-cceddc491573

11 files changed, 1 insertions, 187 deletions

diff --git a/crawl-ref/source/dat/database/godspeak.txt b/crawl-ref/source/dat/database/godspeak.txt
index 46ab74dcb4..184bd3fae6 100644
--- a/crawl-ref/source/dat/database/godspeak.txt
+++ b/crawl-ref/source/dat/database/godspeak.txt
@@ -16,7 +16,6 @@ Xom snickers.
 "Let's try an experiment, hmmm?"
 
 "I wonder... What does this button do?"
-
 %%%%
 ##############################
 # Xom throwing stuff at you.
@@ -36,7 +35,6 @@ Xom grants you an implement of some kind.
 "Take this token of my esteem."
 
 Xom smiles on you.
-
 %%%%
 # Xom will give you a ring or amulet you can't currently use, due to
 # cursed equipment.
@@ -47,7 +45,6 @@ Xom cursed gift
 "Maybe this would work better."
 
 "Catch!"
-
 %%%%
 # If you're wearing a cursed ring, Xom will give you another ring.
 Xom ring gift
@@ -57,7 +54,6 @@ Xom ring gift
 "Take this!"
 
 "Catch!"
-
 %%%%
 # Xom will choose a weapon of a different subtype from the one you're
 # currently wielding.
@@ -68,7 +64,6 @@ Xom weapon gift
 "Have you considered using one of these?"
 
 "How about this?"
-
 %%%%
 # If you're wearing a cursed cloak, Xom will give you either a cloak
 # or body armour.
@@ -79,7 +74,6 @@ Xom armour gift
 "Have you considered wearing one of these?"
 
 "Here you go."
-
 %%%%
 ####################
 # friendly summons
@@ -91,7 +85,6 @@ Xom single summon
 "Serve the toy, my child!"
 
 Xom opens a gate.
-
 %%%%
 Xom single holy summon
 
@@ -108,7 +101,6 @@ Xom lures something onto this plane.
 "I wonder which toy lasts longer."
 
 Xom opens a gate.
-
 %%%%
 # higher demonic being
 Xom single demon summon
@@ -118,7 +110,6 @@ Xom grants you a demonic assistant.
 Xom grants you a demonic servitor.
 
 Xom opens a gate.
-
 %%%%
 Xom single major holy summon
 
@@ -133,7 +124,6 @@ You wonder where Xom got that toy from.
 Xom seems to have successfully tricked another god.
 
 Xom opens a gate.
-
 %%%%
 # several demons
 Xom multiple summons
@@ -143,7 +133,6 @@ Xom multiple summons
 Xom grants you some temporary aid.
 
 Xom momentarily opens a gate.
-
 %%%%
 # holy beings and demons at the same time
 Xom multiple mixed summons
@@ -161,7 +150,6 @@ Xom manages to trick several beings into existence.
 Xom snickers at the variety.
 
 Xom momentarily opens several gates.
-
 %%%%
 Xom multiple holy summons
 
@@ -174,7 +162,6 @@ Xom tricks other gods for their servants.
 "Different god, different toy."
 
 Xom momentarily opens a gate.
-
 %%%%
 ##################
 # Xom nastiness
@@ -189,7 +176,6 @@ Xom's attention almost turns to you for a moment.
 Xom's power almost touches on you for a moment.
 
 You almost hear Xom's maniacal laughter.
-
 %%%%
 # miscast strength random2(2), harmless/annoying
 Xom minor miscast effect
@@ -201,13 +187,11 @@ Xom's attention turns to you for a moment.
 Xom's power touches on you for a moment.
 
 You hear Xom's maniacal laughter.
-
 %%%%
 # miscast strength random2(3), mostly annoying
 Xom medium miscast effect
 
 @Xom minor miscast effect@
-
 %%%%
 # miscast strength random2(4), up to really nasty
 Xom major miscast effect
@@ -219,7 +203,6 @@ Xom's attention turns to you.
 Xom's power touches on you.
 
 Xom giggles.
-
 %%%%
 Xom lose stats
 
@@ -230,7 +213,6 @@ Xom's malign attention turns to you for a moment.
 Xom's power touches on you for a moment.
 
 You hear Xom's maniacal laughter.
-
 %%%%
 # 25% chance of draining, else torment
 Xom draining or torment
@@ -242,7 +224,6 @@ Xom draining or torment
 Xom's power touches on you for a moment.
 
 You hear Xom's maniacal laughter.
-
 %%%%
 # 25% chance dancing weapon, else summon hostile monster
 Xom hostile monster
@@ -254,7 +235,6 @@ Xom hostile monster
 "Let's see if it's strong enough to survive yet."
 
 You hear Xom's maniacal laughter.
-
 %%%%
 Xom banishment
 
@@ -263,7 +243,6 @@ Xom banishment
 Xom casts you into the Abyss!
 
 The world seems to spin as Xom's maniacal laughter rings in your ears.
-
 %%%%
 #####################
 # other effects
@@ -277,7 +256,6 @@ Xom potion effect
 Xom grants you a minor favour.
 
 Xom smiles on you.
-
 %%%%
 # cast a random spell
 Xom spell effect
@@ -287,7 +265,6 @@ Xom's power flows through you!
 Xom plays with reality for a moment.
 
 Xom guffaws.
-
 %%%%
 # turns walls into glass
 Xom vitrification
@@ -299,7 +276,6 @@ Everything around seems to assume a strange transparency.
 All the walls suddenly lose part of their structure.
 
 Xom alters the dungeon around you.
-
 %%%%
 # strengthens friendlies, weakens hostiles
 Xom good monster polymorph
@@ -311,7 +287,6 @@ Xom good monster polymorph
 Xom's power touches on a nearby monster.
 
 You hear Xom's avuncular chuckle.
-
 %%%%
 # weakens friendlies, strengthens hostiles
 Xom bad monster polymorph
@@ -327,7 +302,6 @@ Xom good mutations
 Xom's power touches on you for a moment.
 
 You hear Xom's maniacal cackling.
-
 %%%%
 Xom random mutations
 
@@ -338,7 +312,6 @@ Xom random mutations
 Xom's power brushes against you for a moment.
 
 You hear Xom's avuncular chuckle.
-
 %%%%
 ############################################
 # Beogh rants on destroying an orcish idol #
@@ -351,7 +324,6 @@ Beogh fumes, "This is no small sin, orc.  Repent!"
 Beogh whispers, "You will pay for this transgression.",
 
 Beogh rages, "An eye for an eye..."
-
 %%%%
 # an unbelieving hill orc has destroyed an idol
 Beogh idol hill orc
@@ -361,7 +333,6 @@ Beogh's voice booms out: "Heretic, die!"
 You hear Beogh's thundering voice: "Suffer, infidel!"
 
 Beogh roars, "Feel my power, apostate!"
-
 %%%%
 # a character of another species has destroyed an idol
 Beogh idol other
@@ -371,7 +342,6 @@ Beogh is not amused by that idol's destruction.
 Beogh seems highly displeased.
 
 Your arrogance infuriates Beogh.
-
 %%%%
 ##########################################################
 # Messages for the *player* using Zin's Recite invocation
@@ -383,7 +353,6 @@ begin
 launch into
 
 embark on
-
 %%%%
 recite_what
 
@@ -396,7 +365,6 @@ the word of Zin on
 sonorously on
 
 loudly on
-
 %%%%
 zin_recite_speech_start
 
@@ -419,7 +387,6 @@ begin explaining the importance of @important_subject@
 
 w:5
 begin speaking about @recite_subject@
-
 %%%%
 # the short form of the above, for continuing/stopping/finishing
 # reciting -- order and weights must be the same as above!
@@ -440,7 +407,6 @@ your sermon
 
 w:15
 your speech
-
 %%%%
 lecture_modifier
 
@@ -449,7 +415,6 @@ lengthy
 passionate
 
 stern
-
 %%%%
 axioms_of_law
 
@@ -460,7 +425,6 @@ the Axioms of Law.
 the books of the Law.
 
 the sacred Law of Zin.
-
 %%%%
 # used for "explaining the importance of ..."
 important_subject
@@ -496,7 +460,6 @@ proper burial practice.
 not dealing with demons.
 
 rejecting the service of demons.
-
 %%%%
 # the subject of your recital/lecture/whatever
 # needs the full dot or exclamation mark
@@ -538,14 +501,12 @@ the alliance of Zin and Elyvilon.
 the lawlessness of @chaotic_god@.
 
 the evilness of @evil_god@.
-
 %%%%
 chaotic_god
 
 Xom
 
 Makhleb
-
 %%%%
 evil_god
 
@@ -558,5 +519,4 @@ Yredelemnul
 Beogh
 
 Lugonu
-
 %%%%
diff --git a/crawl-ref/source/dat/database/insult.txt b/crawl-ref/source/dat/database/insult.txt
index 29cdc97ae1..fcf095b666 100644
--- a/crawl-ref/source/dat/database/insult.txt
+++ b/crawl-ref/source/dat/database/insult.txt
@@ -12,7 +12,6 @@
 imp_taunt
 
 @run_or_give_up@, thou @generic_insult@!
-
 %%%%
 run_or_give_up
 
@@ -21,7 +20,6 @@ w:6
 
 w:1
 @give_up@
-
 %%%%
 demon_taunt
 
@@ -33,7 +31,6 @@ w:2
 
 w:3
 @demon_taunt_special@
-
 %%%%
 demon_taunt_special
 
@@ -44,7 +41,6 @@ Thy @body_or_spiritual_part@ shall be my @meal@!
 @run_away@ @whilst_thou_can@!
 
 I @will_or_shall@ @feast_or_devour@ thy @body_or_spiritual_part@!
-
 %%%%
 # capitalized "flee" verbs
 run_away
@@ -100,7 +96,6 @@ Slither home
 Take thy face hence
 
 Turn tail
-
 %%%%
 # capitalized synonyms for "give up"
 give_up
@@ -162,9 +157,7 @@ Tremble
 Relinquish hope
 
 Taste defeat
-
 %%%%
-
 whilst_thou_can
 
 whilst thou can
@@ -185,7 +178,6 @@ whilst thou art whole
 
 # screen vs. this for undead?
 whilst life thou hast
-
 %%%%
 body_or_spiritual_part
 
@@ -194,21 +186,18 @@ w:3
 
 w:1
 @important_spiritual_part@
-
 %%%%
 will_or_shall
 
 will
 
 shall
-
 %%%%
 feast_or_devour
 
 feast on
 
 devour
-
 %%%%
 important_body_part
 
@@ -233,7 +222,6 @@ neck
 skull
 
 spine
-
 %%%%
 important_spiritual_part
 
@@ -259,7 +247,6 @@ fortitude
 
 life force
 %%%%
-
 meal
 
 meal
@@ -308,7 +295,6 @@ w:5
 @species_insult_adj1@
 
 @insult general adj1@
-
 %%%%
 insult general adj1
 
@@ -451,7 +437,6 @@ weedy
 worthless
 
 yeasty
-
 %%%%
 ##########################################################
 # adjective1, Elf special
@@ -493,7 +478,6 @@ puny
 shaky
 
 prissy
-
 %%%%
 ##########################################################
 # adjective1, Ghoul special
@@ -547,7 +531,6 @@ foetid
 gangrenous
 
 foul-breathed
-
 %%%%
 ###############################################################
 # adjective2, usually longer and consisting of two words
@@ -558,7 +541,6 @@ w:5
 @species_insult_adj2@
 
 @insult general adj2@
-
 %%%%
 insult general adj2
 
@@ -685,7 +667,6 @@ unchin-snouted
 weather-bitten
 
 weevil-witted
-
 %%%%
 ##########################################################
 # adjective2, Dwarf special
@@ -715,7 +696,6 @@ rhino-raveling
 thigh-biting
 
 dirt-delving
-
 %%%%
 ##########################################################
 # adjective2, Kenku special
@@ -745,7 +725,6 @@ crow-beaked
 magpie-eyed
 
 mallardish
-
 %%%%
 ##########################################################
 # adjective2, Mummy special
@@ -788,7 +767,6 @@ straight-laced
 
 w:30
 @insult undead adj2@
-
 %%%%
 ##########################################################
 # adjective2, Vampire special
@@ -817,7 +795,6 @@ exsanguinous
 
 w:20
 @insult undead adj2@
-
 %%%%
 ##########################################################
 # adjective2, undead special
@@ -831,7 +808,6 @@ lifeless
 undead
 
 corpse-like
-
 %%%%
 ###############################################
 # noun of the insult
@@ -842,7 +818,6 @@ w:5
 @species_insult_noun@
 
 @insult general noun@
-
 %%%%
 insult general noun
 
@@ -993,7 +968,6 @@ wormtrail
 yak-dropping
 
 zombie-fodder
-
 %%%%
 ##########################################################
 # noun, small species special
@@ -1069,7 +1043,6 @@ burrow-botch
 hole-pimple
 
 hovel-pustule
-
 %%%%
 ##########################################################
 # noun, Spriggan special
@@ -1110,7 +1083,6 @@ sissy-prig
 pussyfoot
 
 creepsneak
-
 %%%%
 ##########################################################
 # noun, Centaur special
@@ -1142,7 +1114,6 @@ nag
 nightmare
 
 pony
-
 %%%%
 ##########################################################
 # noun, Minotaur special
@@ -1239,5 +1210,4 @@ walking corpse
 corpse eater
 
 scavenger
-
 %%%%
diff --git a/crawl-ref/source/dat/database/miscname.txt b/crawl-ref/source/dat/database/miscname.txt
index 71a8ae064b..bbb417dbe6 100644
--- a/crawl-ref/source/dat/database/miscname.txt
+++ b/crawl-ref/source/dat/database/miscname.txt
@@ -29,7 +29,6 @@ pulsating
 shimmering
 
 shining
-
 %%%%
 colour_name
 
@@ -92,12 +91,10 @@ umber
 white
 
 yellow
-
 %%%%
 glowing_colour_name
 
 @glowing_adj@ @colour_name@
-
 %%%%
 writing_adj
 
@@ -120,7 +117,6 @@ sinuous
 spidery
 
 writhing
-
 %%%%
 writing_noun
 
@@ -145,7 +141,6 @@ symbols
 text
 
 writing
-
 %%%%
 writing_name
 
@@ -156,7 +151,6 @@ writing_name
 @writing_adj@ @colour_name@ @writing_noun@
 
 @writing_adj@ @writing_noun@
-
 %%%%
 smell_name
 
@@ -177,7 +171,6 @@ sulphur
 tea
 
 wet wool
-
 %%%%
 roaring_animal_name
 # This doesn't necessarily have to make sense.  For example, a name of a
@@ -199,7 +192,6 @@ pill bug
 slug
 
 yak
-
 %%%%
 sound_name
 
@@ -220,5 +212,4 @@ the distant roaring of an enraged @roaring_animal_name@
 the chiming of a distant gong
 
 the tinkle of an enormous bell
-
 %%%%
diff --git a/crawl-ref/source/dat/database/monname.txt b/crawl-ref/source/dat/database/monname.txt
index aff04bd0f8..29d1019859 100644
--- a/crawl-ref/source/dat/database/monname.txt
+++ b/crawl-ref/source/dat/database/monname.txt
@@ -39,7 +39,6 @@ w:12
 
 w:45
 @other_orcish_name@
-
 %%%%
 # some specials for orcish priests
 orc high priest name
@@ -55,7 +54,6 @@ Judas
 
 w:50
 @orc name@
-
 %%%%
 # Obvious references to Beogh
 # (14 at last count)
@@ -89,7 +87,6 @@ Morbeogh
 Orbeogh
 
 Warbeogh
-
 %%%%
 # Obvious references to orcs in general
 # (extremely subjective, and 13 at last count)
@@ -120,7 +117,6 @@ Orkrul
 Orkwin
 
 Oruk
-
 %%%%
 # Other
 # (49 at last count)
@@ -223,5 +219,4 @@ Worak
 Wulfoc
 
 Zorug
-
 %%%%
diff --git a/crawl-ref/source/dat/database/monspeak.txt b/crawl-ref/source/dat/database/monspeak.txt
index 93e1f0f5ff..a96ac05867 100644
--- a/crawl-ref/source/dat/database/monspeak.txt
+++ b/crawl-ref/source/dat/database/monspeak.txt
@@ -111,7 +111,6 @@ ploy
 ploy
 
 trick
-
 ############################################################
 # Library of speeches for types of monsters, like priests, 
 # wizards, guards and so on.
@@ -586,7 +585,6 @@ VISUAL:@The_monster@ smiles happily.
 
 VISUAL:@The_monster@ looks friendly.
 ## END friendly humanoid ##
-
 %%%%
 pauses_or_stops
 
@@ -633,7 +631,6 @@ default confused centipede
 VISUAL:@The_monster@ seems to be having trouble coordinating @possessive@ many legs.
 
 VISUAL:@The_monster@ wildly waves @possessive@ antennae.
-
 #########################################
 # Speech strings by monster symbol
 #########################################
@@ -680,7 +677,6 @@ SOUND:@The_monster@ buzzes around in tight circles.
 default '8'
 
 __NONE
-
 ######################
 # Demon taunts
 ######################
@@ -704,7 +700,6 @@ __NONE
 '4'
 
 @_demon_taunt_@
-
 #####################################
 # Demons are silent when not taunting
 #####################################
@@ -732,7 +727,6 @@ __NONE
 default '5'
 
 __NONE
-
 ###############
 # Friendly imps
 ###############
@@ -745,7 +739,6 @@ __NONE
 
 w:1
 @_friendly_imp_@
-
 ####################################################################
 # Player ghost phrases.  Ghosts with different classes can be given 
 # different messages.
@@ -829,7 +822,6 @@ VISUAL:@The_monster@ grins evilly.
 
 @The_monster@ whispers, "The ORB doesn't exist."
 ## END player ghost ##
-
 #######################################
 # Unique monsters
 #######################################
@@ -1699,7 +1691,6 @@ VISUAL:@The_monster@ glares at you.
 @The_monster@ roars horribly.
 You are afraid.
 ## END Xtahua ##
-
 ##########################################
 # Specific non-unique monsters
 ##########################################
@@ -1928,7 +1919,6 @@ __NONE
 
 w:1
 @holy_being@
-
 %%%%
 # Otherwise, they'll stay silent.
 default 'cap-A'
@@ -1942,7 +1932,6 @@ good_god_neutral_holy_being_reaction
 @The_monster@ relaxes its fighting stance.
 
 @The_monster@ salutes you.
-
 %%%%
 good_god_neutral_holy_being_speech
 
@@ -2106,7 +2095,6 @@ smash
 burn
 
 maim
-
 %%%%
 #######################################################
 # Heretic orcs, not believing in Beogh or doubting the
@@ -2123,7 +2111,6 @@ w:1
 
 w:5
 @_hostile_beogh_speech_@
-
 %%%%
 _hostile_beogh_speech_
 
@@ -2195,7 +2182,6 @@ w:2
 
 w:12
 @_friendly_beogh_speech_@
-
 %%%%
 _friendly_beogh_speech_
 
@@ -2317,7 +2303,6 @@ beogh_converted_orc_reaction_sight
 @The_monster@ relaxes @possessive@ fighting stance and smiles at you.
 
 @The_monster@ falls on @possessive@ knees before you.
-
 %%%%
 beogh_converted_orc_speech_sight
 
@@ -2328,7 +2313,6 @@ beogh_converted_orc_speech_sight
 @Pronoun@ asks, "Are you our saviour?"
 
 @Pronoun@ says, "I'm so glad you are here now."
-
 %%%%
 # through battle
 beogh_converted_orc_reaction_battle
@@ -2338,7 +2322,6 @@ beogh_converted_orc_reaction_battle
 @The_monster@ falls to @possessive@ knees.
 
 @The_monster@ raises @possessive@ hands in surrender.
-
 %%%%
 beogh_converted_orc_speech_battle
 
diff --git a/crawl-ref/source/dat/database/rand_all.txt b/crawl-ref/source/dat/database/rand_all.txt
index a281b63da4..9fcaba64b4 100644
--- a/crawl-ref/source/dat/database/rand_all.txt
+++ b/crawl-ref/source/dat/database/rand_all.txt
@@ -23,7 +23,6 @@ Magpie
 Firefly
 
 Scarab
-
 %%%%
 jewellery_special_name
 
@@ -48,7 +47,6 @@ Lady Luck
 Temptation
 
 False Pretenses
-
 %%%%
 suspicion_name
 
@@ -68,7 +66,6 @@ Suspected Treachery
 
 w:20
 @conflict_name@
-
 %%%%
 ######################################################
 # Library of keywords used for all randart types.
@@ -105,7 +102,6 @@ Envy
 
 w:70
 @anger_name@
-
 %%%%
 xom_esteem
 
@@ -144,7 +140,6 @@ Fair Game
 Wantonness
 
 Recklessness
-
 %%%%
 time_name
 
@@ -185,7 +180,6 @@ the Harvest
 Eternal Night
 
 Eternity
-
 %%%%
 sky_or_light
 
@@ -208,7 +202,6 @@ Starshine
 the Clouds
 
 the Sky
-
 %%%%
 virtue_or_vice
 
@@ -218,7 +211,6 @@ w:5
 @valour_name@
 
 @vice_name@
-
 %%%%
 virtue_name
 
@@ -237,7 +229,6 @@ Charity
 Patience
 
 Modesty
-
 %%%%
 vice_name
 
@@ -272,7 +263,6 @@ Immorality
 Amorality
 
 Untruth
-
 %%%%
 destiny_name
 
@@ -285,7 +275,6 @@ Karma
 Kismet
 
 Wyrd
-
 %%%%
 number_or_qualifier
 
@@ -343,7 +332,6 @@ the Jolly
 the Ancient
 
 the Exiled
-
 %%%%
 thing_names
 
@@ -392,5 +380,4 @@ Places
 Wishes
 
 Wonders
-
 %%%%
diff --git a/crawl-ref/source/dat/database/rand_arm.txt b/crawl-ref/source/dat/database/rand_arm.txt
index 8d1035716b..3684fc81d0 100644
--- a/crawl-ref/source/dat/database/rand_arm.txt
+++ b/crawl-ref/source/dat/database/rand_arm.txt
@@ -77,7 +77,6 @@ Monkey
 
 # not strictly an animal... :)
 Monkey's Uncle
-
 %%%%
 flower_name
 
@@ -88,7 +87,6 @@ Daffodils
 the Rose
 
 the Garden
-
 %%%%
 # non-Crawl critters
 critter_name
@@ -101,7 +99,6 @@ the Alphagorgon
 the Hot Ocelot
 
 Eight Boll Weevils
-
 %%%%
 discomfort_and_inaction
 
@@ -134,7 +131,6 @@ Negligence
 Inaction
 
 Oblivion
-
 %%%%
 mental_illness_armour
 
@@ -147,7 +143,6 @@ Agoraphobia
 Dyspraxia
 
 Mental Paralysis
-
 %%%%
 good_or_divine
 
@@ -196,7 +191,6 @@ Divine Compulsion
 the Invisible Hand
 
 Divine Intervention
-
 %%%%
 # in contrast to "wacky_armour_name" these do have some connection to armour and protection
 armour_name_shielding
@@ -226,7 +220,6 @@ Preservation
 Conservation
 
 Inviolability
-
 %%%%
 # other armour properties (beside protection)
 armour_property_name
@@ -246,7 +239,6 @@ Disguise
 Least Resistance
 
 Protective Custody
-
 %%%%
 wacky_armour_name
 
@@ -301,7 +293,6 @@ Decompression
 the Loofah
 
 Love and Death
-
 %%%%
 # Lemuel's suggestions
 celestial_bodies
@@ -319,7 +310,6 @@ Pleiades
 Morning Star
 
 Evening Star
-
 %%%%
 instrument_name
 
@@ -332,7 +322,6 @@ the Accordion
 the Bagpipe
 
 the Lute
-
 %%%%    
 evil_being
 
@@ -347,7 +336,6 @@ Greater Demons
 the Iron Devil
 
 the Devil's Advocate
-    
 %%%%
 # um, reeeeally bad weather...
 weather_name
@@ -359,7 +347,6 @@ Boiling Hail
 Perpetual Drought
 
 the Thunderstorm
-
 %%%%
 profession_name
 
@@ -388,7 +375,6 @@ Guardian
 Beekeeper
 
 Gardener
-
 %%%%
 # something for Xom
 game_name
@@ -419,7 +405,6 @@ Jigsaw
 Whack-A-Mole
 
 Ladders and Snakes
-
 %%%%
 politics_name_armour
 
@@ -450,7 +435,6 @@ the Country
 the Suburbs
 
 the Mutiny
-
 %%%%
 other_armour_name
 
@@ -497,12 +481,10 @@ Unambiguity
 the Lost Path
 
 Misanthrophy
-
 %%%%
 plain_armour_name
 
 Forget-Me-Not
 
 Hero's Friend
-
 %%%%
diff --git a/crawl-ref/source/dat/database/rand_wpn.txt b/crawl-ref/source/dat/database/rand_wpn.txt
index 3becb714b8..b914715ff7 100644
--- a/crawl-ref/source/dat/database/rand_wpn.txt
+++ b/crawl-ref/source/dat/database/rand_wpn.txt
@@ -19,7 +19,6 @@ w:7
 
 w:7
 @anger_name@
-
 %%%%
 power_name
 
@@ -44,7 +43,6 @@ Dominance
 Victory
 
 Intimidation
-
 %%%%
 conflict_name
 
@@ -59,7 +57,6 @@ Division
 Doubt
 
 Internal Strife
-
 %%%%
 anger_name
 
@@ -76,7 +73,6 @@ Wrath
 Brutal Revenge
 
 Vengeance
-
 %%%%
 battle_or_war
 
@@ -131,7 +127,6 @@ Mourning
 Death's Door
 
 the Grave
-
 %%%%
 death_or_doom
 
@@ -185,7 +180,6 @@ Dismemberment
 Terror
 
 Misery
-
 %%%%
 strategy_or_justice
 
@@ -197,7 +191,6 @@ w:4
 
 w:3
 @justice_name@
-
 %%%%
 strategy_name
 
@@ -215,7 +208,6 @@ Reinforcement
 Expedience
 
 Optimality
-
 %%%%
 valour_name
 
@@ -248,7 +240,6 @@ Valiance
 Courage
 
 Eternal Vigilance
-
 %%%%
 justice_name
 
@@ -277,7 +268,6 @@ Wrongful Imprisonment
 Corporal Punishment
 
 Capital Punishment
-
 %%%%
 diviner_name
 
@@ -290,7 +280,6 @@ Soothsayer
 Seeker
 
 Visionary
-
 %%%%
 people_name
 
@@ -313,7 +302,6 @@ Genius
 Coward
 
 @diviner_name@
-
 %%%%
 weapon_animal
 
@@ -353,7 +341,6 @@ Weasel
 Goat
 
 Whale
-
 %%%%
 # plants and fungi
 plant_name
@@ -372,7 +359,6 @@ Toadstool
 
 # ???
 Puffball
-
 %%%%
 # undead and evil beings
 evil_stuff
@@ -406,7 +392,6 @@ Deformation
 Infection
 
 Demonkind
-
 %%%%
 # catastrophes etc.
 catastrophe_name
@@ -430,7 +415,6 @@ Pestilence
 Plague
 
 Famine
-
 %%%%
 chaos_name
 
@@ -465,7 +449,6 @@ Change
 Extremism
 
 Impermanence
-
 %%%%
 balance_or_order
 
@@ -506,8 +489,7 @@ Linearity
 Law
 
 Order
-
-%%%%%
+%%%%
 economics_or_politics
 
 # economics
@@ -557,7 +539,6 @@ Fundamental Breach
 Termination
 
 Sequestration
-
 %%%%
 place_name
 
@@ -594,7 +575,6 @@ the Maze
 the Pit
 
 the Eternal Void
-
 %%%%
 discomfort_weapon
 
@@ -621,7 +601,6 @@ Annoyance
 Anxiety
 
 Urgency
-
 %%%%
 mental_illness_weapon
 
@@ -638,14 +617,12 @@ Egomania
 Compulsion
 
 Fatigue
-
 %%%%
 philosophy_or_science
 
 @philosophy_name@
 
 @science_name@
-
 %%%%
 philosophy_name
 
@@ -690,7 +667,6 @@ Nihilism
 Pragmatism
 
 Idealism
-
 %%%%
 science_name
 
@@ -727,7 +703,6 @@ Quantum Leap
 Gravity
 
 Rotation
-
 %%%%
 item_name
 
@@ -752,7 +727,6 @@ Heart
 Brain
 
 Tooth
-
 %%%%
 magic_name
 
@@ -761,7 +735,6 @@ the Magi
 the Archmagi
 
 the Warrior-Mage
-
 %%%%
 # substances
 substance_name
@@ -790,7 +763,6 @@ Yeast
 Spores
 
 Dust
-
 %%%%
 # non-groupables
 other_weapon_name
@@ -819,7 +791,6 @@ Grontol
 
 # akrasiac patch
 Irrepressible Laughter
-
 %%%%
 # single word monster names, to allow for combinations like <Monster>slayer
 short_monster_name
@@ -839,7 +810,6 @@ Giant
 Beetle
 
 Jelly
-
 %%%%
 monster_name
 
@@ -852,14 +822,12 @@ Killer Bee
 Killer Klown
 
 Orb Guardian
-
 %%%%
 short_killer_name
 
 bane
 
 slayer
-
 %%%%
 killer_name
 
@@ -872,7 +840,6 @@ killer_name
 's Foe
 
 's Regret
-
 %%%%
 long_killer_name
 
@@ -881,7 +848,6 @@ long_killer_name
 's Funeral
 
 's Nightmare
-
 %%%%
 real_weapon_name
 
@@ -943,7 +909,6 @@ Trog's @anger_name@
 Hellblazer
 
 Hell-Harrower
-
 %%%%
 joke_weapon_name
 
@@ -1007,7 +972,6 @@ Bingo
 
 # from the crawl.akrasiac.org patch
 Cookie Cutter
-
 %%%%
 plain_weapon_name
 
@@ -1028,5 +992,4 @@ w:15
 
 w:5
 @joke_weapon_name@
-
 %%%%
diff --git a/crawl-ref/source/dat/database/randname.txt b/crawl-ref/source/dat/database/randname.txt
index 555e62aebf..6b70f295db 100644
--- a/crawl-ref/source/dat/database/randname.txt
+++ b/crawl-ref/source/dat/database/randname.txt
@@ -166,7 +166,6 @@ of @god_name@'s @divine_esteem@
 # hardcoded keywords
 w:1
 of @god_name@
-
 %%%%
 ######################################################
 # 2. ARMOUR
@@ -251,7 +250,6 @@ of @god_name@
 
 w:15
 of @branch_name@
-
 %%%%
 ######################################################
 # 3. JEWELLERY
@@ -318,7 +316,6 @@ of @vice_name@
 
 w:20
 of @number_or_qualifier@ @thing_names@
-
 %%%%
 ######################################################
 # GOD GIFT specials
@@ -402,7 +399,6 @@ of @monster_name@@killer_name@
 
 w:30
 "@plain_weapon_name@"
-
 %%%%
 ######################################################
 # OKAWARU weapon
@@ -446,7 +442,6 @@ of @place_name@
 
 w:2
 of @item_name@
-
 %%%%
 ######################################################
 # OKAWARU armour
@@ -480,7 +475,6 @@ of @wacky_armour_name@
 
 w:2
 of @politics_name_armour@
-
 %%%%
 ######################################################
 # XOM weapon
@@ -512,7 +506,6 @@ w:400
 @jewellery@
 
 @armour@
-
 %%%%
 ######################################################
 # XOM armour
@@ -545,7 +538,6 @@ w:400
 # why not some other names? 
 # (sadly, some weapon names don't make sense even for Xom)
 @jewellery@
-
 %%%%
 ######################################################
 # XOM jewellery
@@ -581,7 +573,6 @@ w:300
 # why not some other names? 
 # (sadly, some weapon names don't make sense even for Xom)
 @armour@
-
 %%%%
 ######################################################
 # Library of randart APPEARANCE (un-identified).
@@ -620,7 +611,6 @@ faintly glowing
 steaming
 
 shiny
-
 %%%%
 weapon appearance
 
@@ -637,7 +627,6 @@ ichor-stained
 # currently 16 entries, so their overall weight amounts 160
 w:160
 @general appearance@
-
 %%%%
 armour appearance
 
@@ -655,7 +644,6 @@ distressingly furry
 
 w:160
 @general appearance@
-
 %%%%
 jewellery appearance
 
@@ -681,5 +669,4 @@ glittering
 
 w:160
 @general appearance@
-
 %%%%
diff --git a/crawl-ref/source/dat/database/shout.txt b/crawl-ref/source/dat/database/shout.txt
index 1de7ebcffe..79f9ce7836 100644
--- a/crawl-ref/source/dat/database/shout.txt
+++ b/crawl-ref/source/dat/database/shout.txt
@@ -78,8 +78,6 @@ __DEMON_TAUNT
 ############################################
 # End of default shouts
 ############################################
-
-
 ############################################################
 # Player ghost shouts.  Potentially different ones for each 
 # class, though currently they all just copy the default 
@@ -201,7 +199,6 @@ Warper player ghost
 Wanderer player ghost
 
 @player ghost@
-
 ########################################
 # Shouts by monster symbol
 ########################################
diff --git a/crawl-ref/source/dat/database/wpnnoise.txt b/crawl-ref/source/dat/database/wpnnoise.txt
index 4993c4b56e..a82417f638 100644
--- a/crawl-ref/source/dat/database/wpnnoise.txt
+++ b/crawl-ref/source/dat/database/wpnnoise.txt
@@ -22,7 +22,6 @@ w:4
 
 w:1
 @weapon_talks@
-
 %%%%
 ############################################################
 # NOISY WEAPONS like to chatter and imitate dungeon noises.