Merge pull request #2266 from PromyLOPh/fieldinline
RST: Support inline markup for field list names
This commit is contained in:
John MacFarlane
commit
b587acb224
2 changed files with 49 additions and 31 deletions
|
|
@ -209,7 +209,7 @@ rawFieldListItem minIndent = try $ do
|
|||
fieldListItem :: Int -> RSTParser (Inlines, [Blocks])
|
||||
fieldListItem minIndent = try $ do
|
||||
(name, raw) <- rawFieldListItem minIndent
|
||||
let term = B.str name
|
||||
term <- parseInlineFromString name
|
||||
contents <- parseFromString parseBlocks raw
|
||||
optional blanklines
|
||||
return (term, [contents])
|
||||
|
|
@ -229,8 +229,7 @@ fieldList = try $ do
|
|||
lineBlock :: RSTParser Blocks
|
||||
lineBlock = try $ do
|
||||
lines' <- lineBlockLines
|
||||
lines'' <- mapM (parseFromString
|
||||
(trimInlines . mconcat <$> many inline)) lines'
|
||||
lines'' <- mapM parseInlineFromString lines'
|
||||
return $ B.para (mconcat $ intersperse B.linebreak lines'')
|
||||
|
||||
--
|
||||
|
|
@ -549,39 +548,33 @@ directive' = do
|
|||
"role" -> addNewRole top $ map (\(k,v) -> (k, trim v)) fields
|
||||
"container" -> parseFromString parseBlocks body'
|
||||
"replace" -> B.para <$> -- consumed by substKey
|
||||
parseFromString (trimInlines . mconcat <$> many inline)
|
||||
(trim top)
|
||||
parseInlineFromString (trim top)
|
||||
"unicode" -> B.para <$> -- consumed by substKey
|
||||
parseFromString (trimInlines . mconcat <$> many inline)
|
||||
(trim $ unicodeTransform top)
|
||||
parseInlineFromString (trim $ unicodeTransform top)
|
||||
"compound" -> parseFromString parseBlocks body'
|
||||
"pull-quote" -> B.blockQuote <$> parseFromString parseBlocks body'
|
||||
"epigraph" -> B.blockQuote <$> parseFromString parseBlocks body'
|
||||
"highlights" -> B.blockQuote <$> parseFromString parseBlocks body'
|
||||
"rubric" -> B.para . B.strong <$> parseFromString
|
||||
(trimInlines . mconcat <$> many inline) top
|
||||
"rubric" -> B.para . B.strong <$> parseInlineFromString top
|
||||
_ | label `elem` ["attention","caution","danger","error","hint",
|
||||
"important","note","tip","warning"] ->
|
||||
do let tit = B.para $ B.strong $ B.str label
|
||||
bod <- parseFromString parseBlocks $ top ++ "\n\n" ++ body'
|
||||
return $ B.blockQuote $ tit <> bod
|
||||
"admonition" ->
|
||||
do tit <- B.para . B.strong <$> parseFromString
|
||||
(trimInlines . mconcat <$> many inline) top
|
||||
do tit <- B.para . B.strong <$> parseInlineFromString top
|
||||
bod <- parseFromString parseBlocks body'
|
||||
return $ B.blockQuote $ tit <> bod
|
||||
"sidebar" ->
|
||||
do let subtit = maybe "" trim $ lookup "subtitle" fields
|
||||
tit <- B.para . B.strong <$> parseFromString
|
||||
(trimInlines . mconcat <$> many inline)
|
||||
tit <- B.para . B.strong <$> parseInlineFromString
|
||||
(trim top ++ if null subtit
|
||||
then ""
|
||||
else (": " ++ subtit))
|
||||
bod <- parseFromString parseBlocks body'
|
||||
return $ B.blockQuote $ tit <> bod
|
||||
"topic" ->
|
||||
do tit <- B.para . B.strong <$> parseFromString
|
||||
(trimInlines . mconcat <$> many inline) top
|
||||
do tit <- B.para . B.strong <$> parseInlineFromString top
|
||||
bod <- parseFromString parseBlocks body'
|
||||
return $ tit <> bod
|
||||
"default-role" -> mempty <$ updateState (\s ->
|
||||
|
|
@ -962,6 +955,9 @@ inline = choice [ whitespace
|
|||
, escapedChar
|
||||
, symbol ] <?> "inline"
|
||||
|
||||
parseInlineFromString :: String -> RSTParser Inlines
|
||||
parseInlineFromString = parseFromString (trimInlines . mconcat <$> many inline)
|
||||
|
||||
hyphens :: RSTParser Inlines
|
||||
hyphens = do
|
||||
result <- many1 (char '-')
|
||||
|
|
|
|||
|
|
@ -22,7 +22,8 @@ tests :: [Test]
|
|||
tests = [ "line block with blank line" =:
|
||||
"| a\n|\n| b" =?> para (str "a") <>
|
||||
para (str "\160b")
|
||||
, "field list" =: unlines
|
||||
, testGroup "field list"
|
||||
[ "general" =: unlines
|
||||
[ "para"
|
||||
, ""
|
||||
, ":Hostname: media08"
|
||||
|
|
@ -36,17 +37,17 @@ tests = [ "line block with blank line" =:
|
|||
, ":Parameter i: integer"
|
||||
, ":Final: item"
|
||||
, " on two lines" ]
|
||||
=?> ( doc
|
||||
$ para "para" <>
|
||||
definitionList [ (str "Hostname", [para "media08"])
|
||||
, (str "IP address", [para "10.0.0.19"])
|
||||
, (str "Size", [para "3ru"])
|
||||
, (str "Version", [para "1"])
|
||||
, (str "Indentation", [para "Since the field marker may be quite long, the second and subsequent lines of the field body do not have to line up with the first line, but they must be indented relative to the field name marker, and they must line up with each other."])
|
||||
, (str "Parameter i", [para "integer"])
|
||||
, (str "Final", [para "item on two lines"])
|
||||
])
|
||||
, "initial field list" =: unlines
|
||||
=?> ( doc
|
||||
$ para "para" <>
|
||||
definitionList [ (str "Hostname", [para "media08"])
|
||||
, (text "IP address", [para "10.0.0.19"])
|
||||
, (str "Size", [para "3ru"])
|
||||
, (str "Version", [para "1"])
|
||||
, (str "Indentation", [para "Since the field marker may be quite long, the second and subsequent lines of the field body do not have to line up with the first line, but they must be indented relative to the field name marker, and they must line up with each other."])
|
||||
, (text "Parameter i", [para "integer"])
|
||||
, (str "Final", [para "item on two lines"])
|
||||
])
|
||||
, "metadata" =: unlines
|
||||
[ "====="
|
||||
, "Title"
|
||||
, "====="
|
||||
|
|
@ -56,10 +57,31 @@ tests = [ "line block with blank line" =:
|
|||
, ""
|
||||
, ":Version: 1"
|
||||
]
|
||||
=?> ( setMeta "version" (para "1")
|
||||
$ setMeta "title" ("Title" :: Inlines)
|
||||
$ setMeta "subtitle" ("Subtitle" :: Inlines)
|
||||
$ doc mempty )
|
||||
=?> ( setMeta "version" (para "1")
|
||||
$ setMeta "title" ("Title" :: Inlines)
|
||||
$ setMeta "subtitle" ("Subtitle" :: Inlines)
|
||||
$ doc mempty )
|
||||
, "with inline markup" =: unlines
|
||||
[ ":*Date*: today"
|
||||
, ""
|
||||
, ".."
|
||||
, ""
|
||||
, ":*one*: emphasis"
|
||||
, ":two_: reference"
|
||||
, ":`three`_: another one"
|
||||
, ":``four``: literal"
|
||||
, ""
|
||||
, ".. _two: http://example.com"
|
||||
, ".. _three: http://example.org"
|
||||
]
|
||||
=?> ( setMeta "date" (str "today")
|
||||
$ doc
|
||||
$ definitionList [ (emph "one", [para "emphasis"])
|
||||
, (link "http://example.com" "" "two", [para "reference"])
|
||||
, (link "http://example.org" "" "three", [para "another one"])
|
||||
, (code "four", [para "literal"])
|
||||
])
|
||||
]
|
||||
, "URLs with following punctuation" =:
|
||||
("http://google.com, http://yahoo.com; http://foo.bar.baz.\n" ++
|
||||
"http://foo.bar/baz_(bam) (http://foo.bar)") =?>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue