Minor grammar tweaks

6 files changed, 524 insertions, 525 deletions

diff --git a/RGens/data/sample-grammars/diablo-ii/diabloii.gram b/RGens/data/sample-grammars/diablo-ii/diabloii.gram
index 712c491..ef92817 100755
--- a/RGens/data/sample-grammars/diablo-ii/diabloii.gram
+++ b/RGens/data/sample-grammars/diablo-ii/diabloii.gram
@@ -1,40 +1,40 @@
 [base-treasures] [base-treasure]
-	[base-treasure] as well as [base-treasure]
-	[base-treasure] or [base-treasure]
-	[base-treasure] , and [base-treasure] as well as [base-treasure]
-	[base-treasure] , [base-treasure] or [base-treasure]
+	         [base-treasure] as well as [base-treasure]
+	         [base-treasure] or [base-treasure]
+	         [base-treasure] , and [base-treasure] as well as [base-treasure]
+	         [base-treasure] , [base-treasure] or [base-treasure]
 
 pragma initial-rule [base-treasures]
 
 [base-treasure] a(n) [item]
-	[non-item]
+	        [non-item]
 
 [non-item] [money]
-	[money]
-	nothing
+	   [money]
+	   nothing
 
 [money] [diablo-amount] [money-type]
 
 [diablo-amount] 1
-	5
-	10
-	20
-	50
-	100
-	200
-	500
-	1000
+	        5
+	        10
+	        20
+	        50
+	        100
+	        200
+	        500
+	        1000
 
 pragma export-rule [diablo-amount]
 
 [money-type] [metal-type] coin(s)
 
 [metal-type] copper
-	silver
-	gold
-	platinum
+	     silver
+	     gold
+	     platinum
 
-[item] [item-act]
+[item]  [item-act]
 	[item-act] of [suffix]
 	[item-act] of [suffix] and [suffix]
 
diff --git a/RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram b/RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram
index a1bb40d..65e44af 100755
--- a/RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram
+++ b/RGens/data/sample-grammars/diablo-ii/diabloiiitems.gram
@@ -1,21 +1,21 @@
 [item-act] [armor]
-	[headgear]
-	[accoutrements]
-	[shields]
-	[knives]
-	[swords]
-	[clubs]
-	[spears]
-	[polearms]
-	[axes]
-	[bows]
-	[crossbows]
-	[wands]
-	[staves]
-	[accessories]
-	[gems]
-	[inscriptions]
-	[perishables]
+	   [headgear]
+	   [accoutrements]
+	   [shields]
+	   [knives]
+	   [swords]
+	   [clubs]
+	   [spears]
+	   [polearms]
+	   [axes]
+	   [bows]
+	   [crossbows]
+	   [wands]
+	   [staves]
+	   [accessories]
+	   [gems]
+	   [inscriptions]
+	   [perishables]
 
 pragma export-rule [item-act]
 
@@ -40,62 +40,62 @@ pragma export-rule [item-act]
 	full plate mail
 
 [headgear] cap
-	helm
-	mask
-	crown
+	   helm
+	   mask
+	   crown
 
 [headgear-kind] full
-	great
-	bone
+	        great
+	        bone
 
 pragma prefix-with [headgear] [headgear-kind]
 
 [accoutrements] gloves
-	sash
-	boots
-	bracers
-	belt
-	gauntlets
-	girdle
+	        sash
+	        boots
+	        bracers
+	        belt
+	        gauntlets
+	        girdle
 
 [acc-kind] leather
-	chain
-	plate
+	   chain
+	   plate
 
 pragma prefix-with [accoutrements] [acc-kind]
 
 [shields] buckler
-	shield
-	[shield-size] shield
-	[shield-type] shield
-	[shield-size] [shield-type] shield
+	  shield
+	  [shield-size] shield
+	  [shield-type] shield
+	  [shield-size] [shield-type] shield
 
 [shield-size] small
-	large
-	huge
+	      large
+	      huge
 
 [shield-type] kite
-	spiked
-	bone
-	tower
-	gothic
+	      spiked
+	      bone
+	      tower
+	      gothic
 
 [knives] dagger
