diff options
| author | Yan Pashkovsky <Yanpas@users.noreply.github.com> | 2018-05-09 19:48:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-09 19:48:34 +0300 |
| commit | a337685fe0ab9c63b9456f27787bbe4f0d785a94 (patch) | |
| tree | e9fc4dfc0802f8acd97f06a8cc8d7c89b5a988ab /COPYRIGHT | |
| parent | 8e9973b9f761262b6871206f741ac3f2a25aa6bb (diff) | |
| parent | 5f33d2e0cd9f19566904c93be04f586de811dd75 (diff) | |
| download | pandoc-a337685fe0ab9c63b9456f27787bbe4f0d785a94.tar.gz | |
Merge branch 'master' into groff_reader
Diffstat (limited to 'COPYRIGHT')
| -rw-r--r-- | COPYRIGHT | 35 |
1 files changed, 23 insertions, 12 deletions
@@ -69,8 +69,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---------------------------------------------------------------------- -Pandoc's templates (in `data/templates`) are dual-licensed GPL (v2 or -higher, same as pandoc) and the BSD 3-clause license. +Pandoc's templates (in `data/templates`) are dual-licensed as either +GPL (v2 or higher, same as pandoc) or (at your option) the BSD +3-clause license. Copyright (c) 2014--2018, John MacFarlane @@ -119,6 +120,24 @@ Copyright (C) 2010-2018 Paul Rivier and John MacFarlane Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- +src/Text/Pandoc/Readers/TikiWiki.hs +Copyright (C) 2017 Robin Lee Powell + +Released under the GNU General Public License version 2 or later. + +---------------------------------------------------------------------- +src/Text/Pandoc/Readers/JATS.hs +Copyright (C) 2017-2018 Hamish Mackenzie + +Released under the GNU General Public License version 2 or later. + +---------------------------------------------------------------------- +src/Text/Pandoc/Readers/EPUB.hs +Copyright (C) 2014-2018 Matthew Pickering + +Released under the GNU General Public License version 2 or later. + +---------------------------------------------------------------------- src/Text/Pandoc/Readers/Org.hs src/Text/Pandoc/Readers/Org/* test/Tests/Readers/Org/* @@ -127,20 +146,12 @@ Copyright (C) 2014-2018 Albert Krewinkel Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- -data/LaTeXMathML.js -Adapted by Jeff Knisely and Douglas Woodall from -ASCIIMathML.js v. 1.4.7 -Copyright (C) 2005 Peter Jipsen +src/Text/Pandoc/Readers/FB2.hs +Copyright (C) 2018 Alexander Krotov Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- -data/MathMLinHTML.js -Copyright (C) 2004 Peter Jipsen http://www.chapman.edu/~jipsen - -Released under the GNU General Public License version 2 or later. - ------------------------------------------------------------------------- data/pandoc.lua Copyright (C) 2017-2018 Albert Krewinkel |