Rework emphasis & strong

aarroyoc · Jan 18, 2023 · f919cd9 · f919cd9
1 parent 5e89729
commit f919cd9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/djota.pl b/djota.pl
@@ -435,42 +435,38 @@
 
 emphasis_ast_([emphasis(InlineAst)|Ast0]) -->
     ( ("_", look_ahead(T), { T \= ' ' }) | "{_" ),
-    inline_text_ast_(InlineAst),
+    seq(Inline),
+    "_",
     {
-	append(_, [End], InlineAst),
-	(
-	    End = str(StrEnd) ->
-	    ( append(_, [EndChar], StrEnd), EndChar \= ' ' )
-	;   true
-	)
+	append(_, [G], Inline),
+	G \= ' ',
+	inline_text_ast(Inline, InlineAst)
     },
-    "_",
     inline_text_ast_(Ast0).
 
 emphasis_ast_([emphasis(InlineAst)|Ast0]) -->
     ( ("_", look_ahead(T), { T \= ' ' }) | "{_" ),
-    inline_text_ast_(InlineAst),
+    seq(Inline),
     "_}",
+    { inline_text_ast(Inline, InlineAst) },
     inline_text_ast_(Ast0).
 
 strong_ast_([strong(InlineAst)|Ast0]) -->
     ( ("*", look_ahead(T), { T \= ' ' }) | "{*" ),
-    inline_text_ast_(InlineAst),
+    seq(Inline),
+    "*",
     {
-	append(_, [End], InlineAst),
-	(
-	    End = str(StrEnd) ->
-	    ( append(_, [EndChar], StrEnd), EndChar \= ' ' )
-	;   true
-	)
+	append(_, [G], Inline),
+	G \= ' ',
+	inline_text_ast(Inline, InlineAst)
     },
-    "*",
     inline_text_ast_(Ast0).
 
 strong_ast_([strong(InlineAst)|Ast0]) -->
     ( ("*", look_ahead(T), { T \= ' ' }) | "{*" ),
-    inline_text_ast_(InlineAst),
+    seq(Inline),
     "*}",
+    { inline_text_ast(Inline, InlineAst) },
     inline_text_ast_(Ast0).
 
 verbatim_ast_([verbatim(Str)|Ast0]) -->

diff --git a/test.lgt b/test.lgt
@@ -44,7 +44,7 @@ test(strong_ast) :-
     djota:inline_text_ast("*HelloHello*Prolog*_!", [strong([str("HelloHello*Prolog")]),str("_!")]).
 
 test(emphasis_strong) :-
-    djota:djot("Hello _Prolog_! You said: _I *need* to_wake up__", "<p>Hello <em>Prolog<em>! You said: <em>I <strong>need</strong> to</em>wake up</em></em></p>").
+    djota:djot("Hello _Prolog_! You said: _I *need* to_wake up__", "<p>Hello <em>Prolog</em>! You said: <em>I <strong>need</strong> to</em>wake up__</p>").
 
 test(highlight_ast) :-
     djota:inline_text_ast("Hello {=Prolog=}!", [str("Hello "), highlight("Prolog"), str("!")]).