diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-08-17 12:15:32 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-08-17 12:15:32 -0700 |
| commit | 761e1edc30a3a61b5e50eea6b1e4bc51aaa1bc24 (patch) | |
| tree | d0b327e66c79e7c93597cead0f308b05f0b878ac | |
| parent | a0ddabb206e7a421a51f4ba148dbecdf0c115ca0 (diff) | |
| parent | 0dff30271ca14a3e4ce8ad222a4306062abba3a9 (diff) | |
| download | pandoc-761e1edc30a3a61b5e50eea6b1e4bc51aaa1bc24.tar.gz | |
Merge pull request #2364 from gbataille/bugDoc
[BUG] Haddock : * and ^ to be escaped in docs
| -rw-r--r-- | src/Text/Pandoc/Readers/Odt/StyleReader.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Text/Pandoc/Readers/Odt/StyleReader.hs b/src/Text/Pandoc/Readers/Odt/StyleReader.hs index 1cf87cc59..b451e52a0 100644 --- a/src/Text/Pandoc/Readers/Odt/StyleReader.hs +++ b/src/Text/Pandoc/Readers/Odt/StyleReader.hs @@ -362,11 +362,11 @@ instance Read XslUnit where estimateInMillimeter :: Int -> XslUnit -> Int estimateInMillimeter n XslUnitMM = n estimateInMillimeter n XslUnitCM = n * 10 -estimateInMillimeter n XslUnitInch = n * 25 -- * 25.4 -estimateInMillimeter n XslUnitPoints = n `div` 3 -- * 1/72 * 25.4 -estimateInMillimeter n XslUnitPica = n * 4 -- * 12 * 1/72 * 25.4 -estimateInMillimeter n XslUnitPixel = n `div`3 -- * 1/72 * 25.4 -estimateInMillimeter n XslUnitEM = n * 7 -- * 16 * 1/72 * 25.4 +estimateInMillimeter n XslUnitInch = n * 25 -- \* 25.4 +estimateInMillimeter n XslUnitPoints = n `div` 3 -- \* 1/72 * 25.4 +estimateInMillimeter n XslUnitPica = n * 4 -- \* 12 * 1/72 * 25.4 +estimateInMillimeter n XslUnitPixel = n `div`3 -- \* 1/72 * 25.4 +estimateInMillimeter n XslUnitEM = n * 7 -- \* 16 * 1/72 * 25.4 ---- @@ -385,7 +385,7 @@ getListLevelStyle level ListStyle{..} = let (lower , exactHit , _) = M.splitLookup level levelStyles in exactHit <|> fmap fst (M.maxView lower) -- findBy (`M.lookup` levelStyles) [level, (level-1) .. 1] - -- ^ simpler, but in general less efficient + -- \^ simpler, but in general less efficient data ListLevelStyle = ListLevelStyle { listLevelType :: ListLevelType , listItemPrefix :: Maybe String |