-	throwing knife
-	kris
+	 throwing knife
+	 kris
 
 [swords] sword
-	sabre
-	blade
-	scimitar
-	falchion
-	claymore
+	 sabre
+	 blade
+	 scimitar
+	 falchion
+	 claymore
 
 [sword-kind] long
-	broad
-	short
-	bastard
-	two-handed
+	     broad
+	     short
+	     bastard
+	     two-handed
 
 pragma prefix-with [swords] [sword-kind]
 
@@ -109,53 +109,53 @@ pragma prefix-with [swords] [sword-kind]
 	malus
 
 [spears] javelin
-	spear
-	pilum
-	glaive
-	trident
-	pike
-	brandistock
+	 spear
+	 pilum
+	 glaive
+	 trident
+	 pike
+	 brandistock
 
 [polearms] bardiche
-	scythe
-	poleax
-	halberd
+	   scythe
+	   poleax
+	   halberd
 
-[axes] axe
+[axes]  axe
 	[axe-size] axe
 	[axe-type] axe
 	[axe-size] [axe-type] axe
 
 [axe-size] small
-	large
-	giant
+	   large
+	   giant
 
 [axe-type] throwing
-	broad
-	battle
-	great
+           broad
+           battle
+           great
 
-[bows] arrow ( [diablo-amount] count)
+[bows]  arrow ( [diablo-amount] count)
 	bow
 	[bow-size] bow
 	[bow-type] bow
 	[bow-size] [bow-type] bow
 
 [bow-size] short
-	long
+	   long
 
 [bow-type] hunter’s
-	composite
-	battle
-	war
+	   composite
+	   battle
+	   war
 
 [crossbows] bolt ( [diablo-amount] count)
-	crossbow
-	[crossbow-type] crossbow
+	    crossbow
+	    [crossbow-type] crossbow
 
 [crossbow-type] light
-	repeating
-	heavy
+	        repeating
+	        heavy
 
 [wands] wand
 	[wand-type] wand
@@ -164,41 +164,41 @@ pragma prefix-with [swords] [sword-kind]
 	[wand-type] scepter
 
 [wand-type] bone
-	yew
+	    yew
 
 [staves] staff
 
 [staff-type] short
-	long
-	gnarled
-	composite
-	battle
-	war
+	     long
+	     gnarled
+	     composite
+	     battle
+	     war
 
 pragma prefix-with [staves] [staff-type]
 
 [accessories] charm
-	ring
-	flag
-	orb
-	amulet
+	      ring
+	      flag
+	      orb
+	      amulet
 
 [gems] [gem-type]
 
 [gem-quality] chipped
-	flawed
-	flawless
-	perfect
+	      flawed
+	      flawless
+	      perfect
 
 [gem-type] amethyst
-	diamond
-	emerald
-	ruby
-	sapphire
-	topaz
+	   diamond
+	   emerald
+	   ruby
+	   sapphire
+	   topaz
 
 pragma prefix-with [gems] [gem-quality]
 
 [inscriptions] scroll
-	rune
-	book
+	       rune
+	       book
diff --git a/RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram b/RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram
index f910de8..a3c8693 100755
--- a/RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram
+++ b/RGens/data/sample-grammars/diablo-ii/diabloiiperish.gram
@@ -1,110 +1,110 @@
 [perishables] [perishable-type] of [perishable-effect]
-	[perishable-effect] [perishable-type]
-	[bodypart] of [perishable-effect]
+	      [perishable-effect] [perishable-type]
+	      [bodypart] of [perishable-effect]
 
 pragma export-rule [perishables]
 
 [bodypart] heart
-	brain
-	jawbone
-	eye
-	ear
-	horn
-	tail
-	fang
-	quill
-	scalp
-	spleen
-	soul
+	   brain
+	   jawbone
+	   eye
+	   ear
+	   horn
+	   tail
+	   fang
+	   quill
+	   scalp
+	   spleen
+	   soul
 
 [perishable-type] potion
-	oil
-	herb
-	elixir
-	resin
+	          oil
+	          herb
+	          elixir
+	          resin
 
 [perishable-effect] [restore-effect]
