f0e4b9c · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Require safe >= 0.3.18 and remove cpp.

f0e4b9cJohn MacFarlane6 years ago

pandoc.cabal+1−1

@@ -477,7 +477,7 @@ library

477 parsec >= 3.1 && < 3.2,

478 process >= 1.2.3 && < 1.7,

479 random >= 1 && < 1.3,

480− safe >= 0.3 && < 0.4,

480+ safe >= 0.3.18 && < 0.4,

481 scientific >= 0.3 && < 0.4,

482 skylighting >= 0.10.4.1 && < 0.11,

483 skylighting-core >= 0.10.4.1 && < 0.11,

src/Text/Pandoc/Readers/LaTeX.hs−5

@@ -1,4 +1,3 @@

1−{-# LANGUAGE CPP #-}

2{-# LANGUAGE OverloadedStrings #-}

1{-# LANGUAGE OverloadedStrings #-}

3{-# LANGUAGE PatternGuards #-}

2{-# LANGUAGE PatternGuards #-}

4{-# LANGUAGE ScopedTypeVariables #-}

3{-# LANGUAGE ScopedTypeVariables #-}

@@ -97,11 +96,7 @@ parseLaTeX = do

97 let doc' = doc bs

96 let doc' = doc bs

98 let headerLevel (Header n _ _) = [n]

97 let headerLevel (Header n _ _) = [n]

99 headerLevel _ = []

98 headerLevel _ = []

100−#if MIN_VERSION_safe(0,3,18)

101 let bottomLevel = minimumBound 1 $ query headerLevel doc'

99 let bottomLevel = minimumBound 1 $ query headerLevel doc'

102−#else

103− let bottomLevel = minimumDef 1 $ query headerLevel doc'

104−#endif

105 let adjustHeaders m (Header n attr ils) = Header (n+m) attr ils

100 let adjustHeaders m (Header n attr ils) = Header (n+m) attr ils

106 adjustHeaders _ x = x

101 adjustHeaders _ x = x

107 let (Pandoc _ bs') =

102 let (Pandoc _ bs') =