deprioritize whitespace

3 files changed, 12 insertions, 12 deletions

diff --git a/def_LinkLabel.py b/def_LinkLabel.py
index cefebce..be8afcb 100755
--- a/def_LinkLabel.py
+++ b/def_LinkLabel.py
@@ -9,9 +9,9 @@ from railroad import *
 Diagram(
 	Start("complex"),
 	"[",
-	Choice(0, (NonTerminal("_")), Skip()),
+	Optional(NonTerminal("_"), True),
 	NonTerminal("![\\[\\]] PlainWords"),
-	Choice(0, (NonTerminal("_")), Skip()),
+	Optional(NonTerminal("_"), True),
 	"]",
 	End("complex")
 ).writeStandalone(
diff --git a/def_LinkTitle.py b/def_LinkTitle.py
index 7894593..ebedb3a 100755
--- a/def_LinkTitle.py
+++ b/def_LinkTitle.py
@@ -11,23 +11,23 @@ Diagram(
 	Choice(0,
 		Sequence(
 			'"',
-			Choice(0, (NonTerminal("_")), Skip()),
+			Optional(NonTerminal("_"), True),
 			NonTerminal("!'\"' PlainWords"),
-			Choice(0, (NonTerminal("_")), Skip()),
+			Optional(NonTerminal("_"), True),
 			'"',
 		),
 		Sequence(
 			"'",
-			Choice(0, (NonTerminal("_")), Skip()),
+			Optional(NonTerminal("_"), True),
 			NonTerminal("!\"'\" PlainWords"),
-			Choice(0, (NonTerminal("_")), Skip()),
+			Optional(NonTerminal("_"), True),
 			"'",
 		),
 		Sequence(
 			"(",
-			Choice(0, (NonTerminal("_")), Skip()),
+			Optional(NonTerminal("_"), True),
 			NonTerminal("![()] PlainWords"),
-			Choice(0, (NonTerminal("_")), Skip()),
+			Optional(NonTerminal("_"), True),
 			")",
 		)
 	),
diff --git a/def__.py b/def__.py
index e687659..f688880 100755
--- a/def__.py
+++ b/def__.py
@@ -13,11 +13,11 @@ Diagram(
 			OneOrMore(NonTerminal("SPACE")),
 		),
 		Sequence(
-			Choice(0, (NonTerminal("SPACE")), Skip()),
+			Optional(NonTerminal("SPACE"), True),
 			NonTerminal("NEWLINE"),
-			Choice(0, (NonTerminal("SPACE")), Skip()),
-			Choice(0, (NonTerminal("SPACE")), Skip()),
-			Choice(0, (NonTerminal("SPACE")), Skip())
+			Optional(NonTerminal("SPACE"), True),
+			Optional(NonTerminal("SPACE"), True),
+			Optional(NonTerminal("SPACE"), True)
 		)
 	),
 	End("complex")