pandoc-types 1.16.1 → 1.16.1.1
raw patch · 8 files changed
+161/−72 lines, 8 filesdep ~aesonPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: aeson
API changes (from Hackage documentation)
- Text.Pandoc.Builder: instance GHC.Generics.Constructor Text.Pandoc.Builder.C1_0Many
- Text.Pandoc.Builder: instance GHC.Generics.Datatype Text.Pandoc.Builder.D1Many
- Text.Pandoc.Builder: instance GHC.Generics.Selector Text.Pandoc.Builder.S1_0_0Many
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.FromJSON Text.Pandoc.Definition.Alignment
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.FromJSON Text.Pandoc.Definition.Block
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.FromJSON Text.Pandoc.Definition.Citation
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.FromJSON Text.Pandoc.Definition.CitationMode
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.FromJSON Text.Pandoc.Definition.Format
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.FromJSON Text.Pandoc.Definition.Inline
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.FromJSON Text.Pandoc.Definition.ListNumberDelim
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.FromJSON Text.Pandoc.Definition.ListNumberStyle
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.FromJSON Text.Pandoc.Definition.MathType
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.FromJSON Text.Pandoc.Definition.Meta
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.FromJSON Text.Pandoc.Definition.MetaValue
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.FromJSON Text.Pandoc.Definition.Pandoc
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.FromJSON Text.Pandoc.Definition.QuoteType
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.ToJSON Text.Pandoc.Definition.Alignment
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.ToJSON Text.Pandoc.Definition.Block
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.ToJSON Text.Pandoc.Definition.Citation
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.ToJSON Text.Pandoc.Definition.CitationMode
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.ToJSON Text.Pandoc.Definition.Format
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.ToJSON Text.Pandoc.Definition.Inline
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.ToJSON Text.Pandoc.Definition.ListNumberDelim
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.ToJSON Text.Pandoc.Definition.ListNumberStyle
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.ToJSON Text.Pandoc.Definition.MathType
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.ToJSON Text.Pandoc.Definition.Meta
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.ToJSON Text.Pandoc.Definition.MetaValue
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.ToJSON Text.Pandoc.Definition.Pandoc
- Text.Pandoc.Definition: instance Data.Aeson.Types.Class.ToJSON Text.Pandoc.Definition.QuoteType
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_0Alignment
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_0Block
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_0Citation
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_0CitationMode
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_0Format
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_0Inline
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_0ListNumberDelim
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_0ListNumberStyle
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_0MathType
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_0Meta
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_0MetaValue
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_0Pandoc
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_0QuoteType
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_10Block
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_10Inline
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_11Block
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_11Inline
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_12Block
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_12Inline
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_13Inline
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_14Inline
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_15Inline
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_16Inline
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_17Inline
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_18Inline
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_1Alignment
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_1Block
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_1CitationMode
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_1Inline
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_1ListNumberDelim
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_1ListNumberStyle
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_1MathType
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_1MetaValue
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_1QuoteType
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_2Alignment
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_2Block
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_2CitationMode
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_2Inline
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_2ListNumberDelim
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_2ListNumberStyle
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_2MetaValue
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_3Alignment
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_3Block
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_3Inline
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_3ListNumberDelim
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_3ListNumberStyle
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_3MetaValue
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_4Block
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_4Inline
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_4ListNumberStyle
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_4MetaValue
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_5Block
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_5Inline
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_5ListNumberStyle
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_5MetaValue
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_6Block
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_6Inline
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_6ListNumberStyle
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_7Block
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_7Inline
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_8Block
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_8Inline
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_9Block
- Text.Pandoc.Definition: instance GHC.Generics.Constructor Text.Pandoc.Definition.C1_9Inline
- Text.Pandoc.Definition: instance GHC.Generics.Datatype Text.Pandoc.Definition.D1Alignment
- Text.Pandoc.Definition: instance GHC.Generics.Datatype Text.Pandoc.Definition.D1Block
- Text.Pandoc.Definition: instance GHC.Generics.Datatype Text.Pandoc.Definition.D1Citation
- Text.Pandoc.Definition: instance GHC.Generics.Datatype Text.Pandoc.Definition.D1CitationMode
- Text.Pandoc.Definition: instance GHC.Generics.Datatype Text.Pandoc.Definition.D1Format
- Text.Pandoc.Definition: instance GHC.Generics.Datatype Text.Pandoc.Definition.D1Inline
- Text.Pandoc.Definition: instance GHC.Generics.Datatype Text.Pandoc.Definition.D1ListNumberDelim
- Text.Pandoc.Definition: instance GHC.Generics.Datatype Text.Pandoc.Definition.D1ListNumberStyle
- Text.Pandoc.Definition: instance GHC.Generics.Datatype Text.Pandoc.Definition.D1MathType
- Text.Pandoc.Definition: instance GHC.Generics.Datatype Text.Pandoc.Definition.D1Meta
- Text.Pandoc.Definition: instance GHC.Generics.Datatype Text.Pandoc.Definition.D1MetaValue
- Text.Pandoc.Definition: instance GHC.Generics.Datatype Text.Pandoc.Definition.D1Pandoc
- Text.Pandoc.Definition: instance GHC.Generics.Datatype Text.Pandoc.Definition.D1QuoteType
- Text.Pandoc.Definition: instance GHC.Generics.Selector Text.Pandoc.Definition.S1_0_0Citation
- Text.Pandoc.Definition: instance GHC.Generics.Selector Text.Pandoc.Definition.S1_0_0Meta
- Text.Pandoc.Definition: instance GHC.Generics.Selector Text.Pandoc.Definition.S1_0_1Citation
- Text.Pandoc.Definition: instance GHC.Generics.Selector Text.Pandoc.Definition.S1_0_2Citation
- Text.Pandoc.Definition: instance GHC.Generics.Selector Text.Pandoc.Definition.S1_0_3Citation
- Text.Pandoc.Definition: instance GHC.Generics.Selector Text.Pandoc.Definition.S1_0_4Citation
- Text.Pandoc.Definition: instance GHC.Generics.Selector Text.Pandoc.Definition.S1_0_5Citation
+ Text.Pandoc.Builder: infixr 6 <>
+ Text.Pandoc.Definition: instance Data.Aeson.Types.FromJSON.FromJSON Text.Pandoc.Definition.Alignment
+ Text.Pandoc.Definition: instance Data.Aeson.Types.FromJSON.FromJSON Text.Pandoc.Definition.Block
+ Text.Pandoc.Definition: instance Data.Aeson.Types.FromJSON.FromJSON Text.Pandoc.Definition.Citation
+ Text.Pandoc.Definition: instance Data.Aeson.Types.FromJSON.FromJSON Text.Pandoc.Definition.CitationMode
+ Text.Pandoc.Definition: instance Data.Aeson.Types.FromJSON.FromJSON Text.Pandoc.Definition.Format
+ Text.Pandoc.Definition: instance Data.Aeson.Types.FromJSON.FromJSON Text.Pandoc.Definition.Inline
+ Text.Pandoc.Definition: instance Data.Aeson.Types.FromJSON.FromJSON Text.Pandoc.Definition.ListNumberDelim
+ Text.Pandoc.Definition: instance Data.Aeson.Types.FromJSON.FromJSON Text.Pandoc.Definition.ListNumberStyle
+ Text.Pandoc.Definition: instance Data.Aeson.Types.FromJSON.FromJSON Text.Pandoc.Definition.MathType
+ Text.Pandoc.Definition: instance Data.Aeson.Types.FromJSON.FromJSON Text.Pandoc.Definition.Meta
+ Text.Pandoc.Definition: instance Data.Aeson.Types.FromJSON.FromJSON Text.Pandoc.Definition.MetaValue
+ Text.Pandoc.Definition: instance Data.Aeson.Types.FromJSON.FromJSON Text.Pandoc.Definition.Pandoc
+ Text.Pandoc.Definition: instance Data.Aeson.Types.FromJSON.FromJSON Text.Pandoc.Definition.QuoteType
+ Text.Pandoc.Definition: instance Data.Aeson.Types.ToJSON.ToJSON Text.Pandoc.Definition.Alignment
+ Text.Pandoc.Definition: instance Data.Aeson.Types.ToJSON.ToJSON Text.Pandoc.Definition.Block
+ Text.Pandoc.Definition: instance Data.Aeson.Types.ToJSON.ToJSON Text.Pandoc.Definition.Citation
+ Text.Pandoc.Definition: instance Data.Aeson.Types.ToJSON.ToJSON Text.Pandoc.Definition.CitationMode
+ Text.Pandoc.Definition: instance Data.Aeson.Types.ToJSON.ToJSON Text.Pandoc.Definition.Format
+ Text.Pandoc.Definition: instance Data.Aeson.Types.ToJSON.ToJSON Text.Pandoc.Definition.Inline
+ Text.Pandoc.Definition: instance Data.Aeson.Types.ToJSON.ToJSON Text.Pandoc.Definition.ListNumberDelim
+ Text.Pandoc.Definition: instance Data.Aeson.Types.ToJSON.ToJSON Text.Pandoc.Definition.ListNumberStyle
+ Text.Pandoc.Definition: instance Data.Aeson.Types.ToJSON.ToJSON Text.Pandoc.Definition.MathType
+ Text.Pandoc.Definition: instance Data.Aeson.Types.ToJSON.ToJSON Text.Pandoc.Definition.Meta
+ Text.Pandoc.Definition: instance Data.Aeson.Types.ToJSON.ToJSON Text.Pandoc.Definition.MetaValue
+ Text.Pandoc.Definition: instance Data.Aeson.Types.ToJSON.ToJSON Text.Pandoc.Definition.Pandoc
+ Text.Pandoc.Definition: instance Data.Aeson.Types.ToJSON.ToJSON Text.Pandoc.Definition.QuoteType
Files
- LICENSE +1/−1
- Text/Pandoc/Builder.hs +29/−14
- Text/Pandoc/Definition.hs +39/−14
- Text/Pandoc/Generic.hs +28/−13
- Text/Pandoc/JSON.hs +29/−14
- Text/Pandoc/Walk.hs +28/−13
- changelog +4/−0
- pandoc-types.cabal +3/−3
LICENSE view
@@ -1,4 +1,4 @@-Copyright (c) 2013, John MacFarlane+Copyright (c) 2006-2016, John MacFarlane All rights reserved.
Text/Pandoc/Builder.hs view
@@ -2,27 +2,42 @@ DeriveDataTypeable, GeneralizedNewtypeDeriving, CPP, StandaloneDeriving, DeriveGeneric, DeriveTraversable #-} {--Copyright (C) 2010-2012 John MacFarlane <jgm@berkeley.edu>+Copyright (C) 2010-2016 John MacFarlane -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-the Free Software Foundation; either version 2 of the License, or-(at your option) any later version.+All rights reserved. -This program is distributed in the hope that it will be useful,-but WITHOUT ANY WARRANTY; without even the implied warranty of-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-GNU General Public License for more details.+Redistribution and use in source and binary forms, with or without+modification, are permitted provided that the following conditions are met: -You should have received a copy of the GNU General Public License-along with this program; if not, write to the Free Software-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA+ * Redistributions of source code must retain the above copyright+ notice, this list of conditions and the following disclaimer.++ * Redistributions in binary form must reproduce the above+ copyright notice, this list of conditions and the following+ disclaimer in the documentation and/or other materials provided+ with the distribution.++ * Neither the name of John MacFarlane nor the names of other+ contributors may be used to endorse or promote products derived+ from this software without specific prior written permission.++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -} {- | Module : Text.Pandoc.Builder- Copyright : Copyright (C) 2010 John MacFarlane- License : GNU GPL, version 2 or above+ Copyright : Copyright (C) 2010-2016 John MacFarlane+ License : BSD3 Maintainer : John MacFarlane <jgm@berkeley.edu> Stability : alpha
Text/Pandoc/Definition.hs view
@@ -1,27 +1,42 @@ {-# LANGUAGE DeriveDataTypeable, DeriveGeneric, FlexibleContexts, CPP #-} {--Copyright (C) 2006-2013 John MacFarlane <jgm@berkeley.edu>+Copyright (c) 2006-2016, John MacFarlane -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-the Free Software Foundation; either version 2 of the License, or-(at your option) any later version.+All rights reserved. -This program is distributed in the hope that it will be useful,-but WITHOUT ANY WARRANTY; without even the implied warranty of-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-GNU General Public License for more details.+Redistribution and use in source and binary forms, with or without+modification, are permitted provided that the following conditions are met: -You should have received a copy of the GNU General Public License-along with this program; if not, write to the Free Software-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA+ * Redistributions of source code must retain the above copyright+ notice, this list of conditions and the following disclaimer.++ * Redistributions in binary form must reproduce the above+ copyright notice, this list of conditions and the following+ disclaimer in the documentation and/or other materials provided+ with the distribution.++ * Neither the name of John MacFarlane nor the names of other+ contributors may be used to endorse or promote products derived+ from this software without specific prior written permission.++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -} {- | Module : Text.Pandoc.Definition- Copyright : Copyright (C) 2006-2010 John MacFarlane- License : GNU GPL, version 2 or above+ Copyright : Copyright (C) 2006-2016 John MacFarlane+ License : BSD3 Maintainer : John MacFarlane <jgm@berkeley.edu> Stability : alpha@@ -276,12 +291,22 @@ , Aeson.sumEncoding = Aeson.TaggedObject "t" "c" } +#if MIN_VERSION_aeson(1,0,0)+toJSON' :: (Generic a, Aeson.GToJSON Aeson.Zero (Rep a))+ => a -> Aeson.Value+#else toJSON' :: (Generic a, Aeson.GToJSON (Rep a)) => a -> Aeson.Value+#endif toJSON' = Aeson.genericToJSON jsonOpts +#if MIN_VERSION_aeson(1,0,0)+parseJSON' :: (Generic a, Aeson.GFromJSON Aeson.Zero (Rep a))+ => Aeson.Value -> Aeson.Parser a+#else parseJSON' :: (Generic a, Aeson.GFromJSON (Rep a)) => Aeson.Value -> Aeson.Parser a+#endif parseJSON' = Aeson.genericParseJSON jsonOpts instance FromJSON MetaValue
Text/Pandoc/Generic.hs view
@@ -1,25 +1,40 @@ {--Copyright (C) 2006-2010 John MacFarlane <jgm@berkeley.edu>+Copyright (c) 2006-2016, John MacFarlane -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-the Free Software Foundation; either version 2 of the License, or-(at your option) any later version.+All rights reserved. -This program is distributed in the hope that it will be useful,-but WITHOUT ANY WARRANTY; without even the implied warranty of-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-GNU General Public License for more details.+Redistribution and use in source and binary forms, with or without+modification, are permitted provided that the following conditions are met: -You should have received a copy of the GNU General Public License-along with this program; if not, write to the Free Software-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA+ * Redistributions of source code must retain the above copyright+ notice, this list of conditions and the following disclaimer.++ * Redistributions in binary form must reproduce the above+ copyright notice, this list of conditions and the following+ disclaimer in the documentation and/or other materials provided+ with the distribution.++ * Neither the name of John MacFarlane nor the names of other+ contributors may be used to endorse or promote products derived+ from this software without specific prior written permission.++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -} {- | Module : Text.Pandoc.Generic Copyright : Copyright (C) 2006-2010 John MacFarlane- License : GNU GPL, version 2 or above+ License : BSD3 Maintainer : John MacFarlane <jgm@berkeley.edu> Stability : alpha
Text/Pandoc/JSON.hs view
@@ -1,26 +1,41 @@ {-# LANGUAGE FlexibleInstances, FlexibleContexts #-} {--Copyright (C) 2013 John MacFarlane <jgm@berkeley.edu>+Copyright (c) 2013-2016, John MacFarlane -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-the Free Software Foundation; either version 2 of the License, or-(at your option) any later version.+All rights reserved. -This program is distributed in the hope that it will be useful,-but WITHOUT ANY WARRANTY; without even the implied warranty of-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-GNU General Public License for more details.+Redistribution and use in source and binary forms, with or without+modification, are permitted provided that the following conditions are met: -You should have received a copy of the GNU General Public License-along with this program; if not, write to the Free Software-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA+ * Redistributions of source code must retain the above copyright+ notice, this list of conditions and the following disclaimer.++ * Redistributions in binary form must reproduce the above+ copyright notice, this list of conditions and the following+ disclaimer in the documentation and/or other materials provided+ with the distribution.++ * Neither the name of John MacFarlane nor the names of other+ contributors may be used to endorse or promote products derived+ from this software without specific prior written permission.++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -} {- | Module : Text.Pandoc.JSON- Copyright : Copyright (C) 2013 John MacFarlane- License : GNU GPL, version 2 or above+ Copyright : Copyright (C) 2013-2016 John MacFarlane+ License : BSD3 Maintainer : John MacFarlane <jgm@berkeley.edu> Stability : alpha
Text/Pandoc/Walk.hs view
@@ -6,27 +6,42 @@ #define OVERLAPS #endif {--Copyright (C) 2013 John MacFarlane <jgm@berkeley.edu>+Copyright (c) 2013-2016, John MacFarlane -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-the Free Software Foundation; either version 2 of the License, or-(at your option) any later version.+All rights reserved. -This program is distributed in the hope that it will be useful,-but WITHOUT ANY WARRANTY; without even the implied warranty of-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-GNU General Public License for more details.+Redistribution and use in source and binary forms, with or without+modification, are permitted provided that the following conditions are met: -You should have received a copy of the GNU General Public License-along with this program; if not, write to the Free Software-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA+ * Redistributions of source code must retain the above copyright+ notice, this list of conditions and the following disclaimer.++ * Redistributions in binary form must reproduce the above+ copyright notice, this list of conditions and the following+ disclaimer in the documentation and/or other materials provided+ with the distribution.++ * Neither the name of John MacFarlane nor the names of other+ contributors may be used to endorse or promote products derived+ from this software without specific prior written permission.++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -} {- | Module : Text.Pandoc.Walk Copyright : Copyright (C) 2013 John MacFarlane- License : GNU GPL, version 2 or above+ License : BSD3 Maintainer : John MacFarlane <jgm@berkeley.edu> Stability : alpha
changelog view
@@ -1,3 +1,7 @@+[1.16.1.1]++ * Allow aeson 1.0.*.+ [1.16.1] * Allow aeson 0.11.*.
pandoc-types.cabal view
@@ -1,5 +1,5 @@ Name: pandoc-types-Version: 1.16.1+Version: 1.16.1.1 Synopsis: Types for representing a structured document Description: @Text.Pandoc.Definition@ defines the 'Pandoc' data structure, which is used by pandoc to represent@@ -27,7 +27,7 @@ License-file: LICENSE Author: John MacFarlane Maintainer: jgm@berkeley.edu-Bug-Reports: http://code.google.com/p/pandoc/issues/list+Bug-Reports: https://github.com/jgm/pandoc-types/issues Copyright: (c) 2006-2015 John MacFarlane Category: Text Build-type: Simple@@ -50,7 +50,7 @@ syb >= 0.1 && < 0.7, ghc-prim >= 0.2, bytestring >= 0.9 && < 0.11,- aeson >= 0.6.2 && < 0.12+ aeson >= 0.6.2 && < 1.1 if impl(ghc < 7.10) Build-depends: deepseq-generics >= 0.1 && < 0.2 else