e29e5c5 · typeable/pandoc

git.iko.soy/typeable/pandoc

Use UTF8 conversion on the extra files loaded in Main.hs

(header, before, after). This fixes problems with unicode characters in these files. git-svn-id: https://pandoc.googlecode.com/svn/trunk@879 788f1e2b-df1e-0410-8736-df70ead52e1b

commite29e5c5944723074f11b1b8a54f7123971a82f6b authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateThu 23 Aug 2007, 02:16 (19 years ago) parent4a0e02d

1 file changed+4−4

compare with master

unifiedsplit

src/Main.hs+4−4

src/Main.hs+4−4

@@ -229,7 +229,7 @@ options =

229229 (ReqArg

230230 (\arg opt -> do

231231 text <- readFile arg

232− return opt { optIncludeInHeader = text,

232+ return opt { optIncludeInHeader = fromUTF8 text,

233233 optStandalone = True })

234234 "FILENAME")

235235 "" -- "File to include at end of header (implies -s)"

@@ -238,7 +238,7 @@ options =

238238 (ReqArg

239239 (\arg opt -> do

240240 text <- readFile arg

241− return opt { optIncludeBeforeBody = text })

241+ return opt { optIncludeBeforeBody = fromUTF8 text })

242242 "FILENAME")

243243 "" -- "File to include before document body"

244244

@@ -246,7 +246,7 @@ options =

246246 (ReqArg

247247 (\arg opt -> do

248248 text <- readFile arg

249− return opt { optIncludeAfterBody = text })

249+ return opt { optIncludeAfterBody = fromUTF8 text })

250250 "FILENAME")

251251 "" -- "File to include after document body"

252252

@@ -254,7 +254,7 @@ options =

254254 (ReqArg

255255 (\arg opt -> do

256256 text <- readFile arg

257− return opt { optCustomHeader = text,

257+ return opt { optCustomHeader = fromUTF8 text,

258258 optStandalone = True })

259259 "FILENAME")

260260 "" -- "File to use for custom header (implies -s)"