diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2019-09-28 14:45:38 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2019-09-28 14:45:38 -0700 |
| commit | 03d4e6b9ef87d4e6ed018c93b358f8557f8f7388 (patch) | |
| tree | 48a323c8c0371d44480e41dbe1be0da6cd44d8ae /src | |
| parent | 63a1e05dd1eb041aee55a5c5c4d0d84a035348b2 (diff) | |
| download | pandoc-03d4e6b9ef87d4e6ed018c93b358f8557f8f7388.tar.gz | |
More throwError in place of fail.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Text/Pandoc/Writers/Docx.hs | 1 | ||||
| -rw-r--r-- | src/Text/Pandoc/Writers/Muse.hs | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs index 30c604058..73ed095c1 100644 --- a/src/Text/Pandoc/Writers/Docx.hs +++ b/src/Text/Pandoc/Writers/Docx.hs @@ -95,6 +95,7 @@ instance Semigroup EnvProps where instance Monoid EnvProps where mempty = EnvProps Nothing [] + mappend = (<>) squashProps :: EnvProps -> [Element] squashProps (EnvProps Nothing es) = es diff --git a/src/Text/Pandoc/Writers/Muse.hs b/src/Text/Pandoc/Writers/Muse.hs index 43f7f3b14..51a9ea7d6 100644 --- a/src/Text/Pandoc/Writers/Muse.hs +++ b/src/Text/Pandoc/Writers/Muse.hs @@ -629,7 +629,8 @@ inlineToMuse (Code _ str) = do then "<code>" <> text (substitute "</code>" "<</code><code>/code>" str) <> "</code>" else "=" <> text str <> "=" inlineToMuse Math{} = - Prelude.fail "Math should be expanded before normalization" + throwError $ PandocShouldNeverHappenError + "Math should be expanded before normalization" inlineToMuse (RawInline (Format f) str) = do modify $ \st -> st { stUseTags = False } return $ "<literal style=\"" <> text f <> "\">" <> text str <> "</literal>" |