More grammar consolidations

11 files changed, 205 insertions, 212 deletions

diff --git a/RGens/data/sample-grammars/long-data/character.gram b/RGens/data/sample-grammars/long-data/character.gram
deleted file mode 100644
index f8faa96..0000000
--- a/RGens/data/sample-grammars/long-data/character.gram
+++ /dev/null
@@ -1,40 +0,0 @@
-[character] 0
-	1
-	2
-	3
-	4
-	5
-	6
-	7
-	8
-	9
-	a
-	b
-	c
-	d
-	e
-	f
-	g
-	h
-	i
-	j
-	k
-	l
-	m
-	n
-	o
-	p
-	q
-	r
-	s
-	t
-	u
-	v
-	w
-	x
-	y
-	z
-	.
-	-
-
-pragma initial-rule [character]
diff --git a/RGens/data/sample-grammars/long-data/consonant-group.gram b/RGens/data/sample-grammars/long-data/consonant-group.gram
deleted file mode 100644
index d5480c8..0000000
--- a/RGens/data/sample-grammars/long-data/consonant-group.gram
+++ /dev/null
@@ -1,44 +0,0 @@
-[consonant-group] b
-	br
-	c
-	cl
-	ch
-	cr
-	d
-	dr
-	f
-	fl
-	fr
-	g
-	gl
-	gr
-	h
-	l
-	m
-	n
-	p
-	pl
-	ph
-	pr
-	s
-	st
-	sl
-	str
-	sm
-	sw
-	sp
-	sh
-	sc
-	sch
-	sn
-	t
-	th
-	tr
-	v
-	w
-	wr
-	x
-	y
-	z
-
-pragma initial-rule [consonant-group]
diff --git a/RGens/data/sample-grammars/long-data/consonant.gram b/RGens/data/sample-grammars/long-data/consonant.gram
deleted file mode 100644
index 35029f6..0000000
--- a/RGens/data/sample-grammars/long-data/consonant.gram
+++ /dev/null
@@ -1,23 +0,0 @@
-[consonant] b
-	c
-	d
-	f
-	g
-	h
-	j
-	k
-	l
-	m
-	n
-	p
-	q
-	r
-	s
-	t
-	v
-	w
-	x
-	y
-	z
-
-pragma initial-rule [consonant]
diff --git a/RGens/data/sample-grammars/long-data/last-syllable.gram b/RGens/data/sample-grammars/long-data/last-syllable.gram
deleted file mode 100644
index 13d572f..0000000
--- a/RGens/data/sample-grammars/long-data/last-syllable.gram
+++ /dev/null
@@ -1,11 +0,0 @@
-[last-syllable] on
-	ly
-	er
-	son
-	row
-	way
-	s
-	ton
-	dale
-
-pragma initial-rule [last-syllable]
diff --git a/RGens/data/sample-grammars/long-data/letter.gram b/RGens/data/sample-grammars/long-data/letter.gram
deleted file mode 100644
index 7617a45..0000000
--- a/RGens/data/sample-grammars/long-data/letter.gram
+++ /dev/null
@@ -1,28 +0,0 @@
-[letter] a
-	b
-	c
-	d
-	e
-	f
-	g
-	h
-	i
-	j
-	k
-	l
-	m
-	n
-	o
-	p
-	q
-	r
-	s
-	t
-	u
-	v
-	w
-	x
-	y
-	z
-
-pragma initial-rule [letter]
diff --git a/RGens/data/sample-grammars/long-data/letters.gram b/RGens/data/sample-grammars/long-data/letters.gram
new file mode 100644
index 0000000..f561b99
--- /dev/null
+++ b/RGens/data/sample-grammars/long-data/letters.gram
@@ -0,0 +1,134 @@
+[character] 0
+	1
+	2
+	3
+	4
+	5
+	6
+	7
+	8
+	9
+	a
+	b
+	c
+	d
+	e
+	f
+	g
+	h
+	i
+	j
+	k
+	l
+	m
+	n
+	o
+	p
+	q
+	r
+	s
+	t
+	u
+	v
+	w
+	x
+	y
+	z
+	.
+	-
+
+pragma export-rule [character]
+
+[consonant] b
+	c
+	d
+	f
+	g
+	h
+	j
+	k
+	l
+	m
+	n
+	p
+	q
+	r
+	s
+	t
+	v
+	w
+	x
+	y
+	z
+
+pragma export-rule [consonant]
+
+[last-syllable] on
+	ly
+	er
+	son
+	row
+	way
+	s
+	ton
+	dale
+
+pragma export-rule [last-syllable]
+
+[letter] a
+	b
+	c
+	d
+	e
+	f
+	g
+	h
+	i
+	j
+	k
+	l
+	m
+	n
+	o
+	p
+	q
+	r
+	s
+	t
+	u
+	v
+	w
+	x
+	y
+	z
+
+pragma export-rule [letter]
+
+[middle-initial] a
+	b
+	c
+	d
+	e
+	f
+	g
+	h
+	j
+	k
+	l
+	m
+	n
+	o
+	p
+	r
+	s
+	t
+
+pragma export-rule [middle-initial]
+
+[vowel] a
+	e
+	i
+	o
+	u
+
+pragma export-rule [vowel]
diff --git a/RGens/data/sample-grammars/long-data/middle-initial.gram b/RGens/data/sample-grammars/long-data/middle-initial.gram
deleted file mode 100644
index ed03f5a..0000000
--- a/RGens/data/sample-grammars/long-data/middle-initial.gram
+++ /dev/null
@@ -1,20 +0,0 @@
-[middle-initial] a
-	b
-	c
-	d
-	e
-	f
-	g
-	h
-	j
-	k
-	l
-	m
-	n
-	o
-	p
-	r
-	s
-	t
-
-pragma initial-rule [middle-initial]
diff --git a/RGens/data/sample-grammars/long-data/syllable.gram b/RGens/data/sample-grammars/long-data/syllables.gram
index 2c32cf6..925c2aa 100644
--- a/RGens/data/sample-grammars/long-data/syllable.gram
+++ b/RGens/data/sample-grammars/long-data/syllables.gram
@@ -1,4 +1,49 @@
-[syllable] → ab
+[consonant-group] b
+	br
+	c
+	cl
+	ch
+	cr
+	d
+	dr
+	f
+	fl
+	fr
+	g
+	gl
+	gr
+	h
+	l
+	m
+	n
+	p
+	pl
+	ph
+	pr
+	s
+	st
+	sl
+	str
+	sm
+	sw
+	sp
+	sh
+	sc
+	sch
+	sn
+	t
+	th
+	tr
+	v
+	w
+	wr
+	x
+	y
+	z
+
+pragma export-rule [consonant-group]
+
+[syllable] ab
 	ack
 	ag
 	ad
