diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2017-01-24 15:28:02 +0100 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2017-01-25 17:07:43 +0100 |
| commit | 65b8570e0e0b2c7e570e051859c9e0db0b7442f6 (patch) | |
| tree | b97c46d439053bbaf8608330d40202087b524fb7 | |
| parent | 73e343cfcd1bbdc46cd1bcfc37737678a3cebc20 (diff) | |
| download | pandoc-65b8570e0e0b2c7e570e051859c9e0db0b7442f6.tar.gz | |
Cleanups for rebase.
| -rw-r--r-- | src/Text/Pandoc/Readers/Org/Blocks.hs | 2 | ||||
| -rw-r--r-- | src/Text/Pandoc/Writers/OpenDocument.hs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Text/Pandoc/Readers/Org/Blocks.hs b/src/Text/Pandoc/Readers/Org/Blocks.hs index 5176e0f6c..8ffc0bb19 100644 --- a/src/Text/Pandoc/Readers/Org/Blocks.hs +++ b/src/Text/Pandoc/Readers/Org/Blocks.hs @@ -682,7 +682,7 @@ exampleCode = B.codeBlockWith ("", ["example"], []) specialLine :: PandocMonad m => OrgParser m (F Blocks) specialLine = fmap return . try $ rawExportLine <|> metaLine <|> commentLine -rawExportLine :: PnadocMonad m => OrgParser m Blocks +rawExportLine :: PandocMonad m => OrgParser m Blocks rawExportLine = try $ do metaLineStart key <- metaKey diff --git a/src/Text/Pandoc/Writers/OpenDocument.hs b/src/Text/Pandoc/Writers/OpenDocument.hs index f50b240a4..59470c2f9 100644 --- a/src/Text/Pandoc/Writers/OpenDocument.hs +++ b/src/Text/Pandoc/Writers/OpenDocument.hs @@ -206,7 +206,7 @@ writeOpenDocument opts (Pandoc meta blocks) = do meta b <- render' `fmap` blocksToOpenDocument opts blocks return (b, m) - styles = stTableStyles s ++ stParaStyles s ++ + let styles = stTableStyles s ++ stParaStyles s ++ map snd (reverse $ sortBy (comparing fst) $ Map.elems (stTextStyles s)) listStyle (n,l) = inTags True "text:list-style" @@ -559,7 +559,7 @@ tableStyle num wcs = paraStyle :: PandocMonad m => [(String,String)] -> OD m Int paraStyle attrs = do pn <- (+) 1 . length <$> gets stParaStyles - i <- (*) 0.5 . fromIntegral <$> gets stIndentPara :: State WriterState Double + i <- (*) (0.5 :: Double) . fromIntegral <$> gets stIndentPara b <- gets stInDefinition t <- gets stTight let styleAttr = [ ("style:name" , "P" ++ show pn) |