-	light [restore-effect]
-	full [restore-effect]
-	detox
-	restoration
-	flaming
-	explosive
-	fulminating
-	[gas-type] gas
-	acidic
-	energizing
-	strengthening
-	empowering
-	artful
-	skillful
-	adroit
-	sturdy
-	hardy
-	robust
-	sage
-	shrewd
-	vivid
-	indigo
-	cerulean
-	russet
-	vermillion
-	crackling
-	forked
-	swart
-	atramentous
-	vital
-	enduring
-	urgent
-	fleet
-	brisk
-	swift
-	dazzling
-	fascinating
-	bright
-	solar
-	omniscient
-	mystical
-	arcane
-	strength
-	dexterity
-	vitality
-	intelligence
-	chi
-	spectral
-	fire
-	ice
-	lightning
-	magic
-	psionic
-	poison
-	energy
-	accuracy
-	damage
-	defense
-	life
-	power
-	accuracy
-	precision
-	mastery
-	sharpness
-	pain
-	savagery
-	death
-	hardening
-	imperviousness
-	immunity
-	skill
-	fortitude
-	blacksmith’s
-	permanence
-	enchantment
+	            light [restore-effect]
+	            full [restore-effect]
+	            detox
+	            restoration
+	            flaming
+	            explosive
+	            fulminating
+	            [gas-type] gas
+	            acidic
+	            energizing
+	            strengthening
+	            empowering
+	            artful
+	            skillful
+	            adroit
+	            sturdy
+	            hardy
+	            robust
+	            sage
+	            shrewd
+	            vivid
+	            indigo
+	            cerulean
+	            russet
+	            vermillion
+	            crackling
+	            forked
+	            swart
+	            atramentous
+	            vital
+	            enduring
+	            urgent
+	            fleet
+	            brisk
+	            swift
+	            dazzling
+	            fascinating
+	            bright
+	            solar
+	            omniscient
+	            mystical
+	            arcane
+	            strength
+	            dexterity
+	            vitality
+	            intelligence
+	            chi
+	            spectral
+	            fire
+	            ice
+	            lightning
+	            magic
+	            psionic
+	            poison
+	            energy
+	            accuracy
+	            damage
+	            defense
+	            life
+	            power
+	            accuracy
+	            precision
+	            mastery
+	            sharpness
+	            pain
+	            savagery
+	            death
+	            hardening
+	            imperviousness
+	            immunity
+	            skill
+	            fortitude
+	            blacksmith’s
+	            permanence
+	            enchantment
 
 [restore-effect] healing
-	mana
-	rejuvenation
-	chi
+	         mana
+	         rejuvenation
+	         chi
 
 [gas-type] rancid
-	choking
-	strangling
+	   choking
+	   strangling
diff --git a/RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram b/RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram
index 3ea3034..25eb8a2 100755
--- a/RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram
+++ b/RGens/data/sample-grammars/diablo-ii/diabloiiprefixes.gram
@@ -1,173 +1,172 @@
 [prefix] [armor-class]
-	[saving-throw]
-	[foe-reaction]
-	[skill-improve]
-	[cursed]
-	[visibility]
-	[castability]
-	[magical-effect]
-	[personal-stat]
-	[to-hit]
-	[extra-damage]
-	[to-hit-damage]
-	[item-charges]
+	 [saving-throw]
+	 [foe-reaction]
+	 [skill-improve]
+	 [cursed]
+	 [visibility]
+	 [castability]
+	 [magical-effect]
+	 [personal-stat]
+	 [to-hit]
+	 [extra-damage]
+	 [to-hit-damage]
+	 [item-charges]
 
 pragma export-rule [prefix]
 
 [armor-class] sturdy
-	fine
-	strong
-	grand
-	valiant
-	glorious
-	blessed
-	awesome
-	saintly
-	holy
-	godly
+	      fine
+	      strong
+	      grand
+	      valiant
+	      glorious
+	      blessed
+	      awesome
+	      saintly
+	      holy
+	      godly
 
 [saving-throw] tawny
