Org reader: generalize code block result parsing
Code blocks can be followed by optional result blocks, representing the output generated by running the code in the code block. It is possible to choose whether one wants to export the code, the result, both or none. This patch allows any kind of `Block` as the result. Previously, only example code blocks were recognized.
This commit is contained in:
parent
40fb102417
commit
b61355cecd
1 changed files with 3 additions and 3 deletions
|
@ -399,11 +399,11 @@ exportsResults :: [(String, String)] -> Bool
|
|||
exportsResults attrs = ("rundoc-exports", "results") `elem` attrs
|
||||
|| ("rundoc-exports", "both") `elem` attrs
|
||||
|
||||
followingResultsBlock :: OrgParser (Maybe String)
|
||||
followingResultsBlock :: OrgParser (Maybe (F Blocks))
|
||||
followingResultsBlock =
|
||||
optionMaybe (try $ blanklines *> stringAnyCase "#+RESULTS:"
|
||||
*> blankline
|
||||
*> (unlines <$> many1 exampleLine))
|
||||
*> block)
|
||||
|
||||
codeBlock :: BlockProperties -> OrgParser (F Blocks)
|
||||
codeBlock blkProp = do
|
||||
|
@ -418,7 +418,7 @@ codeBlock blkProp = do
|
|||
labelledBlck <- maybe (pure codeBlck)
|
||||
(labelDiv codeBlck)
|
||||
<$> lookupInlinesAttr "caption"
|
||||
let resultBlck = pure $ maybe mempty (exampleCode) resultsContent
|
||||
let resultBlck = fromMaybe mempty resultsContent
|
||||
return $ (if includeCode then labelledBlck else mempty)
|
||||
<> (if includeResults then resultBlck else mempty)
|
||||
where
|
||||
|
|
Loading…
Add table
Reference in a new issue