diff options
| -rw-r--r-- | src/Text/Pandoc/Writers/Man.hs | 46 | ||||
| -rw-r--r-- | test/command/3568.md | 15 | ||||
| -rw-r--r-- | test/writer.man | 8 |
3 files changed, 56 insertions, 13 deletions
diff --git a/src/Text/Pandoc/Writers/Man.hs b/src/Text/Pandoc/Writers/Man.hs index 6d7a4f84b..1f3e17c16 100644 --- a/src/Text/Pandoc/Writers/Man.hs +++ b/src/Text/Pandoc/Writers/Man.hs @@ -31,7 +31,8 @@ Conversion of 'Pandoc' documents to groff man page format. module Text.Pandoc.Writers.Man ( writeMan) where import Control.Monad.Except (throwError) import Control.Monad.State -import Data.List (intercalate, intersperse, stripPrefix) +import Data.List (intercalate, intersperse, stripPrefix, sort) +import qualified Data.Map as Map import Data.Maybe (fromMaybe) import Text.Pandoc.Builder (deleteMeta) import Text.Pandoc.Class (PandocMonad, report) @@ -47,12 +48,23 @@ import Text.Pandoc.Writers.Shared import Text.Printf (printf) type Notes = [[Block]] -data WriterState = WriterState { stNotes :: Notes - , stHasTables :: Bool } +data WriterState = WriterState { stNotes :: Notes + , stFontFeatures :: Map.Map Char Bool + , stHasTables :: Bool } + +defaultWriterState :: WriterState +defaultWriterState = WriterState { stNotes = [] + , stFontFeatures = Map.fromList [ + ('I',False) + , ('B',False) + , ('C',False) + ] + , stHasTables = False } -- | Convert Pandoc to Man. writeMan :: PandocMonad m => WriterOptions -> Pandoc -> m String -writeMan opts document = evalStateT (pandocToMan opts document) (WriterState [] False) +writeMan opts document = + evalStateT (pandocToMan opts document) defaultWriterState -- | Return groff man representation of document. pandocToMan :: PandocMonad m => WriterOptions -> Pandoc -> StateT WriterState m String @@ -316,11 +328,9 @@ inlineListToMan opts lst = mapM (inlineToMan opts) lst >>= (return . hcat) inlineToMan :: PandocMonad m => WriterOptions -> Inline -> StateT WriterState m Doc inlineToMan opts (Span _ ils) = inlineListToMan opts ils inlineToMan opts (Emph lst) = do - contents <- inlineListToMan opts lst - return $ text "\\f[I]" <> contents <> text "\\f[]" + withFontFeature 'I' (inlineListToMan opts lst) inlineToMan opts (Strong lst) = do - contents <- inlineListToMan opts lst - return $ text "\\f[B]" <> contents <> text "\\f[]" + withFontFeature 'B' (inlineListToMan opts lst) inlineToMan opts (Strikeout lst) = do contents <- inlineListToMan opts lst return $ text "[STRIKEOUT:" <> contents <> char ']' @@ -340,7 +350,7 @@ inlineToMan opts (Quoted DoubleQuote lst) = do inlineToMan opts (Cite _ lst) = inlineListToMan opts lst inlineToMan _ (Code _ str) = - return $ text $ "\\f[C]" ++ escapeCode str ++ "\\f[]" + withFontFeature 'C' (return (text $ escapeCode str)) inlineToMan _ (Str str@('.':_)) = return $ afterBreak "\\&" <> text (escapeString str) inlineToMan _ (Str str) = return $ text $ escapeString str @@ -379,3 +389,21 @@ inlineToMan _ (Note contents) = do notes <- gets stNotes let ref = show $ (length notes) return $ char '[' <> text ref <> char ']' + +fontChange :: PandocMonad m => StateT WriterState m Doc +fontChange = do + features <- gets stFontFeatures + let filling = sort [c | (c,True) <- Map.toList features] + return $ text $ "\\f[" ++ filling ++ "]" + +withFontFeature :: PandocMonad m + => Char + -> StateT WriterState m Doc + -> StateT WriterState m Doc +withFontFeature c action = do + modify $ \st -> st{ stFontFeatures = Map.adjust not c $ stFontFeatures st } + begin <- fontChange + d <- action + modify $ \st -> st{ stFontFeatures = Map.adjust not c $ stFontFeatures st } + end <- fontChange + return $ begin <> d <> end diff --git a/test/command/3568.md b/test/command/3568.md new file mode 100644 index 000000000..e77c27b78 --- /dev/null +++ b/test/command/3568.md @@ -0,0 +1,15 @@ +``` +% pandoc -t man +normal *italic **bold in the middle** only italic* normal. + +normal **bold `code` more bold** normal. + +normal `code` normal. +^D +.PP +normal \f[I]italic \f[BI]bold in the middle\f[I] only italic\f[] normal. +.PP +normal \f[B]bold \f[BC]code\f[B] more bold\f[] normal. +.PP +normal \f[C]code\f[] normal. +``` diff --git a/test/writer.man b/test/writer.man index b0aece96b..907fb4878 100644 --- a/test/writer.man +++ b/test/writer.man @@ -517,13 +517,13 @@ This is \f[B]strong\f[], and so \f[B]is this\f[]. .PP An \f[I]emphasized link (/url)\f[]. .PP -\f[B]\f[I]This is strong and em.\f[]\f[] +\f[B]\f[BI]This is strong and em.\f[B]\f[] .PP -So is \f[B]\f[I]this\f[]\f[] word. +So is \f[B]\f[BI]this\f[B]\f[] word. .PP -\f[B]\f[I]This is strong and em.\f[]\f[] +\f[B]\f[BI]This is strong and em.\f[B]\f[] .PP -So is \f[B]\f[I]this\f[]\f[] word. +So is \f[B]\f[BI]this\f[B]\f[] word. .PP This is code: \f[C]>\f[], \f[C]$\f[], \f[C]\\\f[], \f[C]\\$\f[], \f[C]<html>\f[]. |