@@ -35,7 +35,7 @@ import Text.Pandoc.Shared
3535import Text.Pandoc.Readers.TeXMath
3636import Text.Printf ( printf )
3737import Data.List ( isPrefixOf, intersperse, intercalate )
38−import Text.PrettyPrint.HughesPJ hiding ( Str )
38+import Text.Pandoc.Pretty
3939import Control.Monad.State
4040
4141type Notes = [[Block]]
@@ -52,27 +52,31 @@ pandocToMan opts (Pandoc (Meta title authors date) blocks) = do
5252 titleText <- inlineListToMan opts title
5353 authors' <- mapM (inlineListToMan opts) authors
5454 date' <- inlineListToMan opts date
55− let (cmdName, rest) = break (== ' ') $ render titleText
55+ let colwidth = if writerWrapText opts
56+ then Just $ writerColumns opts
57+ else Nothing
58+ let render' = render colwidth
59+ let (cmdName, rest) = break (== ' ') $ render' titleText
5660 let (title', section) = case reverse cmdName of
5761 (')':d:'(':xs) | d `elem` ['0'..'9'] ->
5862 (text (reverse xs), char d)
59− xs -> (text (reverse xs), doubleQuotes empty)
63+ xs -> (text (reverse xs), doubleQuotes empty)
6064 let description = hsep $
6165 map (doubleQuotes . text . removeLeadingTrailingSpace) $
6266 splitBy (== '|') rest
6367 body <- blockListToMan opts blocks
6468 notes <- liftM stNotes get
6569 notes' <- notesToMan opts (reverse notes)
66− let main = render $ body $$ notes' $$ text ""
70+ let main = render' $ body $$ notes' $$ text ""
6771 hasTables <- liftM stHasTables get
6872 let context = writerVariables opts ++
6973 [ ("body", main)
70− , ("title", render title')
71− , ("section", render section)
72− , ("date", render date')
73− , ("description", render description) ] ++
74+ , ("title", render' title')
75+ , ("section", render' section)
76+ , ("date", render' date')
77+ , ("description", render' description) ] ++
7478 [ ("has-tables", "yes") | hasTables ] ++
75− [ ("author", render a) | a <- authors' ]
79+ [ ("author", render' a) | a <- authors' ]
7680 if writerStandalone opts
7781 then return $ renderTemplate context $ writerTemplate opts
7882 else return main
@@ -89,7 +93,7 @@ notesToMan opts notes =
8993noteToMan :: WriterOptions -> Int -> [Block] -> State WriterState Doc
9094noteToMan opts num note = do
9195 contents <- blockListToMan opts note
92− let marker = text "\n.SS [" <> text (show num) <> char ']'
96+ let marker = cr <> text ".SS " <> brackets (text (show num))
9397 return $ marker $$ contents
9498
9599-- | Association list of characters to escape.
@@ -136,14 +140,13 @@ blockToMan :: WriterOptions -- ^ Options
136140 -> State WriterState Doc
137141blockToMan _ Null = return empty
138142blockToMan opts (Plain inlines) =
139− liftM vcat $ mapM (wrapIfNeeded opts (inlineListToMan opts)) $
140− splitSentences inlines
143+ liftM vcat $ mapM (inlineListToMan opts) $ splitSentences inlines
141144blockToMan opts (Para inlines) = do
142− contents <- liftM vcat $ mapM (wrapIfNeeded opts (inlineListToMan opts)) $
145+ contents <- liftM vcat $ mapM (inlineListToMan opts) $
143146 splitSentences inlines
144147 return $ text ".PP" $$ contents
145148blockToMan _ (RawHtml _) = return empty
146−blockToMan _ HorizontalRule = return $ text $ ".PP\n * * * * *"
149+blockToMan _ HorizontalRule = return $ text ".PP" $$ text " * * * * *"
147150blockToMan opts (Header level inlines) = do
148151 contents <- inlineListToMan opts inlines
149152 let heading = case level of
@@ -256,7 +259,7 @@ definitionListItemToMan opts (label, defs) = do
256259 mapM (\item -> blockToMan opts item) rest
257260 first' <- blockToMan opts first
258261 return $ first' $$ text ".RS" $$ rest' $$ text ".RE"
259− return $ text ".TP\n.B " <> labelText $+$ contents
262+ return $ text ".TP" $$ text ".B " <> labelText $$ contents
260263
261264-- | Convert list of Pandoc block elements to man.
262265blockListToMan :: WriterOptions -- ^ Options
@@ -309,11 +312,12 @@ inlineToMan _ (Str str) = return $ text $ escapeString str
309312inlineToMan opts (Math InlineMath str) = inlineListToMan opts $ readTeXMath str
310313inlineToMan opts (Math DisplayMath str) = do
311314 contents <- inlineListToMan opts $ readTeXMath str
312− return $ text ".RS" $$ contents $$ text ".RE"
315+ return $ cr <> text ".RS" $$ contents $$ text ".RE"
313316inlineToMan _ (TeX _) = return empty
314317inlineToMan _ (HtmlInline _) = return empty
315−inlineToMan _ (LineBreak) = return $ text "\n.PD 0\n.P\n.PD\n"
316−inlineToMan _ Space = return $ char ' '
318+inlineToMan _ (LineBreak) = return $
319+ cr <> text ".PD 0" $$ text ".P" $$ text ".PD" <> cr
320+inlineToMan _ Space = return space
317321inlineToMan opts (Link txt (src, _)) = do
318322 linktext <- inlineListToMan opts txt
319323 let srcSuffix = if isPrefixOf "mailto:" src then drop 7 src else src