@@ -529,4 +574,25 @@
 	zar
 	zin
 
-pragma initial-rule [syllable]
+pragma export-rule [syllable]
+
+[vowel-group] a
+	ai
+	au
+	ar
+	e
+	ee
+	eu
+	er
+	i
+	ir
+	io
+	o
+	or
+	ou
+	oa
+	oo
+	u
+	ur
+
+pragma export-rule [vowel-group]
diff --git a/RGens/data/sample-grammars/long-data/vowel-group.gram b/RGens/data/sample-grammars/long-data/vowel-group.gram
deleted file mode 100644
index d72fd6f..0000000
--- a/RGens/data/sample-grammars/long-data/vowel-group.gram
+++ /dev/null
@@ -1,20 +0,0 @@
-[vowel-group] → a
-	ai
-	au
-	ar
-	e
-	ee
-	eu
-	er
-	i
-	ir
-	io
-	o
-	or
-	ou
-	oa
-	oo
-	u
-	ur
-
-pragma initial-rule [vowel-group]
diff --git a/RGens/data/sample-grammars/long-data/vowel.gram b/RGens/data/sample-grammars/long-data/vowel.gram
deleted file mode 100644
index cfa71cc..0000000
--- a/RGens/data/sample-grammars/long-data/vowel.gram
+++ /dev/null
@@ -1,7 +0,0 @@
-[vowel] → a
-	e
-	i
-	o
-	u
-
-pragma initial-rule [vowel]
diff --git a/RGens/data/server-config-sample.cfg b/RGens/data/server-config-sample.cfg
index 560506b..145971d 100644
--- a/RGens/data/server-config-sample.cfg
+++ b/RGens/data/server-config-sample.cfg
@@ -1,37 +1,23 @@
 # Load 'long rules' -- Grammars with one rule with a lot of cases
 animal            sample-grammars/long-data/animal.gram
-binary-digit      sample-grammars/long-data/binary-digit.gram
 canada-province   sample-grammars/long-data/canada-province.gram
 cards              sample-grammars/long-data/cards.gram
-character         sample-grammars/long-data/character.gram
 color             sample-grammars/long-data/color.gram
-consonant-group   sample-grammars/long-data/consonant-group.gram
-consonant         sample-grammars/long-data/consonant.gram
-digit-noone       sample-grammars/long-data/digit-noone.gram
-digit-twoup       sample-grammars/long-data/digit-twoup.gram
-digit-nozero      sample-grammars/long-data/digit-nozero.gram
-digit             sample-grammars/long-data/digit.gram
 first-name-female sample-grammars/long-data/first-name-female.gram
 first-name-male   sample-grammars/long-data/first-name-male.gram
 geographic-thing  sample-grammars/long-data/geographic-thing.gram
-hex-digit         sample-grammars/long-data/hex-digit.gram
 last-name         sample-grammars/long-data/last-name.gram
-last-syllable     sample-grammars/long-data/last-syllable.gram
-letter            sample-grammars/long-data/letter.gram
-middle-initial    sample-grammars/long-data/middle-initial.gram
+letters           sample-grammars/long-data/letters.gram
 nation            sample-grammars/long-data/nation.gram
-number-word       sample-grammars/long-data/number-word.gram
-ordinal           sample-grammars/long-data/ordinal.gram
+numbers           sample-grammars/long-data/numbers.gram
 planet            sample-grammars/long-data/planet.gram
 real-city         sample-grammars/long-data/real-city.gram
 real-company      sample-grammars/long-data/real-company.gram
 relative          sample-grammars/long-data/relative.gram
 roman-numeral     sample-grammars/long-data/roman-numeral.gram
-syllable          sample-grammars/long-data/syllable.gram
+syllables         sample-grammars/long-data/syllables.gram
 town-name         sample-grammars/long-data/town-name.gram
 tree              sample-grammars/long-data/tree.gram
-vowel-group       sample-grammars/long-data/vowel-group.gram
-vowel             sample-grammars/long-data/vowel.gram
 
 # Load grammars
 24hr-rpg           sample-grammars/24hr-rpg.gram