fix Sequence-wrap OneOrMore()

3 files changed, 13 insertions, 9 deletions

diff --git a/syntax/def_Paragraph.py b/syntax/def_Paragraph.py
index 3383804..24e77fe 100755
--- a/syntax/def_Paragraph.py
+++ b/syntax/def_Paragraph.py
@@ -9,13 +9,13 @@ Diagram(
 	NonTerminal("Words"),
 	Choice(0,
 		OneOrMore(
-			NonTerminal("HardBreak"),
-			NonTerminal("Words")
+			Sequence(
+				NonTerminal("HardBreak"),
+				NonTerminal("Words")
+			)
 		),
 		Skip()
 	),
-	OneOrMore(
-		NonTerminal("NEWLINE")
-	),
+	OneOrMore(NonTerminal("NEWLINE")),
 	type="complex"
 ).writeStandalone(sys.stdout.write)
diff --git a/syntax/def_PlainWords.py b/syntax/def_PlainWords.py
index 735595b..4af2d12 100755
--- a/syntax/def_PlainWords.py
+++ b/syntax/def_PlainWords.py
@@ -9,8 +9,10 @@ Diagram(
 	NonTerminal("PRINTABLES"),
 	Choice(0,
 		OneOrMore(
-			NonTerminal("_"),
-			NonTerminal("PRINTABLES")
+			Sequence(
+				NonTerminal("_"),
+				NonTerminal("PRINTABLES")
+			)
 		),
 		Skip()
 	),
diff --git a/syntax/def_SemWords.py b/syntax/def_SemWords.py
index 2a2af8f..dbf2a1d 100755
--- a/syntax/def_SemWords.py
+++ b/syntax/def_SemWords.py
@@ -9,8 +9,10 @@ Diagram(
 	NonTerminal("SemWord"),
 	Choice(0,
 		OneOrMore(
-			NonTerminal("_"),
-			NonTerminal("SemWord")
+			Sequence(
+				NonTerminal("_"),
+				NonTerminal("SemWord")
+			)
 		),
 		Skip()
 	),