git.iko.soy/typeable/pandoc
on master help sign in
Cleanups for rebase.
65b8570John MacFarlane
src/Text/Pandoc/Readers/Org/Blocks.hs+1−1
compare with master
unifiedsplit
@@ -682,7 +682,7 @@ exampleCode = B.codeBlockWith ("", ["example"], [])
682specialLine :: PandocMonad m => OrgParser m (F Blocks)
682specialLine :: PandocMonad m => OrgParser m (F Blocks)
683specialLine = fmap return . try $ rawExportLine <|> metaLine <|> commentLine
683specialLine = fmap return . try $ rawExportLine <|> metaLine <|> commentLine
684
684
685−rawExportLine :: PnadocMonad m => OrgParser m Blocks
685+rawExportLine :: PandocMonad m => OrgParser m Blocks
686rawExportLine = try $ do
686rawExportLine = try $ do
687 metaLineStart
687 metaLineStart
688 key <- metaKey
688 key <- metaKey
src/Text/Pandoc/Writers/OpenDocument.hs+2−2
@@ -206,7 +206,7 @@ writeOpenDocument opts (Pandoc meta blocks) = do
206 meta
206 meta
207 b <- render' `fmap` blocksToOpenDocument opts blocks
207 b <- render' `fmap` blocksToOpenDocument opts blocks
208 return (b, m)
208 return (b, m)
209− styles = stTableStyles s ++ stParaStyles s ++
209+ let styles = stTableStyles s ++ stParaStyles s ++
210 map snd (reverse $ sortBy (comparing fst) $
210 map snd (reverse $ sortBy (comparing fst) $
211 Map.elems (stTextStyles s))
211 Map.elems (stTextStyles s))
212 listStyle (n,l) = inTags True "text:list-style"
212 listStyle (n,l) = inTags True "text:list-style"
@@ -559,7 +559,7 @@ tableStyle num wcs =
559paraStyle :: PandocMonad m => [(String,String)] -> OD m Int
559paraStyle :: PandocMonad m => [(String,String)] -> OD m Int
560paraStyle attrs = do
560paraStyle attrs = do
561 pn <- (+) 1 . length <$> gets stParaStyles
561 pn <- (+) 1 . length <$> gets stParaStyles
562− i <- (*) 0.5 . fromIntegral <$> gets stIndentPara :: State WriterState Double
562+ i <- (*) (0.5 :: Double) . fromIntegral <$> gets stIndentPara
563 b <- gets stInDefinition
563 b <- gets stInDefinition
564 t <- gets stTight
564 t <- gets stTight
565 let styleAttr = [ ("style:name" , "P" ++ show pn)
565 let styleAttr = [ ("style:name" , "P" ++ show pn)