e9ed483 · typeable/pandoc

git.iko.soy/typeable/pandoc

Muse writer: join code with different attributes during normalization

commite9ed4832edb1a9f9c3cd7b6c670c39f513444192 authorAlexander Krotov <ilabdsf@gmail.com> dateMon 22 Jan 2018, 16:27 (9 years ago) parent288065c

2 files changed+3−2

unifiedsplit

src/Text/Pandoc/Writers/Muse.hs+2−2

@@ -307,8 +307,8 @@ normalizeInlineList (Subscript x1 : Subscript x2 : ils)

307307 = normalizeInlineList $ Subscript (x1 ++ x2) : ils

308308normalizeInlineList (SmallCaps x1 : SmallCaps x2 : ils)

309309 = normalizeInlineList $ SmallCaps (x1 ++ x2) : ils

310−normalizeInlineList (Code a1 x1 : Code a2 x2 : ils) | a1 == a2

311− = normalizeInlineList $ Code a1 (x1 ++ x2) : ils

310+normalizeInlineList (Code _ x1 : Code _ x2 : ils)

311+ = normalizeInlineList $ Code nullAttr (x1 ++ x2) : ils

312312normalizeInlineList (RawInline f1 x1 : RawInline f2 x2 : ils) | f1 == f2

313313 = normalizeInlineList $ RawInline f1 (x1 ++ x2) : ils

314314normalizeInlineList (Span a1 x1 : Span a2 x2 : ils) | a1 == a2

test/Tests/Writers/Muse.hs+1

@@ -316,6 +316,7 @@ tests = [ testGroup "block elements"

316316 , testGroup "code"

317317 [ "simple" =: code "foo" =?> "<code>foo</code>"

318318 , "escape tag" =: code "<code>foo = bar</code> baz" =?> "<code><code>foo = bar<</code><code>/code> baz</code>"

319+ , "normalization with attributes" =: codeWith ("",["haskell"],[]) "foo" <> code "bar" =?> "<code>foobar</code>"

319320 , "normalization" =: code "</co" <> code "de>" =?> "<code><</code><code>/code></code>"

320321 ]

321322 , testGroup "spaces"