65b8570 · typeable/pandoc

git.iko.soy/typeable/pandoc

Cleanups for rebase.

commit65b8570e0e0b2c7e570e051859c9e0db0b7442f6 authorJohn MacFarlane <jgm@berkeley.edu> dateTue 24 Jan 2017, 15:28 (10 years ago) parent73e343c

2 files changed+3−3

unifiedsplit

src/Text/Pandoc/Readers/Org/Blocks.hs+1−1

@@ -682,7 +682,7 @@ exampleCode = B.codeBlockWith ("", ["example"], [])

682682specialLine :: PandocMonad m => OrgParser m (F Blocks)

683683specialLine = fmap return . try $ rawExportLine <|> metaLine <|> commentLine

684684

685−rawExportLine :: PnadocMonad m => OrgParser m Blocks

685+rawExportLine :: PandocMonad m => OrgParser m Blocks

686686rawExportLine = try $ do

687687 metaLineStart

688688 key <- metaKey

src/Text/Pandoc/Writers/OpenDocument.hs+2−2

@@ -206,7 +206,7 @@ writeOpenDocument opts (Pandoc meta blocks) = do

206206 meta

207207 b <- render' `fmap` blocksToOpenDocument opts blocks

208208 return (b, m)

209− styles = stTableStyles s ++ stParaStyles s ++

209+ let styles = stTableStyles s ++ stParaStyles s ++

210210 map snd (reverse $ sortBy (comparing fst) $

211211 Map.elems (stTextStyles s))

212212 listStyle (n,l) = inTags True "text:list-style"

@@ -559,7 +559,7 @@ tableStyle num wcs =

559559paraStyle :: PandocMonad m => [(String,String)] -> OD m Int

560560paraStyle attrs = do

561561 pn <- (+) 1 . length <$> gets stParaStyles

562− i <- (*) 0.5 . fromIntegral <$> gets stIndentPara :: State WriterState Double

562+ i <- (*) (0.5 :: Double) . fromIntegral <$> gets stIndentPara

563563 b <- gets stInDefinition

564564 t <- gets stTight

565565 let styleAttr = [ ("style:name" , "P" ++ show pn)