Update grammars

12 files changed, 43 insertions, 43 deletions

diff --git a/data/sample-grammars/24hr-rpg.gram b/data/sample-grammars/24hr-rpg.gram
index 19d58ce..484aa17 100755
--- a/data/sample-grammars/24hr-rpg.gram
+++ b/data/sample-grammars/24hr-rpg.gram
@@ -1,11 +1,11 @@
-[rpg-name] {@rpg-parts:=[rpg-part]} [act-rpg-name]
+[rpg-name] {@rpgparts:=[rpg-part]} [act-rpg-name]
 
-[act-rpg-name] [@rpg-parts] and [@rpg-parts]
-	[@rpg-parts] / [@rpg-parts]
-	[@rpg-parts] the [@rpg-parts]
-	[@rpg-parts] : [@rpg-parts] the [@rpg-parts]
-	[@rpg-parts] : [@rpg-parts] [@rpg-parts]
-	[@rpg-parts] , [@rpg-parts] and [@rpg-parts]
+[act-rpg-name] [@rpgparts] and [@rpgparts]
+	[@rpgparts] / [@rpgparts]
+	[@rpgparts] the [@rpgparts]
+	[@rpgparts] : [@rpgparts] the [@rpgparts]
+	[@rpgparts] : [@rpgparts] [@rpgparts]
+	[@rpgparts] , [@rpgparts] and [@rpgparts]
 
 [rpg-name-phrase] [quote-rpg-name] was just released
 	[quote-rpg-name] vs [quote-rpg-name] : which is better?
diff --git a/data/sample-grammars/address.gram b/data/sample-grammars/address.gram
index c269816..3ccb738 100755
--- a/data/sample-grammars/address.gram
+++ b/data/sample-grammars/address.gram
@@ -75,17 +75,17 @@ pragma suffix-with [street] [street-suffix]
 	w.
 	<^2> [cardinal]
 
-[street-suffix] [street|st.]
-	[road|rd.]
+[street-suffix] [street||st.]
+	[road||rd.]
 	way
-	[boulevard|blvd.]
-	[avenue|ave.]
+	[boulevard||blvd.]
+	[avenue||ave.]
 	place
 	plaza
 	court
 	drive
-	[highway|hwy.]
-	[parkway|pkwy.]
+	[highway||hwy.]
+	[parkway||pkwy.]
 	pike
 	bypass
 
diff --git a/data/sample-grammars/art-objects.gram b/data/sample-grammars/art-objects.gram
index 7f5aac2..a9ed5af 100755
--- a/data/sample-grammars/art-objects.gram
+++ b/data/sample-grammars/art-objects.gram
@@ -82,7 +82,7 @@ pragma export-rule [art-object]
 	[necklace-mat] necklace
 	gold bracelet studded with [rare-gem]
 	gold necklace adorned with [common-gem]
-	silver [tiara|crown] decorated with [common-gem]
+	silver [tiara||crown] decorated with [common-gem]
 	ivory comb with embedded [rare-gem]
 	gold vestments
 
diff --git a/data/sample-grammars/dungeondressing/abandoned.gram b/data/sample-grammars/dungeondressing/abandoned.gram
index 2102909..aecbee4 100755
--- a/data/sample-grammars/dungeondressing/abandoned.gram
+++ b/data/sample-grammars/dungeondressing/abandoned.gram
@@ -1,4 +1,4 @@
-[abandoned] while exploring the [{empty}|abandoned] [abandon-place] , a [abandon-person] sneaks up on you [abandon-motion] .
+[abandoned] while exploring the [{empty}||abandoned] [abandon-place] , a [abandon-person] sneaks up on you [abandon-motion] .
 
 pragma initial-rule [abandoned]
 
diff --git a/data/sample-grammars/dungeondressing/bedroom.gram b/data/sample-grammars/dungeondressing/bedroom.gram
index a6e4390..1f182c5 100755
--- a/data/sample-grammars/dungeondressing/bedroom.gram
+++ b/data/sample-grammars/dungeondressing/bedroom.gram
@@ -47,7 +47,7 @@ pragma prefix-with [bedroom-bed] [bed-prefix] [sacred-type]
 	jug of moonshine
 	<^8> [bed-aliveperson]
 
-[bedroom-lying] lying [on|in] it
+[bedroom-lying] lying [on||in] it
 	draped atop it
 	prostrated before it
 	[tied] to it
@@ -165,7 +165,7 @@ pragma prefix-with [bed-arist] kidnapped
 	mannequin
 	puppet
 
-pragma prefix-with [bed-doll] [sex|sexy] [realism]
+pragma prefix-with [bed-doll] [sex||sexy] [realism]
 
 [realism] realistic
 	unrealistic
diff --git a/data/sample-grammars/fantasy-locations.gram b/data/sample-grammars/fantasy-locations.gram
index 32ab26f..95e31a8 100755
--- a/data/sample-grammars/fantasy-locations.gram
+++ b/data/sample-grammars/fantasy-locations.gram
@@ -28,11 +28,11 @@ pragma initial-rule [fantasy-location-name]
 	drowsy
 	dry
 	dusty
-	[ebon|ebony]
+	[ebon||ebony]
 	emerald
 	fleet
 	fire
-	[gold|golden]
+	[gold||golden]
 	good
 	grace
 	grand
@@ -47,7 +47,7 @@ pragma initial-rule [fantasy-location-name]
 	holy
 	honey
 	hot
-	[ice|icy]
+	[ice||icy]
 	iron
 	ivory
 	lilac
