aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <[email protected]>2020-04-04 22:01:08 -0700
committerJohn MacFarlane <[email protected]>2020-05-14 09:00:35 -0700
commit466747c055e79e171d0f7b3a920055ba9281fcb8 (patch)
treee25820301f9851738b7fda04258973ee8f9219a4
parent106bd76648422d46f78cfb6f175b3bc271d444f7 (diff)
Use latest commonmark-hs.
Fixes ascii identifiers.
-rw-r--r--src/Text/Pandoc/Readers/CommonMark.hs6
-rw-r--r--stack.yaml2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Readers/CommonMark.hs b/src/Text/Pandoc/Readers/CommonMark.hs
index 65c6a1e53..1583eac68 100644
--- a/src/Text/Pandoc/Readers/CommonMark.hs
+++ b/src/Text/Pandoc/Readers/CommonMark.hs
@@ -55,7 +55,11 @@ readCommonMark opts s = do
[ autolinkSpec | isEnabled Ext_autolink_bare_uris opts ] ++
[ emojiSpec | isEnabled Ext_emoji opts ] ++
[ autoIdentifiersSpec
- | isEnabled Ext_gfm_auto_identifiers opts ] ++
+ | isEnabled Ext_gfm_auto_identifiers opts
+ , not (isEnabled Ext_ascii_identifiers opts) ] ++
+ [ autoIdentifiersAsciiSpec
+ | isEnabled Ext_gfm_auto_identifiers opts
+ , isEnabled Ext_ascii_identifiers opts ] ++
[ implicitHeadingReferencesSpec
| isEnabled Ext_implicit_header_references opts ] ++
[ footnoteSpec | isEnabled Ext_footnotes opts ] ++
diff --git a/stack.yaml b/stack.yaml
index 8391cf42a..865f0d329 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -31,7 +31,7 @@ extra-deps:
- HsYAML-aeson-0.2.0.0
- doctemplates-0.8.2
- git: https://github.com/jgm/commonmark-hs
- commit: de354a3cabd447ed04440ace17fe44a79a490eb4
+ commit: 42aa289c964b903e465918216fa16c30472e4bf2
subdirs:
- commonmark
- commonmark-extensions