git.iko.soy/typeable/pandoc
on master help sign in
Merge pull request #3997 from ickc/proofread
00db1e8John MacFarlane
.editorconfig+1−1
@@ -11,6 +11,6 @@ trim_trailing_whitespace = true
11[*.{markdown,md}]
11[*.{markdown,md}]
12trim_trailing_whitespace = false
12trim_trailing_whitespace = false
13
13
14−[tests/*]
14+[test/*]
15insert_final_newline = false
15insert_final_newline = false
16trim_trailing_whitespace = false
16trim_trailing_whitespace = false
CONTRIBUTING.md+29−26
@@ -13,12 +13,12 @@ Found a bug?
13Bug reports are welcome! Please report all bugs on pandoc's github
13Bug reports are welcome! Please report all bugs on pandoc's github
14[issue tracker].
14[issue tracker].
15
15
16−Before you submit a bug report, search the (open *and* closed) issues to make
16+Before you submit a bug report, search the [open issues] *and* [closed issues]
17−sure the issue hasn't come up before. Also, check the [User's Guide] and [FAQs]
17+to make sure the issue hasn't come up before. Also, check the [User's Guide] and
18−for anything relevant.
18+[FAQs] for anything relevant.
19
19
20−Make sure you can reproduce the bug with the latest released version of pandoc
20+Make sure you can reproduce the bug with the [latest released version] of pandoc
21−(or, even better, the development version).
21+(or, even better, the [development version]).
22
22
23Your report should give detailed, *reproducible* instructions, including
23Your report should give detailed, *reproducible* instructions, including
24
24
@@ -37,25 +37,25 @@ Out of scope?
37A less than perfect conversion does not necessarily mean there's
37A less than perfect conversion does not necessarily mean there's
38a bug in pandoc. Quoting from the MANUAL:
38a bug in pandoc. Quoting from the MANUAL:
39
39
40−> Because Pandoc's intermediate representation of a document is less
40+> Because pandoc's intermediate representation of a document is less
41> expressive than many of the formats it converts between, one should
41> expressive than many of the formats it converts between, one should
42> not expect perfect conversions between every format and every other.
42> not expect perfect conversions between every format and every other.
43> Pandoc attempts to preserve the structural elements of a document, but
43> Pandoc attempts to preserve the structural elements of a document, but
44> not formatting details such as margin size. And some document elements,
44> not formatting details such as margin size. And some document elements,
45−> such as complex tables, may not fit into Pandoc's simple document
45+> such as complex tables, may not fit into pandoc's simple document
46−> model. While conversions from Pandoc's Markdown to all formats aspire
46+> model. While conversions from pandoc's Markdown to all formats aspire
47−> to be perfect, conversions from formats more expressive than Pandoc's
47+> to be perfect, conversions from formats more expressive than pandoc's
48> Markdown can be expected to be lossy.
48> Markdown can be expected to be lossy.
49
49
50−For example, both docx and odt can represent margin size, but because
50+For example, both `docx` and `odt` formats can represent margin size, but
51−pandoc's internal document model does not contain a representation of
51+because pandoc's internal document model does not contain a representation of
52margin size, this information will be lost on converting from docx
52margin size, this information will be lost on converting from docx
53−to odt. (You can, however, customize margin size using `--reference-odt`.)
53+to `odt`. (You can, however, customize margin size using `--reference-doc`.)
54
54
55So before submitting a bug report, consider whether it might be
55So before submitting a bug report, consider whether it might be
56−"out of scope." If it concerns a feature of documents that isn't
56+"out of scope." If it concerns a feature of documents that isn't
57representable in pandoc's Markdown, then it very likely is.
57representable in pandoc's Markdown, then it very likely is.
58−(If in doubt, you can always ask on pandoc-discuss.)
58+(If in doubt, you can always ask on [pandoc-discuss].)
59
59
60Fixing bugs from the issue tracker
60Fixing bugs from the issue tracker
61----------------------------------
61----------------------------------
@@ -63,7 +63,7 @@ Fixing bugs from the issue tracker
63Almost all the bugs on the issue tracker have one or more associated
63Almost all the bugs on the issue tracker have one or more associated
64tags. These are used to indicate the *complexity* and *nature* of a
64tags. These are used to indicate the *complexity* and *nature* of a
65bug. There is not yet a way to indicate priority. An up to date
65bug. There is not yet a way to indicate priority. An up to date
66−summary of issues can be found [here](https://github.com/jgm/pandoc/labels).
66+summary of issues can be found on [GitHub labels].
67
67
68* [beginner-friendly] — The perfect starting point for new contributors. The
68* [beginner-friendly] — The perfect starting point for new contributors. The
69 issue is generic and can be resolved without deep knowledge of the code
69 issue is generic and can be resolved without deep knowledge of the code
@@ -92,8 +92,8 @@ or bug reports related to Markdown are labelled with [format:markdown].
92Have an idea for a new feature?
92Have an idea for a new feature?
93-------------------------------
93-------------------------------
94
94
95−First, search [pandoc-discuss] and the issue tracker (both open and closed
95+First, search [pandoc-discuss] and the issue tracker (both [open issues] *and*
96−issues) to make sure that the idea has not been discussed before.
96+[closed issues]) to make sure that the idea has not been discussed before.
97
97
98Explain the rationale for the feature you're requesting. Why would this
98Explain the rationale for the feature you're requesting. Why would this
99feature be useful? Consider also any possible drawbacks, including backwards
99feature be useful? Consider also any possible drawbacks, including backwards
@@ -136,7 +136,7 @@ Please follow these guidelines:
136 below under [Tests](#tests).) If you are adding a new writer or reader,
136 below under [Tests](#tests).) If you are adding a new writer or reader,
137 you must include tests.
137 you must include tests.
138
138
139−7. If you are adding a new feature, include updates to MANUAL.txt.
139+7. If you are adding a new feature, include updates to `MANUAL.txt`.
140
140
1418. All code must be released under the general license governing pandoc
1418. All code must be released under the general license governing pandoc
142 (GPL v2).
142 (GPL v2).
@@ -146,7 +146,7 @@ Please follow these guidelines:
146
146
14710. We aim for compatibility with ghc versions from 7.8.3 to the
14710. We aim for compatibility with ghc versions from 7.8.3 to the
148 latest release. All pull requests and commits are tested
148 latest release. All pull requests and commits are tested
149− automatically on travis-ci.org, using GHC versions in the
149+ automatically on <travis-ci.org>, using GHC versions in the
150 `Tested-With` stanza of `pandoc.cabal`. We currently relax
150 `Tested-With` stanza of `pandoc.cabal`. We currently relax
151 the "`-Wall` clean" requirement for GHC 7.10.x, because
151 the "`-Wall` clean" requirement for GHC 7.10.x, because
152 there are so many warnings relating to the addition of type
152 there are so many warnings relating to the addition of type
@@ -197,12 +197,10 @@ a ghci REPL for working with pandoc. With [stack], use
197We recommend using the following `.ghci` file (which can be
197We recommend using the following `.ghci` file (which can be
198placed in the source directory):
198placed in the source directory):
199
199
200−```
201−:set -fobject-code
200+ :set -fobject-code
202−:set -XTypeSynonymInstances
201+ :set -XTypeSynonymInstances
203−:set -XScopedTypeVariables
202+ :set -XScopedTypeVariables
204−:set -XOverloadedStrings
203+ :set -XOverloadedStrings
205−```
206
204
207Profiling
205Profiling
208---------
206---------
@@ -252,7 +250,7 @@ the pandoc library is in `src/`, the source for the tests is in
252
250
253The modules `Text.Pandoc.Definition`, `Text.Pandoc.Builder`, and
251The modules `Text.Pandoc.Definition`, `Text.Pandoc.Builder`, and
254`Text.Pandoc.Generic` are in a separate library `pandoc-types`. The code can
252`Text.Pandoc.Generic` are in a separate library `pandoc-types`. The code can
255−be found in a <http://github.com/jgm/pandoc-types>.
253+be found in <http://github.com/jgm/pandoc-types>.
256
254
257To build pandoc, you will need a working installation of the
255To build pandoc, you will need a working installation of the
258[Haskell platform].
256[Haskell platform].
@@ -304,6 +302,10 @@ The library is structured as follows:
304 - `Text.Pandoc.UUID` contains functions for generating UUIDs.
302 - `Text.Pandoc.UUID` contains functions for generating UUIDs.
305 - `Text.Pandoc.XML` contains functions for formatting XML.
303 - `Text.Pandoc.XML` contains functions for formatting XML.
306
304
305+[open issues]: https://github.com/jgm/pandoc/issues
306+[closed issues]: https://github.com/jgm/pandoc/issues?q=is%3Aissue+is%3Aclosed
307+[latest released version]: https://github.com/jgm/pandoc/releases/latest
308+[development version]: https://github.com/pandoc-extras/pandoc-nightly/releases/latest
307[pandoc-discuss]: http://groups.google.com/group/pandoc-discuss
309[pandoc-discuss]: http://groups.google.com/group/pandoc-discuss
308[issue tracker]: https://github.com/jgm/pandoc/issues
310[issue tracker]: https://github.com/jgm/pandoc/issues
309[User's Guide]: http://pandoc.org/MANUAL.html
311[User's Guide]: http://pandoc.org/MANUAL.html
@@ -311,6 +313,7 @@ The library is structured as follows:
311[EditorConfig]: http://editorconfig.org/
313[EditorConfig]: http://editorconfig.org/
312[Haskell platform]: http://www.haskell.org/platform/
314[Haskell platform]: http://www.haskell.org/platform/
313[hsb2hs]: http://hackage.haskell.org/package/hsb2hs
315[hsb2hs]: http://hackage.haskell.org/package/hsb2hs
316+[GitHub labels]: https://github.com/jgm/pandoc/labels
314[beginner-friendly]: https://github.com/jgm/pandoc/labels/beginner-friendly
317[beginner-friendly]: https://github.com/jgm/pandoc/labels/beginner-friendly
315[enhancement]: https://github.com/jgm/pandoc/labels/enhancement
318[enhancement]: https://github.com/jgm/pandoc/labels/enhancement
316[bug]: https://github.com/jgm/pandoc/labels/bug
319[bug]: https://github.com/jgm/pandoc/labels/bug
COPYRIGHT+1−1
@@ -146,7 +146,7 @@ Copyright (C) 2017 Albert Krewinkel
146Released under the GNU General Public License version 2 or later.
146Released under the GNU General Public License version 2 or later.
147
147
148----------------------------------------------------------------------
148----------------------------------------------------------------------
149−The dzslides template contains javascript and CSS from Paul Rouget's
149+The dzslides template contains JavaScript and CSS from Paul Rouget's
150dzslides template.
150dzslides template.
151http://github.com/paulrouget/dzslides
151http://github.com/paulrouget/dzslides
152
152
MANUAL.txt+2−2
@@ -470,7 +470,7 @@ Reader options
470 Those who would prefer to write filters in python can use the
470 Those who would prefer to write filters in python can use the
471 module [`pandocfilters`], installable from PyPI. There are also
471 module [`pandocfilters`], installable from PyPI. There are also
472 pandoc filter libraries in [PHP], [perl], and
472 pandoc filter libraries in [PHP], [perl], and
473− [javascript/node.js].
473+ [JavaScript/node.js].
474
474
475 In order of preference, pandoc will look for filters in
475 In order of preference, pandoc will look for filters in
476
476
@@ -571,7 +571,7 @@ Reader options
571[`pandocfilters`]: https://github.com/jgm/pandocfilters
571[`pandocfilters`]: https://github.com/jgm/pandocfilters
572[PHP]: https://github.com/vinai/pandocfilters-php
572[PHP]: https://github.com/vinai/pandocfilters-php
573[perl]: https://metacpan.org/pod/Pandoc::Filter
573[perl]: https://metacpan.org/pod/Pandoc::Filter
574−[javascript/node.js]: https://github.com/mvhenderson/pandoc-filter-node
574+[JavaScript/node.js]: https://github.com/mvhenderson/pandoc-filter-node
575
575
576General writer options
576General writer options
577----------------------
577----------------------
Setup.hs+1−1
@@ -1,5 +1,5 @@
1{-
1{-
2−Copyright (C) 2006-2015 John MacFarlane <jgm@berkeley.edu>
2+Copyright (C) 2006-2017 John MacFarlane <jgm@berkeley.edu>
3
3
4This program is free software; you can redistribute it and/or modify
4This program is free software; you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
5it under the terms of the GNU General Public License as published by
benchmark/benchmark-pandoc.hs+1−1
@@ -1,5 +1,5 @@
1{-
1{-
2−Copyright (C) 2012-2014 John MacFarlane <jgm@berkeley.edu>
2+Copyright (C) 2012-2017 John MacFarlane <jgm@berkeley.edu>
3
3
4This program is free software; you can redistribute it and/or modify
4This program is free software; you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
5it under the terms of the GNU General Public License as published by
doc/filters.md+4−2
@@ -313,8 +313,10 @@ For a more Pythonic alternative to pandocfilters, see
313the [panflute](http://scorreia.com/software/panflute/) library.
313the [panflute](http://scorreia.com/software/panflute/) library.
314Don't like Python? There are also ports of pandocfilters in
314Don't like Python? There are also ports of pandocfilters in
315[PHP](https://github.com/vinai/pandocfilters-php),
315[PHP](https://github.com/vinai/pandocfilters-php),
316−[perl](https://metacpan.org/pod/Pandoc::Filter), and
316+[perl](https://metacpan.org/pod/Pandoc::Filter),
317−[javascript/node.js](https://github.com/mvhenderson/pandoc-filter-node).]
317+[javascript/node.js](https://github.com/mvhenderson/pandoc-filter-node),
318+[Groovy](https://github.com/dfrommi/groovy-pandoc), and
319+[Ruby](https://heerdebeer.org/Software/markdown/paru/).
318
320
319Starting with pandoc 2.0, pandoc includes built-in support for
321Starting with pandoc 2.0, pandoc includes built-in support for
320writing filters in lua. The lua interpreter is built in to
322writing filters in lua. The lua interpreter is built in to
doc/using-the-pandoc-api.md+1−1
@@ -21,7 +21,7 @@ Pictorially:
21[input format] ==reader==> [Pandoc AST] ==writer==> [output format]
21[input format] ==reader==> [Pandoc AST] ==writer==> [output format]
22```
22```
23
23
24−This architecture allows pandoc to perform $M \times n$
24+This architecture allows pandoc to perform $M \times N$
25conversions with $M$ readers and $N$ writers.
25conversions with $M$ readers and $N$ writers.
26
26
27The Pandoc AST is defined in the
27The Pandoc AST is defined in the
linux/control.in+1−1
@@ -22,5 +22,5 @@ Description: general markup converter
22 MediaWiki, DokuWiki, ZimWiki, Textile, groff man, groff
22 MediaWiki, DokuWiki, ZimWiki, Textile, groff man, groff
23 ms, plain text, Emacs Org-Mode, AsciiDoc, Haddock markup,
23 ms, plain text, Emacs Org-Mode, AsciiDoc, Haddock markup,
24 EPUB (v2 and v3), FictionBook2, InDesign ICML, Muse, and
24 EPUB (v2 and v3), FictionBook2, InDesign ICML, Muse, and
25− several kinds of HTML/javascript slide shows (S5, Slidy,
25+ several kinds of HTML/JavaScript slide shows (S5, Slidy,
26 Slideous, DZSlides, reveal.js).
26 Slideous, DZSlides, reveal.js).
man/pandoc.1+1−1
@@ -485,7 +485,7 @@ writing filters in Haskell.
485Those who would prefer to write filters in python can use the module
485Those who would prefer to write filters in python can use the module
486\f[C]pandocfilters\f[], installable from PyPI.
486\f[C]pandocfilters\f[], installable from PyPI.
487There are also pandoc filter libraries in PHP, perl, and
487There are also pandoc filter libraries in PHP, perl, and
488−javascript/node.js.
488+JavaScript/node.js.
489.PP
489.PP
490In order of preference, pandoc will look for filters in
490In order of preference, pandoc will look for filters in
491.IP "1." 3
491.IP "1." 3
pandoc.cabal+1−1
@@ -25,7 +25,7 @@ description: Pandoc is a Haskell library for converting from one markup
25 RTF, MediaWiki, DokuWiki, ZimWiki, Textile, groff man,
25 RTF, MediaWiki, DokuWiki, ZimWiki, Textile, groff man,
26 groff ms, plain text, Emacs Org-Mode, AsciiDoc,
26 groff ms, plain text, Emacs Org-Mode, AsciiDoc,
27 Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign
27 Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign
28− ICML, Muse, and several kinds of HTML/javascript slide
28+ ICML, Muse, and several kinds of HTML/JavaScript slide
29 shows (S5, Slidy, Slideous, DZSlides, reveal.js).
29 shows (S5, Slidy, Slideous, DZSlides, reveal.js).
30 .
30 .
31 In contrast to most existing tools for converting Markdown
31 In contrast to most existing tools for converting Markdown
pandoc.hs+2−2
@@ -3,7 +3,7 @@
3{-# LANGUAGE ScopedTypeVariables #-}
3{-# LANGUAGE ScopedTypeVariables #-}
4{-# LANGUAGE TupleSections #-}
4{-# LANGUAGE TupleSections #-}
5{-
5{-
6−Copyright (C) 2006-2016 John MacFarlane <jgm@berkeley.edu>
6+Copyright (C) 2006-2017 John MacFarlane <jgm@berkeley.edu>
7
7
8This program is free software; you can redistribute it and/or modify
8This program is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by
9it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22
22
23{- |
23{- |
24 Module : Main
24 Module : Main
25− Copyright : Copyright (C) 2006-2016 John MacFarlane
25+ Copyright : Copyright (C) 2006-2017 John MacFarlane
26 License : GNU GPL, version 2 or above
26 License : GNU GPL, version 2 or above
27
27
28 Maintainer : John MacFarlane <jgm@berkeley@edu>
28 Maintainer : John MacFarlane <jgm@berkeley@edu>
src/Text/Pandoc/Lua/Util.hs+1−1
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19{-# LANGUAGE FlexibleInstances #-}
19{-# LANGUAGE FlexibleInstances #-}
20{- |
20{- |
21 Module : Text.Pandoc.Lua.Util
21 Module : Text.Pandoc.Lua.Util
22− Copyright : © 2012–2016 John MacFarlane,
22+ Copyright : © 2012–2017 John MacFarlane,
23 © 2017 Albert Krewinkel
23 © 2017 Albert Krewinkel
24 License : GNU GPL, version 2 or above
24 License : GNU GPL, version 2 or above
25
25
src/Text/Pandoc/Readers/CommonMark.hs+2−2
@@ -1,5 +1,5 @@
1{-
1{-
2−Copyright (C) 2015 John MacFarlane <jgm@berkeley.edu>
2+Copyright (C) 2015-2017 John MacFarlane <jgm@berkeley.edu>
3
3
4This program is free software; you can redistribute it and/or modify
4This program is free software; you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
5it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
18
19{- |
19{- |
20 Module : Text.Pandoc.Readers.CommonMark
20 Module : Text.Pandoc.Readers.CommonMark
21− Copyright : Copyright (C) 2015 John MacFarlane
21+ Copyright : Copyright (C) 2015-2017 John MacFarlane
22 License : GNU GPL, version 2 or above
22 License : GNU GPL, version 2 or above
23
23
24 Maintainer : John MacFarlane <jgm@berkeley.edu>
24 Maintainer : John MacFarlane <jgm@berkeley.edu>
src/Text/Pandoc/Writers/CommonMark.hs+2−2
@@ -1,6 +1,6 @@
1{-# LANGUAGE OverloadedStrings #-}
1{-# LANGUAGE OverloadedStrings #-}
2{-
2{-
3−Copyright (C) 2015 John MacFarlane <jgm@berkeley.edu>
3+Copyright (C) 2015-2017 John MacFarlane <jgm@berkeley.edu>
4
4
5This program is free software; you can redistribute it and/or modify
5This program is free software; you can redistribute it and/or modify
6it under the terms of the GNU General Public License as published by
6it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
19
20{- |
20{- |
21 Module : Text.Pandoc.Writers.CommonMark
21 Module : Text.Pandoc.Writers.CommonMark
22− Copyright : Copyright (C) 2015 John MacFarlane
22+ Copyright : Copyright (C) 2015-2017 John MacFarlane
23 License : GNU GPL, version 2 or above
23 License : GNU GPL, version 2 or above
24
24
25 Maintainer : John MacFarlane <jgm@berkeley.edu>
25 Maintainer : John MacFarlane <jgm@berkeley.edu>