[ re #30 ] Allow shonkier programs in pandoc divs

msp-strath · Apr 10, 2020 · 672b949 · 672b949
1 parent ebc3a49
commit 672b949
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 6 deletions.
diff --git a/examples/template.html b/examples/template.html
@@ -24,13 +24,33 @@
   globalEnv["primNumToString"]["."] = VPrim("primNumToString",[]);
   globalEnv["primStringConcat"] = {};
   globalEnv["primStringConcat"]["."] = VPrim("primStringConcat",[]);
+  globalEnv["printList"] = {};
+  globalEnv["printList"]["."] = VFun(null,{},[],[Clause([Value(Cell("x","xs"))],Cell(Atom("Div"),Cell(Cell(Stringy(""),Cell(Atom(""),Cell(Atom(""),Atom("")))),Cell(Cell(Atom("BulletList"),Cell(Cell(Cell(Atom("Plain"),Cell(Cell(Atom("Span"),Cell(Cell(Stringy(""),Cell(Atom(""),Cell(Atom(""),Atom("")))),Cell("x",Atom("")))),Atom(""))),Atom("")),Atom(""))),Cell(Cell(Atom("Div"),Cell(Cell(Cell(Stringy(""),Cell(Cell(Stringy("mary"),Atom("")),Cell(Atom(""),Atom("")))),Cell(Atom(""),Cell(Atom(""),Atom("")))),Cell(App(GVar(".","printList"),["xs"]),Atom("")))),Atom("")))))),Clause([Value(Atom(""))],Cell(Atom("Div"),Cell(Cell(Stringy(""),Cell(Atom(""),Cell(Atom(""),Atom("")))),Atom(""))))]);
   </script>
 </head>
 <body>
 <form method="post">
 <div data-="">
 <p>This is a paragraph which uses <span data-="">a template</span>.</p>
 </div>
+<p>And the following is generated by <em>recursively</em> printing a list <code>["Hello" "World"]</code> as an itemised list.</p>
+<div data-="">
+<ul>
+<li><span data-="">Hello</span></li>
+</ul>
+<div data-="">
+<div data-="">
+<ul>
+<li><span data-="">World</span></li>
+</ul>
+<div data-="">
+<div data-="">
+
+</div>
+</div>
+</div>
+</div>
+</div>
 </form>
 </body>
 </html>
diff --git a/examples/template.mary b/examples/template.mary
@@ -5,3 +5,20 @@ This is a paragraph which uses `x`{.mary}.
 ```{.mary}
 foo("a template")
 ```
+
+And the following is generated by *recursively* printing
+a list `["Hello" "World"]` as an itemised list.
+
+::: {mary="printList([x|xs])"}
+* `x`{.mary}
+```{.mary}
+printList(xs)
+```
+:::
+
+::: {mary="printList([])"}
+:::
+
+```{.mary}
+printList(["Hello" "World"])
+```
diff --git a/src/Shonkier/Pandoc.hs b/src/Shonkier/Pandoc.hs
@@ -69,9 +69,8 @@ instance ToRawTerm Block where
     LineBlock ps      -> toListy "LineBlock" ps
     CodeBlock a@(b, cs, d) e
       | "mary" `elem` cs
-      , Right v <- parseOnly identifier e
-        -> toAfter1Listy "Div" (a, filter ("mary" /=) cs, d)
-                               [Var (Nothing, v) :: RawTerm]
+      , Right t <- parseOnly term e
+        -> toAfter1Listy "Div" (a, filter ("mary" /=) cs, d) [t]
       | otherwise
         -> toTakes2 "Code" a e
     CodeBlock a b     -> toTakes2 "CodeBlock" a b
@@ -95,9 +94,8 @@ instance ToRawTerm Inline where
     SmallCaps is   -> toListy "SmallCaps" is
     Code a@(b, cs, d) e
       | "mary" `elem` cs
-      , Right v <- parseOnly identifier e
-        -> toAfter1Listy "Span" (b, filter ("mary" /=) cs, d)
-                                [Var (Nothing, v) :: RawTerm]
+      , Right t <- parseOnly term e
+        -> toAfter1Listy "Span" (b, filter ("mary" /=) cs, d) [t]
       | otherwise
         -> toTakes2 "Code" a e
     SoftBreak      -> Atom "SoftBreak"