-	azure
-	crimson
-	ocher
-	pearl
-	beryl
-	coal
-	jasmine
-	lapis
-	burgundy
-	tangerine
-	ivory
-	jade
-	jet
-	pyrite
-	cobalt
-	garnet
-	coral
-	crystal
-	viridian
-	ebony
-	crysolite
-	sapphire
-	ruby
-	amber
-	diamond
-	emerald
-	obsidian
-	topaz
-	prismatic
-	bond
+	       azure
+	       crimson
+	       ocher
+	       pearl
+	       beryl
+	       coal
+	       jasmine
+	       lapis
+	       burgundy
+	       tangerine
+	       ivory
+	       jade
+	       jet
+	       pyrite
+	       cobalt
+	       garnet
+	       coral
+	       crystal
+	       viridian
+	       ebony
+	       crysolite
+	       sapphire
+	       ruby
+	       amber
+	       diamond
+	       emerald
+	       obsidian
+	       topaz
+	       prismatic
+	       bond
 
 [foe-reaction] subduing
-	wearying
-	phasing
-	depleting
-	howling
-	chaotic
-	subjugating
-	fatiguing
-	exhausting
-	overwhelming
+	       wearying
+	       phasing
+	       depleting
+	       howling
+	       chaotic
+	       subjugating
+	       fatiguing
+	       exhausting
+	       overwhelming
 
 [skill-improve] fletcher’s
-	slayer’s
-	summoner’s
-	monk’s
-	angel’s
-	archer’s
-	berserker’s
-	necromancer’s
-	priest’s
-	arch-angel’s
+	        slayer’s
+	        summoner’s
+	        monk’s
+	        angel’s
+	        archer’s
+	        berserker’s
+	        necromancer’s
+	        priest’s
+	        arch-angel’s
 
 [cursed] rusted
-	vulnerable
-	glass
-	hyena’s
-	frog’s
-	pitch
-	brass
-	tin
-	crystalline
-	weak
-	bent
-	useless
-	dull
-	clumsy
+	 vulnerable
+	 glass
+	 hyena’s
+	 frog’s
+	 pitch
+	 brass
+	 tin
+	 crystalline
+	 weak
+	 bent
+	 useless
+	 dull
+	 clumsy
 
 [visibility] glowing
-	oracular
-	unseen
-	hidden
-	veiled
-	stalking
+	     oracular
+	     unseen
+	     hidden
+	     veiled
+	     stalking
 
 [castability] lizard’s
-	spider’s
-	raven’s
-	snake’s
-	serpent’s
-	drake’s
-	dragon’s
-	worm’s
-	hydra’s
-	devious
-	fortified
-	vulpine
+	      spider’s
+	      raven’s
+	      snake’s
+	      serpent’s
+	      drake’s
+	      dragon’s
+	      worm’s
+	      hydra’s
+	      devious
+	      fortified
+	      vulpine
 
 [magical-effect] extending
-	chrono
-	augmenting
-	catalyzing
+	         chrono
+	         augmenting
+	         catalyzing
 
 [personal-stat] blue
-	red
-	orange
-	white
-	black
-	tough
-	swift
-	brilliant
-	mighty
-	vibrant
-	forceful
-	resilient
-	silver
-	muscular
-	healthy
+	        red
+	        orange
+	        white
+	        black
+	        tough
+	        swift
+	        brilliant
+	        mighty
+	        vibrant
+	        forceful
+	        resilient
+	        silver
+	        muscular
+	        healthy
 
 [to-hit] bronze
-	iron
-	silver
-	steel
-	gold
-	platinum
-	mithril
-	meteoric
-	weird
+	 iron
+	 silver
+	 steel
+	 gold
+	 platinum
+	 mithril
+	 meteoric
+	 weird
 
 [extra-damage] jagged
-	deadly
-	vicious
-	heavy
-	brutal
-	massive
-	savage
-	ruthless
-	merciless
+	       deadly
+	       vicious
+	       heavy
+	       brutal
+	       massive
+	       savage
+	       ruthless
+	       merciless
 
 [to-hit-damage] sharp
