simplify Paragraph grammar

2 files changed, 14 insertions, 15 deletions

diff --git a/def.peg b/def.peg
index 163b5a4..b1cb09f 100644
--- a/def.peg
+++ b/def.peg
@@ -14,8 +14,8 @@ List           <- ([-*]+ / [[:digit:]]+ [).]) (SPACE+ (List / Words))?
                   NEWLINE
 LinkDefinition <- '[' !'[]' PlainWords ']:' SPACE Uri NEWLINE
                   SPACE SPACE '"' !'"' PlainWords '"' NEWLINE
-Paragraph      <- Words (SPACE? NEWLINE Words / HardBreak Words)*
-                  NEWLINE NEWLINE
+Paragraph      <- (Words (SPACE? NEWLINE / HardBreak))+
+                  NEWLINE+
 
 # Inline elements
 Words          <- StyledWords / LinkedWords / AnnotatedWords / PlainWords
diff --git a/def_Paragraph.py b/def_Paragraph.py
index 3513315..55ec343 100755
--- a/def_Paragraph.py
+++ b/def_Paragraph.py
@@ -8,22 +8,21 @@ from railroad import *
 
 Diagram(
 	Start("complex"),
-	NonTerminal("Words"),
-	ZeroOrMore(
-		Choice(0,
-			Sequence(
-				Optional(NonTerminal("SPACE")),
-				NonTerminal("NEWLINE"),
-				NonTerminal("Words")
-			),
-			Sequence(
+	Stack(
+		OneOrMore(Sequence(
+			NonTerminal("Words"),
+			Choice(0,
+				Sequence(
+					Optional(NonTerminal("SPACE")),
+					NonTerminal("NEWLINE"),
+				),
 				NonTerminal("HardBreak"),
-				NonTerminal("Words")
-			)
+			))
+		),
+		OneOrMore(
+			NonTerminal("NEWLINE")
 		)
 	),
-	NonTerminal("NEWLINE"),
-	OneOrMore(NonTerminal("NEWLINE")),
 	End("complex")
 ).writeStandalone(
 	open(splitext(basename(__file__))[0] + ".svg", "w").write)