diff options
| -rw-r--r-- | src/Text/Pandoc/Writers/Muse.hs | 66 | ||||
| -rw-r--r-- | test/Tests/Writers/Muse.hs | 9 | ||||
| -rw-r--r-- | test/writer.muse | 4 |
3 files changed, 59 insertions, 20 deletions
diff --git a/src/Text/Pandoc/Writers/Muse.hs b/src/Text/Pandoc/Writers/Muse.hs index 128e2c6f9..5f9b58aa1 100644 --- a/src/Text/Pandoc/Writers/Muse.hs +++ b/src/Text/Pandoc/Writers/Muse.hs @@ -45,6 +45,7 @@ even though it is supported only in Emacs Muse. module Text.Pandoc.Writers.Muse (writeMuse) where import Prelude import Control.Monad.State.Strict +import Data.Char (isSpace, isDigit, isAsciiUpper, isAsciiLower) import Data.Text (Text) import Data.List (intersperse, transpose, isInfixOf) import System.FilePath (takeExtension) @@ -153,9 +154,9 @@ blockListToMuse blocks = do blockToMuse :: PandocMonad m => Block -- ^ Block element -> StateT WriterState m Doc -blockToMuse (Plain inlines) = inlineListToMuse inlines +blockToMuse (Plain inlines) = inlineListToMuse' inlines blockToMuse (Para inlines) = do - contents <- inlineListToMuse inlines + contents <- inlineListToMuse' inlines return $ contents <> blankline blockToMuse (LineBlock lns) = do lns' <- mapM inlineListToMuse lns @@ -206,7 +207,7 @@ blockToMuse (DefinitionList items) = do => ([Inline], [[Block]]) -> StateT WriterState m Doc definitionListItemToMuse (label, defs) = do - label' <- inlineListToMuse label + label' <- inlineListToMuse' label contents <- liftM vcat $ mapM descriptionToMuse defs let ind = offset label' return $ hang ind label' contents @@ -280,15 +281,23 @@ escapeString s = substitute "</verbatim>" "<</verbatim><verbatim>/verbatim>" s ++ "</verbatim>" +startsWithMarker :: (Char -> Bool) -> String -> Bool +startsWithMarker f (' ':xs) = startsWithMarker f xs +startsWithMarker f (x:xs) = + f x && (startsWithMarker f xs || startsWithDot xs) + where + startsWithDot ('.':[]) = True + startsWithDot ('.':c:_) = isSpace c + startsWithDot _ = False +startsWithMarker _ [] = False + -- | Escape special characters for Muse if needed. conditionalEscapeString :: String -> String conditionalEscapeString s = if any (`elem` ("#*<=>[]|" :: String)) s || "::" `isInfixOf` s || "----" `isInfixOf` s || - "~~" `isInfixOf` s || - "-" == s || - ";" == s + "~~" `isInfixOf` s then escapeString s else s @@ -354,15 +363,44 @@ urlEscapeBrackets (']':xs) = '%':'5':'D':urlEscapeBrackets xs urlEscapeBrackets (x:xs) = x:urlEscapeBrackets xs urlEscapeBrackets [] = [] --- | Convert list of Pandoc inline elements to Muse. -inlineListToMuse :: PandocMonad m - => [Inline] +fixOrEscape :: Inline -> Bool +fixOrEscape (Str "-") = True -- TODO: " - " should be escaped too +fixOrEscape (Str ";") = True +fixOrEscape (Str s) = startsWithMarker isDigit s || + startsWithMarker isAsciiLower s || + startsWithMarker isAsciiUpper s +fixOrEscape (Space) = True +fixOrEscape (SoftBreak) = True +fixOrEscape _ = False + +-- | Convert list of Pandoc inline elements to Muse +renderInlineList :: PandocMonad m + => Bool + -> [Inline] -> StateT WriterState m Doc -inlineListToMuse lst = do - lst' <- normalizeInlineList <$> preprocessInlineList (map (removeKeyValues . replaceSmallCaps) lst) - if null lst' - then pure "<verbatim></verbatim>" - else hcat <$> mapM inlineToMuse (fixNotes lst') +renderInlineList True [] = pure "<verbatim></verbatim>" +renderInlineList False [] = pure "" +renderInlineList start lst@(x:xs) = do r <- inlineToMuse x + opts <- gets stOptions + lst' <- renderInlineList (x == SoftBreak && writerWrapText opts == WrapPreserve) xs --hcat <$> mapM inlineToMuse xs + if start && fixOrEscape x + then pure ((text "<verbatim></verbatim>") <> r <> lst') + else pure (r <> lst') + +-- | Normalize and convert list of Pandoc inline elements to Muse. +inlineListToMuse'' :: PandocMonad m + => Bool + -> [Inline] + -> StateT WriterState m Doc +inlineListToMuse'' start lst = do + lst' <- (normalizeInlineList . fixNotes) <$> preprocessInlineList (map (removeKeyValues . replaceSmallCaps) lst) + renderInlineList start lst' + +inlineListToMuse' :: PandocMonad m => [Inline] -> StateT WriterState m Doc +inlineListToMuse' = inlineListToMuse'' True + +inlineListToMuse :: PandocMonad m => [Inline] -> StateT WriterState m Doc +inlineListToMuse = inlineListToMuse'' False -- | Convert Pandoc inline element to Muse. inlineToMuse :: PandocMonad m diff --git a/test/Tests/Writers/Muse.hs b/test/Tests/Writers/Muse.hs index 3c5d1511a..1412739cb 100644 --- a/test/Tests/Writers/Muse.hs +++ b/test/Tests/Writers/Muse.hs @@ -312,16 +312,17 @@ tests = [ testGroup "block elements" -- We don't want colons to be escaped if they can't be confused -- with definition list item markers. , "do not escape colon" =: str ":" =?> ":" - , "escape - to avoid accidental unordered lists" =: text " - foo" =?> " <verbatim>-</verbatim> foo" + , "escape - to avoid accidental unordered lists" =: text " - foo" =?> "<verbatim></verbatim> - foo" , "escape - inside a list to avoid accidental nested unordered lists" =: bulletList [ (para $ text "foo") <> (para $ text "- bar") ] =?> unlines [ " - foo" , "" - , " <verbatim>-</verbatim> bar" + , " <verbatim></verbatim>- bar" ] - , "escape ; to avoid accidental comments" =: text "; foo" =?> "<verbatim>;</verbatim> foo" + , "escape ; to avoid accidental comments" =: text "; foo" =?> "<verbatim></verbatim>; foo" + , "escape ; after softbreak" =: text "foo" <> softbreak <> text "; bar" =?> "foo\n<verbatim></verbatim>; bar" ] , testGroup "emphasis" [ "emph" =: emph (text "foo") =?> "<em>foo</em>" @@ -408,7 +409,7 @@ tests = [ testGroup "block elements" , "empty span with anchor" =: spanWith ("anchor", [], []) (mempty) =?> "#anchor" , "empty span without class and anchor" =: spanWith ("", [], []) (mempty) - =?> "<class><verbatim></verbatim></class>" + =?> "<class></class>" , "span with class and anchor" =: spanWith ("anchor", ["foo"], []) (text "bar") =?> "#anchor <class name=\"foo\">bar</class>" , "adjacent spans" =: spanWith ("", ["syllable"], []) (str "wa") <> diff --git a/test/writer.muse b/test/writer.muse index 530fb3ba5..fe278af65 100644 --- a/test/writer.muse +++ b/test/writer.muse @@ -245,7 +245,7 @@ Should not be a list item: M.A. 2007 -B. Williams +<verbatim></verbatim>B. Williams ---- @@ -594,7 +594,7 @@ Bang: ! Plus: + -Minus: <verbatim>-</verbatim> +Minus: - ---- |