aboutsummaryrefslogtreecommitdiff
path: root/src/Text
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2016-07-22 15:52:38 -0700
committerGitHub <noreply@github.com>2016-07-22 15:52:38 -0700
commit199489c12c69a3a0b55671edfa7d980b43489777 (patch)
tree06668631d2d61395eb18ecf3b48a5927df692e67 /src/Text
parent27762affe3edd13ccb62a5450166b28fe73d15e6 (diff)
parent28246889042d88f31490548e94b22a5436372ea8 (diff)
downloadpandoc-199489c12c69a3a0b55671edfa7d980b43489777.tar.gz
Merge pull request #3033 from tarleb/github-readme
PoC: GitHub-optimized README
Diffstat (limited to 'src/Text')
-rw-r--r--src/Text/Pandoc/Data.hsb2
-rw-r--r--src/Text/Pandoc/Shared.hs4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Text/Pandoc/Data.hsb b/src/Text/Pandoc/Data.hsb
index d408bf510..8786647c5 100644
--- a/src/Text/Pandoc/Data.hsb
+++ b/src/Text/Pandoc/Data.hsb
@@ -12,4 +12,4 @@ dataFiles = map (\(fp, contents) ->
(Posix.joinPath (splitDirectories fp), contents)) dataFiles'
dataFiles' :: [(FilePath, B.ByteString)]
-dataFiles' = ("README", %blob "README") : %blobs "data"
+dataFiles' = ("MANUAL.txt", %blob "MANUAL.txt") : %blobs "data"
diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs
index cc834a69a..bd299a802 100644
--- a/src/Text/Pandoc/Shared.hs
+++ b/src/Text/Pandoc/Shared.hs
@@ -873,7 +873,7 @@ readDefaultDataFile fname =
go as x = x : as
#else
getDataFileName fname' >>= checkExistence >>= BS.readFile
- where fname' = if fname == "README" then fname else "data" </> fname
+ where fname' = if fname == "MANUAL.txt" then fname else "data" </> fname
checkExistence :: FilePath -> IO FilePath
checkExistence fn = do
@@ -1071,7 +1071,7 @@ blocksToInlinesWithSep sep blks = intercalate sep $ map blockToInlines blks
blocksToInlines :: [Block] -> [Inline]
blocksToInlines = blocksToInlinesWithSep [Space, Str "ΒΆ", Space]
-
+
--
-- Safe read