pandoc 1.17.0.1 → 1.17.0.2
raw patch · 23 files changed
+49/−43 lines, 23 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- changelog +6/−0
- man/pandoc.1 +1/−1
- pandoc.cabal +2/−2
- pandoc.hs +3/−3
- src/Text/Pandoc.hs +2/−2
- src/Text/Pandoc/Asciify.hs +2/−2
- src/Text/Pandoc/Error.hs +2/−2
- src/Text/Pandoc/Highlighting.hs +2/−2
- src/Text/Pandoc/ImageSize.hs +2/−2
- src/Text/Pandoc/MIME.hs +2/−2
- src/Text/Pandoc/Options.hs +2/−2
- src/Text/Pandoc/PDF.hs +2/−2
- src/Text/Pandoc/Parsing.hs +2/−2
- src/Text/Pandoc/Pretty.hs +2/−2
- src/Text/Pandoc/Process.hs +2/−2
- src/Text/Pandoc/Readers/HTML.hs +1/−1
- src/Text/Pandoc/SelfContained.hs +2/−2
- src/Text/Pandoc/Shared.hs +2/−2
- src/Text/Pandoc/Slides.hs +2/−2
- src/Text/Pandoc/Templates.hs +2/−2
- src/Text/Pandoc/UTF8.hs +2/−2
- src/Text/Pandoc/UUID.hs +2/−2
- src/Text/Pandoc/XML.hs +2/−2
changelog view
@@ -1,3 +1,9 @@+pandoc (1.17.0.2)++ * Fixed serious regression in `htmlInBalanced`, which caused+ newlines to be omitted in some raw HTML blocks in Markdown+ (#2804).+ pandoc (1.17.0.1) * File scope is no longer used when there are no input files (i.e.,
man/pandoc.1 view
@@ -1,5 +1,5 @@ .\"t-.TH PANDOC 1 "January 12, 2016" "pandoc 1.17.0.1"+.TH PANDOC 1 "January 12, 2016" "pandoc 1.17.0.2" .SH NAME pandoc - general markup converter .SH SYNOPSIS
pandoc.cabal view
@@ -1,10 +1,10 @@ Name: pandoc-Version: 1.17.0.1+Version: 1.17.0.2 Cabal-Version: >= 1.10 Build-Type: Custom License: GPL License-File: COPYING-Copyright: (c) 2006-2015 John MacFarlane+Copyright: (c) 2006-2016 John MacFarlane Author: John MacFarlane <jgm@berkeley.edu> Maintainer: John MacFarlane <jgm@berkeley.edu> Bug-Reports: https://github.com/jgm/pandoc/issues
pandoc.hs view
@@ -1,6 +1,6 @@ {-# LANGUAGE CPP, TupleSections #-} {--Copyright (C) 2006-2015 John MacFarlane <jgm@berkeley.edu>+Copyright (C) 2006-2016 John MacFarlane <jgm@berkeley.edu> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by@@ -19,7 +19,7 @@ {- | Module : Main- Copyright : Copyright (C) 2006-2015 John MacFarlane+ Copyright : Copyright (C) 2006-2016 John MacFarlane License : GNU GPL, version 2 or above Maintainer : John MacFarlane <jgm@berkeley@edu>@@ -79,7 +79,7 @@ copyrightMessage :: String copyrightMessage = intercalate "\n" [ "",- "Copyright (C) 2006-2015 John MacFarlane",+ "Copyright (C) 2006-2016 John MacFarlane", "Web: http://pandoc.org", "This is free software; see the source for copying conditions.", "There is no warranty, not even for merchantability or fitness",
src/Text/Pandoc.hs view
@@ -1,6 +1,6 @@ {-# LANGUAGE ScopedTypeVariables, FlexibleInstances #-} {--Copyright (C) 2006-2015 John MacFarlane <jgm@berkeley.edu>+Copyright (C) 2006-2016 John MacFarlane <jgm@berkeley.edu> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by@@ -19,7 +19,7 @@ {- | Module : Text.Pandoc- Copyright : Copyright (C) 2006-2015 John MacFarlane+ Copyright : Copyright (C) 2006-2016 John MacFarlane License : GNU GPL, version 2 or above Maintainer : John MacFarlane <jgm@berkeley.edu>
src/Text/Pandoc/Asciify.hs view
@@ -1,5 +1,5 @@ {--Copyright (C) 2013-2015 John MacFarlane <jgm@berkeley.edu>+Copyright (C) 2013-2016 John MacFarlane <jgm@berkeley.edu> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by@@ -18,7 +18,7 @@ {- | Module : Text.Pandoc.Asciify- Copyright : Copyright (C) 2013-2015 John MacFarlane+ Copyright : Copyright (C) 2013-2016 John MacFarlane License : GNU GPL, version 2 or above Maintainer : John MacFarlane <jgm@berkeley.edu>
src/Text/Pandoc/Error.hs view
@@ -1,6 +1,6 @@ {-# LANGUAGE DeriveDataTypeable, DeriveGeneric #-} {--Copyright (C) 2006-2015 John MacFarlane <jgm@berkeley.edu>+Copyright (C) 2006-2016 John MacFarlane <jgm@berkeley.edu> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by@@ -18,7 +18,7 @@ -} {- | Module : Text.Pandoc.Error- Copyright : Copyright (C) 2006-2015 John MacFarlane+ Copyright : Copyright (C) 2006-2016 John MacFarlane License : GNU GPL, version 2 or above Maintainer : John MacFarlane <jgm@berkeley.edu>
src/Text/Pandoc/Highlighting.hs view
@@ -1,5 +1,5 @@ {--Copyright (C) 2008-2015 John MacFarlane <jgm@berkeley.edu>+Copyright (C) 2008-2016 John MacFarlane <jgm@berkeley.edu> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by@@ -18,7 +18,7 @@ {- | Module : Text.Pandoc.Highlighting- Copyright : Copyright (C) 2008-2015 John MacFarlane+ Copyright : Copyright (C) 2008-2016 John MacFarlane License : GNU GPL, version 2 or above Maintainer : John MacFarlane <jgm@berkeley.edu>
src/Text/Pandoc/ImageSize.hs view
@@ -1,7 +1,7 @@ {-# LANGUAGE OverloadedStrings, ScopedTypeVariables, CPP #-} {-# OPTIONS_GHC -fno-warn-type-defaults #-} {-- Copyright (C) 2011-2015 John MacFarlane <jgm@berkeley.edu>+ Copyright (C) 2011-2016 John MacFarlane <jgm@berkeley.edu> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by@@ -20,7 +20,7 @@ {- | Module : Text.Pandoc.ImageSize-Copyright : Copyright (C) 2011-2015 John MacFarlane+Copyright : Copyright (C) 2011-2016 John MacFarlane License : GNU GPL, version 2 or above Maintainer : John MacFarlane <jgm@berkeley.edu>
src/Text/Pandoc/MIME.hs view
@@ -1,5 +1,5 @@ {--Copyright (C) 2011-2015 John MacFarlane <jgm@berkeley.edu>+Copyright (C) 2011-2016 John MacFarlane <jgm@berkeley.edu> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by@@ -18,7 +18,7 @@ {- | Module : Text.Pandoc.MIME- Copyright : Copyright (C) 2011-2015 John MacFarlane+ Copyright : Copyright (C) 2011-2016 John MacFarlane License : GNU GPL, version 2 or above Maintainer : John MacFarlane <jgm@berkeley.edu>
src/Text/Pandoc/Options.hs view
@@ -1,6 +1,6 @@ {-# LANGUAGE DeriveDataTypeable, DeriveGeneric #-} {--Copyright (C) 2012-2015 John MacFarlane <jgm@berkeley.edu>+Copyright (C) 2012-2016 John MacFarlane <jgm@berkeley.edu> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by@@ -19,7 +19,7 @@ {- | Module : Text.Pandoc.Options- Copyright : Copyright (C) 2012-2015 John MacFarlane+ Copyright : Copyright (C) 2012-2016 John MacFarlane License : GNU GPL, version 2 or above Maintainer : John MacFarlane <jgm@berkeley.edu>
src/Text/Pandoc/PDF.hs view
@@ -1,6 +1,6 @@ {-# LANGUAGE OverloadedStrings, CPP, ScopedTypeVariables #-} {--Copyright (C) 2012-2015 John MacFarlane <jgm@berkeley.edu>+Copyright (C) 2012-2016 John MacFarlane <jgm@berkeley.edu> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by@@ -19,7 +19,7 @@ {- | Module : Text.Pandoc.PDF- Copyright : Copyright (C) 2012-2015 John MacFarlane+ Copyright : Copyright (C) 2012-2016 John MacFarlane License : GNU GPL, version 2 or above Maintainer : John MacFarlane <jgm@berkeley.edu>
src/Text/Pandoc/Parsing.hs view
@@ -5,7 +5,7 @@ , MultiParamTypeClasses , FlexibleInstances #-} {--Copyright (C) 2006-2015 John MacFarlane <jgm@berkeley.edu>+Copyright (C) 2006-2016 John MacFarlane <jgm@berkeley.edu> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by@@ -24,7 +24,7 @@ {- | Module : Text.Pandoc.Parsing- Copyright : Copyright (C) 2006-2015 John MacFarlane+ Copyright : Copyright (C) 2006-2016 John MacFarlane License : GNU GPL, version 2 or above Maintainer : John MacFarlane <jgm@berkeley.edu>
src/Text/Pandoc/Pretty.hs view
@@ -1,6 +1,6 @@ {-# LANGUAGE GeneralizedNewtypeDeriving, CPP #-} {--Copyright (C) 2010-2015 John MacFarlane <jgm@berkeley.edu>+Copyright (C) 2010-2016 John MacFarlane <jgm@berkeley.edu> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by@@ -19,7 +19,7 @@ {- | Module : Text.Pandoc.Pretty- Copyright : Copyright (C) 2010-2015 John MacFarlane+ Copyright : Copyright (C) 2010-2016 John MacFarlane License : GNU GPL, version 2 or above Maintainer : John MacFarlane <jgm@berkeley.edu>
src/Text/Pandoc/Process.hs view
@@ -1,5 +1,5 @@ {--Copyright (C) 2013-2015 John MacFarlane <jgm@berkeley.edu>+Copyright (C) 2013-2016 John MacFarlane <jgm@berkeley.edu> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by@@ -18,7 +18,7 @@ {- | Module : Text.Pandoc.Process- Copyright : Copyright (C) 2013-2015 John MacFarlane+ Copyright : Copyright (C) 2013-2016 John MacFarlane License : GNU GPL, version 2 or above Maintainer : John MacFarlane <jgm@berkeley.edu>
src/Text/Pandoc/Readers/HTML.hs view
@@ -939,7 +939,7 @@ (TagClose _ : TagPosition er ec : _) -> do let ls = er - sr let cs = ec - sc- lscontents <- concat <$> count ls anyLine+ lscontents <- unlines <$> count ls anyLine cscontents <- count cs anyChar (_,closetag) <- htmlTag (~== TagClose tn) return (lscontents ++ cscontents ++ closetag)
src/Text/Pandoc/SelfContained.hs view
@@ -1,6 +1,6 @@ {-# LANGUAGE OverloadedStrings #-} {--Copyright (C) 2011-2015 John MacFarlane <jgm@berkeley.edu>+Copyright (C) 2011-2016 John MacFarlane <jgm@berkeley.edu> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by@@ -19,7 +19,7 @@ {- | Module : Text.Pandoc.SelfContained- Copyright : Copyright (C) 2011-2015 John MacFarlane+ Copyright : Copyright (C) 2011-2016 John MacFarlane License : GNU GPL, version 2 or above Maintainer : John MacFarlane <jgm@berkeley.edu>
@@ -2,7 +2,7 @@ FlexibleContexts, ScopedTypeVariables, PatternGuards, ViewPatterns #-} {--Copyright (C) 2006-2015 John MacFarlane <jgm@berkeley.edu>+Copyright (C) 2006-2016 John MacFarlane <jgm@berkeley.edu> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by@@ -21,7 +21,7 @@ {- | Module : Text.Pandoc.Shared- Copyright : Copyright (C) 2006-2015 John MacFarlane+ Copyright : Copyright (C) 2006-2016 John MacFarlane License : GNU GPL, version 2 or above Maintainer : John MacFarlane <jgm@berkeley.edu>
src/Text/Pandoc/Slides.hs view
@@ -1,5 +1,5 @@ {--Copyright (C) 2012-2015 John MacFarlane <jgm@berkeley.edu>+Copyright (C) 2012-2016 John MacFarlane <jgm@berkeley.edu> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by@@ -18,7 +18,7 @@ {- | Module : Text.Pandoc.Slides- Copyright : Copyright (C) 2012-2015 John MacFarlane+ Copyright : Copyright (C) 2012-2016 John MacFarlane License : GNU GPL, version 2 or above Maintainer : John MacFarlane <jgm@berkeley.edu>
src/Text/Pandoc/Templates.hs view
@@ -1,7 +1,7 @@ {-# LANGUAGE TypeSynonymInstances, FlexibleInstances, CPP, OverloadedStrings, GeneralizedNewtypeDeriving #-} {--Copyright (C) 2009-2015 John MacFarlane <jgm@berkeley.edu>+Copyright (C) 2009-2016 John MacFarlane <jgm@berkeley.edu> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by@@ -20,7 +20,7 @@ {- | Module : Text.Pandoc.Templates- Copyright : Copyright (C) 2009-2015 John MacFarlane+ Copyright : Copyright (C) 2009-2016 John MacFarlane License : GNU GPL, version 2 or above Maintainer : John MacFarlane <jgm@berkeley.edu>
src/Text/Pandoc/UTF8.hs view
@@ -1,6 +1,6 @@ {-# LANGUAGE CPP #-} {--Copyright (C) 2010-2015 John MacFarlane <jgm@berkeley.edu>+Copyright (C) 2010-2016 John MacFarlane <jgm@berkeley.edu> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by@@ -19,7 +19,7 @@ {- | Module : Text.Pandoc.UTF8- Copyright : Copyright (C) 2010-2015 John MacFarlane+ Copyright : Copyright (C) 2010-2016 John MacFarlane License : GNU GPL, version 2 or above Maintainer : John MacFarlane <jgm@berkeley.edu>
src/Text/Pandoc/UUID.hs view
@@ -1,5 +1,5 @@ {--Copyright (C) 2010-2015 John MacFarlane <jgm@berkeley.edu>+Copyright (C) 2010-2016 John MacFarlane <jgm@berkeley.edu> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by@@ -18,7 +18,7 @@ {- | Module : Text.Pandoc.UUID- Copyright : Copyright (C) 2010-2015 John MacFarlane+ Copyright : Copyright (C) 2010-2016 John MacFarlane License : GNU GPL, version 2 or above Maintainer : John MacFarlane <jgm@berkeley.edu>
src/Text/Pandoc/XML.hs view
@@ -1,5 +1,5 @@ {--Copyright (C) 2006-2015 John MacFarlane <jgm@berkeley.edu>+Copyright (C) 2006-2016 John MacFarlane <jgm@berkeley.edu> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by@@ -18,7 +18,7 @@ {- | Module : Text.Pandoc.XML- Copyright : Copyright (C) 2006-2015 John MacFarlane+ Copyright : Copyright (C) 2006-2016 John MacFarlane License : GNU GPL, version 2 or above Maintainer : John MacFarlane <jgm@berkeley.edu>