-	fine
-	warrior’s
-	soldier’s
-	knight’s
-	master’s
-	doppelganger’s
-	lord’s
-	champion’s
-	king’s
+	        fine
+	        warrior’s
+	        soldier’s
+	        knight’s
+	        master’s
+	        doppelganger’s
+	        lord’s
+	        champion’s
+	        king’s
 
 [item-charges] plentiful
-	jester’s
-	bountiful
-	
+	       jester’s
+	       bountiful
diff --git a/RGens/data/sample-grammars/diablo-ii/diabloiisuffixes.gram b/RGens/data/sample-grammars/diablo-ii/diabloiisuffixes.gram
index 80aec16..b2f2d44 100755
--- a/RGens/data/sample-grammars/diablo-ii/diabloiisuffixes.gram
+++ b/RGens/data/sample-grammars/diablo-ii/diabloiisuffixes.gram
@@ -1,218 +1,218 @@
 [suffix] [damage-reduction]
-	[defense-effect]
-	[durability]
-	[hitpoints]
-	[ability-scores]
-	[cursed]
-	[recovery]
-	[memorization]
-	[combat-action]
-	[treasure-finder]
-	[light-source]
-	[hazard-reduction]
-	[damage-increase]
-	[min-damage]
-	[attack-speed]
-	[attack-effect]
-	[attack-restore]
-	[item-damage]
-	[weapon-proficency]
-	[weapon-use]
-	[spell-casting]
+	 [defense-effect]
+	 [durability]
+	 [hitpoints]
+	 [ability-scores]
+	 [cursed]
+	 [recovery]
+	 [memorization]
+	 [combat-action]
+	 [treasure-finder]
+	 [light-source]
+	 [hazard-reduction]
+	 [damage-increase]
+	 [min-damage]
+	 [attack-speed]
+	 [attack-effect]
+	 [attack-restore]
+	 [item-damage]
+	 [weapon-proficency]
+	 [weapon-use]
+	 [spell-casting]
 
 pragma export-rule [suffix]
 
 [damage-reduction] health
-	protection
-	absorption
-	life
-	deflection
+	           protection
+	           absorption
+	           life
+	           deflection
 
 [defense-effect] thorns
-	spikes
-	blocking
+	         spikes
+	         blocking
 
 [durability] sturdiness
-	structure
-	the ages
-	bonding
-	unity
+	     structure
+	     the ages
+	     bonding
+	     unity
 
 [hitpoints] the [hitpoints-act]
 
 [hitpoints-act] jackal
-	fox
-	jaguar
-	wolf
-	eagle
-	tiger
-	lion
-	mammoth
-	whale
-	colossus
+	        fox
+	        jaguar
+	        wolf
+	        eagle
+	        tiger
+	        lion
+	        mammoth
+	        whale
+	        colossus
 
 [ability-scores] vitality
-	dexterity
-	magic
-	strength
-	the lynx
-	zest
-	skill
-	the mind
-	might
-	the leopard
-	vim
-	accuracy
-	brilliance
-	power
-	the jaguar
-	vigor
-	precision
-	sorcery
-	the giant
-	the tiger
-	life
-	perfection
-	wizardry
-	the titan
-	the lion
-	the sky
-	the moon
-	the stars
-	the heavens
-	the zodiac
+	         dexterity
+	         magic
+	         strength
+	         the lynx
+	         zest
+	         skill
+	         the mind
+	         might
+	         the leopard
+	         vim
+	         accuracy
+	         brilliance
+	         power
+	         the jaguar
+	         vigor
+	         precision
+	         sorcery
+	         the giant
+	         the tiger
+	         life
+	         perfection
+	         wizardry
+	         the titan
+	         the lion
+	         the sky
+	         the moon
+	         the stars
+	         the heavens
+	         the zodiac
 
 [cursed] tears
