From a04c15a422cac279e75b012db9614cdc85aa1188 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 1 Jul 2015 11:21:34 -0700 Subject: New method for building man pages. + Removed `--man1`, `--man5` options (breaking change). + Removed `Text.Pandoc.ManPages` module (breaking API change). + Version bump to 1.15 because of the breaking changes, even though they involve features that have only been in pandoc for a day. + Makefile target for `man/man1/pandoc.1`. This uses pandoc to create the man page from README using a custom template and filters. + Added `man/` directory with template and filters needed to build man page. + We no longer have two man pages: pandoc.1 and pandoc_markdown.5. Now there is just pandoc.1, which has all the content from README. This change was needed because of the extensive cross-references between parts of the README. + Removed old `data/pandoc.1.template` and `data/pandoc_markdown.5.template`. --- pandoc.hs | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'pandoc.hs') diff --git a/pandoc.hs b/pandoc.hs index 6bc2a024a..df50d01d0 100644 --- a/pandoc.hs +++ b/pandoc.hs @@ -39,7 +39,6 @@ import Text.Pandoc.Shared ( tabFilter, readDataFileUTF8, readDataFile, safeRead, headerShift, normalize, err, warn, openURL ) import Text.Pandoc.MediaBag ( mediaDirectory, extractMediaBag, MediaBag ) -import Text.Pandoc.ManPages ( manPandoc1, manPandocMarkdown5 ) import Text.Pandoc.XML ( toEntities ) import Text.Pandoc.SelfContained ( makeSelfContained ) import Text.Pandoc.Process (pipeProcess) @@ -870,20 +869,6 @@ options = (\opt -> return opt { optIgnoreArgs = True })) "" -- "Ignore command-line arguments." - , Option "" ["man1"] - (NoArg - (\_ -> do - manPandoc1 >>= UTF8.hPutStr stdout - exitWith ExitSuccess )) - "" -- "Print pandoc.1 man page" - - , Option "" ["man5"] - (NoArg - (\_ -> do - manPandocMarkdown5 >>= UTF8.hPutStr stdout - exitWith ExitSuccess )) - "" -- "Print pandoc_markdown.5 man page" - , Option "" ["verbose"] (NoArg (\opt -> return opt { optVerbose = True })) -- cgit v1.2.3