@@ -56,16 +56,16 @@ pragma initial-rule [fantasy-location-name]
 	maple
 	mighty
 	night
-	[oak|oaken]
+	[oak||oaken]
 	onyx
 	peaceful
 	pearl
 	prancing
 	quartz
 	queens
-	[rain|rainy]
+	[rain||rainy]
 	red
-	[rose|rosy]
+	[rose||rosy]
 	royal
 	ruby
 	sable
@@ -77,7 +77,7 @@ pragma initial-rule [fantasy-location-name]
 	shale
 	shining
 	short
-	[silk|silken]
+	[silk||silken]
 	silver
 	sleeping
 	small
diff --git a/data/sample-grammars/long-data/cards.gram b/data/sample-grammars/long-data/cards.gram
index c82efbc..1888be5 100755
--- a/data/sample-grammars/long-data/cards.gram
+++ b/data/sample-grammars/long-data/cards.gram
@@ -21,15 +21,15 @@ pragma export-rule [playing-card]
 	queen
 	ace
 
-[playing-rank-num] [2|deuce|two]
-	[3|three]
-	[4|four]
-	[5|five]
-	[6|six]
-	[7|seven]
-	[8|eight]
-	[9|nine]
-	[10|ten]
+[playing-rank-num] [2||deuce||two]
+	[3||three]
+	[4||four]
+	[5||five]
+	[6||six]
+	[7||seven]
+	[8||eight]
+	[9||nine]
+	[10||ten]
 
 [tarot-card] [minor-arcana]
 	[major-arcana]
diff --git a/data/sample-grammars/long-data/letters.gram b/data/sample-grammars/long-data/letters.gram
index 8d66436..3c1440a 100755
--- a/data/sample-grammars/long-data/letters.gram
+++ b/data/sample-grammars/long-data/letters.gram
@@ -125,6 +125,6 @@ pragma export-rule [letter]
 
 pragma export-rule [middle-initial]
 
-[vowel] [a|e|i|o|u]
+[vowel] [a||e||i||o||u]
 
 pragma export-rule [vowel]
diff --git a/data/sample-grammars/rtwiki/color.gram b/data/sample-grammars/rtwiki/color.gram
index b991452..87aaae2 100755
--- a/data/sample-grammars/rtwiki/color.gram
+++ b/data/sample-grammars/rtwiki/color.gram
@@ -67,7 +67,7 @@ pragma export-rule [sw-complete-color]
 	ivory
 	white
 	blue-gray
-	[gray|grey]
+	[gray||grey]
 	black
 	ebony
 	copper
@@ -83,7 +83,7 @@ pragma export-rule [sw-complete-color]
 	opalescent
 	rainbow
 
-[mw-standard] [%iridescent|%opalescent|%ombre|%rainbow]
+[mw-standard] [%iridescent||%opalescent||%ombre||%rainbow]
 
 [iridescent] <^2> iridescent [color]
 	iridescent between [color] and [color]
diff --git a/data/sample-grammars/rtwiki/favorite.gram b/data/sample-grammars/rtwiki/favorite.gram
index aa16f98..47141f0 100755
--- a/data/sample-grammars/rtwiki/favorite.gram
+++ b/data/sample-grammars/rtwiki/favorite.gram
@@ -1,4 +1,4 @@
-[favorite-food] My favorite foods are [apple|banana|cherry] , [vegetable] and [meat]
+[favorite-food] My favorite foods are [apple||banana||cherry] , [vegetable] and [meat]
 
 pragma initial-rule [favorite-food]
 
diff --git a/data/sample-grammars/superhero.gram b/data/sample-grammars/superhero.gram
index c463821..b9fab59 100755
--- a/data/sample-grammars/superhero.gram
+++ b/data/sample-grammars/superhero.gram
@@ -286,11 +286,11 @@ pragma suffix-with [third-part] [fifth-part]
 	Night
 	Eclipse
 
-[arcana] [%tarot-card|%alt-tarot-card]
+[arcana] [%tarot-card||%alt-tarot-card]
 	Minor Arcana
 	Major Arcana
 	<^3> [ordinal-arcana]
 
 [ordinal-arcana] {empty}
 
-pragma prefix-with [ordinal-arcana] Arcana [%ordinal|%ordinal-roman|%ordinal-number]
+pragma prefix-with [ordinal-arcana] Arcana [%ordinal||%ordinal-roman||%ordinal-number]
diff --git a/data/sample-grammars/vaultsofnagoh/turboghoul-hats.gram b/data/sample-grammars/vaultsofnagoh/turboghoul-hats.gram
index b4a3861..7632b94 100755
--- a/data/sample-grammars/vaultsofnagoh/turboghoul-hats.gram
+++ b/data/sample-grammars/vaultsofnagoh/turboghoul-hats.gram
@@ -28,11 +28,11 @@ pragma suffix-with [turboghoul-hat] [eyeholes]
 	hockey
 	tights
 
-[headscarf] [flowery|bedouin] headscarf
+[headscarf] [flowery||bedouin] headscarf
 
-[hood] [liripided|monastic] hood
+[hood] [liripided||monastic] hood
 
-[turban] [elaborate|simple] turban
+[turban] [elaborate||simple] turban
 
 [hat] [hat-type] hat
 	[hat-type] hat with bandana
@@ -41,7 +41,7 @@ pragma suffix-with [turboghoul-hat] [eyeholes]
 	fancy feathered
 	wizard's pointy
 
-[helmet] [helmet-type] [helm|helmet]
+[helmet] [helmet-type] [helm||helmet]
 
 [helmet-type] monstrous skull
 	common