git.iko.soy/typeable/pandoc
on master help sign in
Replace "emacs" extension with "amuse" extension

It makes clear that extension is related to Muse markup.

commit3a83b3843db6434e9806558ea1e912055d5baf04 authorAlexander Krotov <ilabdsf@gmail.com> dateMon 13 Nov 2017, 18:41 (9 years ago) parente5e8350
4 files changed+12−11
compare with master
unifiedsplit
src/Text/Pandoc/Extensions.hs+4−1 src/Text/Pandoc/Readers/Muse.hs+1−1 test/Tests/Readers/Muse.hs+4−8 test/Tests/Writers/Muse.hs+3−1
src/Text/Pandoc/Extensions.hs+4−1
@@ -153,7 +153,7 @@ data Extension =
153153 | Ext_smart -- ^ "Smart" quotes, apostrophes, ellipses, dashes
154154 | Ext_old_dashes -- ^ -- = em, - before number = en
155155 | Ext_spaced_reference_links -- ^ Allow space between two parts of ref link
156− | Ext_emacs -- ^ Try to emulate Emacs Muse instead of Amusewiki
156+ | Ext_amuse -- ^ Enable Text::Amuse extensions to Emacs Muse markup
157157 deriving (Show, Read, Enum, Eq, Ord, Bounded, Data, Typeable, Generic)
158158
159159instance ToJSON Extension where
@@ -315,6 +315,9 @@ getDefaultExtensions "markdown_phpextra" = phpMarkdownExtraExtensions
315315getDefaultExtensions "markdown_mmd" = multimarkdownExtensions
316316getDefaultExtensions "markdown_github" = githubMarkdownExtensions
317317getDefaultExtensions "markdown" = pandocExtensions
318+getDefaultExtensions "muse" = extensionsFromList
319+ [Ext_amuse,
320+ Ext_auto_identifiers]
318321getDefaultExtensions "plain" = plainExtensions
319322getDefaultExtensions "gfm" = githubMarkdownExtensions
320323getDefaultExtensions "org" = extensionsFromList
src/Text/Pandoc/Readers/Muse.hs+1−1
@@ -423,7 +423,7 @@ definitionListItem = try $ do
423423 pure $ do lineContent' <- lineContent
424424 pure (B.text term, [lineContent'])
425425 where
426− termParser = (guardEnabled Ext_emacs <|> void spaceChar) >> -- Initial space is required by Amusewiki, but not Emacs Muse
426+ termParser = (guardDisabled Ext_amuse <|> void spaceChar) >> -- Initial space is required by Amusewiki, but not Emacs Muse
427427 many spaceChar >>
428428 many1Till anyChar (lookAhead (void (try (spaceChar >> string "::")) <|> void newline))
429429 endOfInput = try $ skipMany blankline >> skipSpaces >> eof
test/Tests/Readers/Muse.hs+4−8
@@ -10,20 +10,16 @@ import Text.Pandoc
1010import Text.Pandoc.Arbitrary ()
1111import Text.Pandoc.Builder
1212
13−muse :: Text -> Pandoc
14−muse = purely $ \s -> do
15− setInputFiles ["in"]
16− setOutputFile (Just "out")
17− readMuse def s
13+amuse :: Text -> Pandoc
14+amuse = purely $ readMuse def { readerExtensions = extensionsFromList [Ext_amuse]}
1815
1916emacsMuse :: Text -> Pandoc
20−emacsMuse = purely $ readMuse def { readerExtensions =
21− enableExtension Ext_emacs pandocExtensions }
17+emacsMuse = purely $ readMuse def { readerExtensions = emptyExtensions }
2218
2319infix 4 =:
2420(=:) :: ToString c
2521 => String -> (Text, c) -> TestTree
26−(=:) = test muse
22+(=:) = test amuse
2723
2824spcSep :: [Inlines] -> Inlines
2925spcSep = mconcat . intersperse space
test/Tests/Writers/Muse.hs+3−1
@@ -8,7 +8,9 @@ import Text.Pandoc.Arbitrary ()
88import Text.Pandoc.Builder
99
1010muse :: (ToPandoc a) => a -> String
11−muse = museWithOpts def{ writerWrapText = WrapNone }
11+muse = museWithOpts def{ writerWrapText = WrapNone,
12+ writerExtensions = extensionsFromList [Ext_amuse,
13+ Ext_auto_identifiers] }
1214
1315museWithOpts :: (ToPandoc a) => WriterOptions -> a -> String
1416museWithOpts opts = unpack . purely (writeMuse opts) . toPandoc