diff options
| -rw-r--r-- | pandoc.cabal | 14 | ||||
| -rw-r--r-- | tests/lhs-test.latex | 5 | ||||
| -rw-r--r-- | tests/lhs-test.latex+lhs | 5 | ||||
| -rw-r--r-- | tests/writer.latex | 5 |
4 files changed, 24 insertions, 5 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index 882397ba4..ce3b75971 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -201,6 +201,10 @@ Flag make-pandoc-man-pages Description: Build program to regenerate pandoc man pages from README. Default: False +Flag network-uri + Description: Get Network.URI from the network-uri package + Default: True + Library Build-Depends: base >= 4.2 && <5, syb >= 0.1 && < 0.5, @@ -209,7 +213,6 @@ Library array >= 0.3 && < 0.6, parsec >= 3.1 && < 3.2, mtl >= 1.1 && < 2.3, - network >= 2 && < 2.6, filepath >= 1.1 && < 1.4, process >= 1 && < 1.3, directory >= 1 && < 1.3, @@ -243,6 +246,10 @@ Library old-time, deepseq-generics >= 0.1 && < 0.2, JuicyPixels >= 3.1.6.1 && < 3.2 + if flag(network-uri) + Build-Depends: network-uri >= 2.6 && < 2.7, network >= 2.6 + else + Build-Depends: network >= 2 && < 2.6 if flag(https) Build-Depends: http-client >= 0.3.2 && < 0.4, http-client-tls >= 0.2 && < 0.3, @@ -339,7 +346,6 @@ Executable pandoc base >= 4.2 && <5, directory >= 1 && < 1.3, filepath >= 1.1 && < 1.4, - network >= 2 && < 2.6, text >= 0.11 && < 1.2, bytestring >= 0.9 && < 0.11, extensible-exceptions >= 0.1 && < 0.2, @@ -348,6 +354,10 @@ Executable pandoc yaml >= 0.8.8.2 && < 0.9, containers >= 0.1 && < 0.6, HTTP >= 4000.0.5 && < 4000.3 + if flag(network-uri) + Build-Depends: network-uri >= 2.6 && < 2.7 + else + Build-Depends: network >= 2 && < 2.6 Ghc-Options: -rtsopts -with-rtsopts=-K16m -Wall -fno-warn-unused-do-bind Ghc-Prof-Options: -auto-all -caf-all -rtsopts -with-rtsopts=-K16m if os(windows) diff --git a/tests/lhs-test.latex b/tests/lhs-test.latex index 6600608fe..6f2fdfb77 100644 --- a/tests/lhs-test.latex +++ b/tests/lhs-test.latex @@ -19,7 +19,10 @@ % use upquote if available, for straight quotes in verbatim environments \IfFileExists{upquote.sty}{\usepackage{upquote}}{} % use microtype if available -\IfFileExists{microtype.sty}{\usepackage{microtype}}{} +\IfFileExists{microtype.sty}{% +\usepackage{microtype} +\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts +}{} \usepackage{color} \usepackage{fancyvrb} \newcommand{\VerbBar}{|} diff --git a/tests/lhs-test.latex+lhs b/tests/lhs-test.latex+lhs index d6cb7c497..77f0e08ff 100644 --- a/tests/lhs-test.latex+lhs +++ b/tests/lhs-test.latex+lhs @@ -19,7 +19,10 @@ % use upquote if available, for straight quotes in verbatim environments \IfFileExists{upquote.sty}{\usepackage{upquote}}{} % use microtype if available -\IfFileExists{microtype.sty}{\usepackage{microtype}}{} +\IfFileExists{microtype.sty}{% +\usepackage{microtype} +\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts +}{} \usepackage{listings} \lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{} \ifxetex diff --git a/tests/writer.latex b/tests/writer.latex index 5428e9ad7..b1b4bbffb 100644 --- a/tests/writer.latex +++ b/tests/writer.latex @@ -19,7 +19,10 @@ % use upquote if available, for straight quotes in verbatim environments \IfFileExists{upquote.sty}{\usepackage{upquote}}{} % use microtype if available -\IfFileExists{microtype.sty}{\usepackage{microtype}}{} +\IfFileExists{microtype.sty}{% +\usepackage{microtype} +\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts +}{} \usepackage{fancyvrb} \usepackage{graphicx} \makeatletter |