git.iko.soy/typeable/pandoc
on master help sign in
Let `--eol` take `native` as an argument.
4d1e9b8John MacFarlane
MANUAL.txt+5−4
compare with master
unifiedsplit
@@ -593,11 +593,12 @@ General writer options
593: Print a system default data file. Files in the user data directory
593: Print a system default data file. Files in the user data directory
594 are ignored.
594 are ignored.
595
595
596−`--eol=crlf`|`lf`
596+`--eol=crlf`|`lf`|`native`
597
597
598−: Manually specify line endings: `crlf` (Windows) or `lf`
598+: Manually specify line endings: `crlf` (Windows), `lf`
599− (MacOS/linux/unix). The default is to use the line endings
599+ (MacOS/linux/unix), or `native` (line endings appropriate
600− appropriate for the OS.
600+ to the OS on which pandoc is being run). The default is
601+ `native`.
601
602
602`--dpi`=*NUMBER*
603`--dpi`=*NUMBER*
603
604
src/Text/Pandoc/App.hs+13−12
@@ -90,11 +90,11 @@ import System.Posix.IO (stdOutput)
90import System.Posix.Terminal (queryTerminal)
90import System.Posix.Terminal (queryTerminal)
91#endif
91#endif
92
92
93−data Newline = LF | CRLF deriving (Show, Generic)
93+data LineEnding = LF | CRLF | Native deriving (Show, Generic)
94
94
95−instance ToJSON Newline where
95+instance ToJSON LineEnding where
96 toEncoding = genericToEncoding defaultOptions
96 toEncoding = genericToEncoding defaultOptions
97−instance FromJSON Newline
97+instance FromJSON LineEnding
98
98
99parseOptions :: [OptDescr (Opt -> IO Opt)] -> Opt -> IO Opt
99parseOptions :: [OptDescr (Opt -> IO Opt)] -> Opt -> IO Opt
100parseOptions options' defaults = do
100parseOptions options' defaults = do
@@ -422,9 +422,9 @@ convertWithOpts opts = do
422 else return $ optMetadata opts
422 else return $ optMetadata opts
423
423
424 let eol = case optEol opts of
424 let eol = case optEol opts of
425− Just CRLF -> IO.CRLF
425+ CRLF -> IO.CRLF
426− Just LF -> IO.LF
426+ LF -> IO.LF
427− Nothing -> nativeNewline
427+ Native -> nativeNewline
428
428
429 runIO' $ do
429 runIO' $ do
430 setResourcePath (optResourcePath opts)
430 setResourcePath (optResourcePath opts)
@@ -584,7 +584,7 @@ data Opt = Opt
584 , optIncludeAfterBody :: [FilePath] -- ^ Files to include after body
584 , optIncludeAfterBody :: [FilePath] -- ^ Files to include after body
585 , optIncludeInHeader :: [FilePath] -- ^ Files to include in header
585 , optIncludeInHeader :: [FilePath] -- ^ Files to include in header
586 , optResourcePath :: [FilePath] -- ^ Path to search for images etc
586 , optResourcePath :: [FilePath] -- ^ Path to search for images etc
587− , optEol :: Maybe Newline -- ^ Enforce line-endings
587+ , optEol :: LineEnding -- ^ Style of line-endings to use
588 } deriving (Generic, Show)
588 } deriving (Generic, Show)
589
589
590instance ToJSON Opt where
590instance ToJSON Opt where
@@ -658,7 +658,7 @@ defaultOpts = Opt
658 , optIncludeAfterBody = []
658 , optIncludeAfterBody = []
659 , optIncludeInHeader = []
659 , optIncludeInHeader = []
660 , optResourcePath = ["."]
660 , optResourcePath = ["."]
661− , optEol = Nothing
661+ , optEol = Native
662 }
662 }
663
663
664addMetadata :: (String, String) -> Pandoc -> Pandoc
664addMetadata :: (String, String) -> Pandoc -> Pandoc
@@ -986,12 +986,13 @@ options =
986 (ReqArg
986 (ReqArg
987 (\arg opt ->
987 (\arg opt ->
988 case toLower <$> arg of
988 case toLower <$> arg of
989− "crlf" -> return opt { optEol = Just CRLF }
989+ "crlf" -> return opt { optEol = CRLF }
990− "lf" -> return opt { optEol = Just LF }
990+ "lf" -> return opt { optEol = LF }
991+ "native" -> return opt { optEol = Native }
991 -- mac-syntax (cr) is not supported in ghc-base.
992 -- mac-syntax (cr) is not supported in ghc-base.
992 _ -> E.throwIO $ PandocOptionError
993 _ -> E.throwIO $ PandocOptionError
993− "--eol must be one of crlf (Windows), lf (Unix)")
994+ "--eol must be crlf, lf, or native")
994− "crlf|lf")
995+ "crlf|lf|native")
995 "" -- "EOL (default OS-dependent)"
996 "" -- "EOL (default OS-dependent)"
996
997
997 , Option "" ["wrap"]
998 , Option "" ["wrap"]