-	pain
-	brittleness
-	decay
-	fragility
-	the vulture
-	disease
-	atrophy
-	dyslexia
-	weakness
-	the cat
-	the pit
-	illness
-	paralysis
-	draining
-	frailty
-	the rat
-	trouble
-	pox
-	corruption
-	infection
-	ruin
-	the exposed
-	discord
-	the night
-	the dark
-	the void
-	passivity
-	snail
-	fool
+	 pain
+	 brittleness
+	 decay
+	 fragility
+	 the vulture
+	 disease
+	 atrophy
+	 dyslexia
+	 weakness
+	 the cat
+	 the pit
+	 illness
+	 paralysis
+	 draining
+	 frailty
+	 the rat
+	 trouble
+	 pox
+	 corruption
+	 infection
+	 ruin
+	 the exposed
+	 discord
+	 the night
+	 the dark
+	 the void
+	 passivity
+	 snail
+	 fool
 
 [recovery] regeneration
-	regrowth
+	   regrowth
 
 [memorization] warding
-	the sentinel
-	guarding
-	negation
-	osmosis
+	       the sentinel
+	       guarding
+	       negation
+	       osmosis
 
 [combat-action] the apprentice
-	the magus
-	balance
-	stability
-	harmony
+	        the magus
+	        balance
+	        stability
+	        harmony
 
 [treasure-finder] greed
-	chance
-	wealth
-	fortune
+	          chance
+	          wealth
+	          fortune
 
 [light-source] light
-	radiance
-	the sun
+	       radiance
+	       the sun
 
 [hazard-reduction] the thief
-	warmth
-	remedy
-	amelioration
-	defiance
-	purging
+	           warmth
+	           remedy
+	           amelioration
+	           defiance
+	           purging
 
 [damage-increase] craftsmanship
-	quality
-	maiming
-	slaying
-	gore
-	devestation
-	the jester
-	carnage
-	slaughter
+	          quality
+	          maiming
+	          slaying
+	          gore
+	          devestation
+	          the jester
+	          carnage
+	          slaughter
 
 [min-damage] measure
-	worth
-	excellence
-	performance
+	     worth
+	     excellence
+	     performance
 
 [attack-speed] readiness
-	alacrity
-	swiftness
-	quickness
-	speed
-	haste
+	       alacrity
+	       swiftness
+	       quickness
+	       speed
+	       haste
 
 [attack-effect] frost
-	flame
-	shock
-	blight
-	ice
-	fire
-	lightning
-	venom
-	the glacier
-	burning
-	thunder
-	pestilence
-	vileness
-	the crusaders
-	destruction
-	peril
-	the bear
-	the grizzly
+	        flame
+	        shock
+	        blight
+	        ice
+	        fire
+	        lightning
+	        venom
+	        the glacier
+	        burning
+	        thunder
+	        pestilence
+	        vileness
+	        the crusaders
+	        destruction
+	        peril
+	        the bear
+	        the grizzly
 
 [attack-restore] the leech
-	the claw
-	the bat
-	blood
-	the talon
-	the vampire
-	the lamprey
+	         the claw
+	         the bat
+	         blood
+	         the talon
+	         the vampire
+	         the lamprey
 
 [item-damage] piercing
-	breaking
-	puncturing
-	smashing
-	bashing
+	      breaking
+	      puncturing
+	      smashing
+	      bashing
 
 [weapon-proficency] ease
-	simplicity
+	            simplicity
 
 [weapon-use] many
-	plenty
+	     plenty
 
 [spell-casting] [spell-number] magic
 
 [spell-number] 1st
-	2nd
-	3rd
-	4th
-	5th
-	6th
-	7th
-	8th
-	9th
+	       2nd
+	       3rd
+	       4th
+	       5th
+	       6th
+	       7th
+	       8th
+	       9th
diff --git a/RGens/data/sample-grammars/zadrons-pouch.gram b/RGens/data/sample-grammars/zadrons-pouch.gram
index ae41cee..866bea5 100755
--- a/RGens/data/sample-grammars/zadrons-pouch.gram
+++ b/RGens/data/sample-grammars/zadrons-pouch.gram
@@ -1,6 +1,6 @@
 [zadrons-pouch] → [zadrons-item]
                   [zadrons-item] and a [zadrons-item]
-                  [zadrons-item] and a  [zadrons-item] as well as a [zadrons-item]
+                  [zadrons-item] and a [zadrons-item] as well as a [zadrons-item]
                   [zadrons-item] or [zadrons-item]
                   [zadrons-item] or [zadrons-item] or maybe [zadrons-item]