git.iko.soy/typeable/pandoc
on master help sign in
Merge pull request #3997 from ickc/proofread

Proofread on *.md

commit00db1e873706bee47cd49b88ac4eca04c7de8119 authorJohn MacFarlane <jgm@berkeley.edu> dateFri 27 Oct 2017, 02:00 (9 years ago) parent535a9500b09409
15 files changed+50−45
.editorconfig+1−1 CONTRIBUTING.md+29−26 COPYRIGHT+1−1 MANUAL.txt+2−2 Setup.hs+1−1 benchmark/benchmark-pandoc.hs+1−1 doc/filters.md+4−2 doc/using-the-pandoc-api.md+1−1 linux/control.in+1−1 man/pandoc.1+1−1 pandoc.cabal+1−1 pandoc.hs+2−2 src/Text/Pandoc/Lua/Util.hs+1−1 src/Text/Pandoc/Readers/CommonMark.hs+2−2 src/Text/Pandoc/Writers/CommonMark.hs+2−2
.editorconfig+1−1
@@ -11,6 +11,6 @@ trim_trailing_whitespace = true
1111[*.{markdown,md}]
1212trim_trailing_whitespace = false
1313
14−[tests/*]
14+[test/*]
1515insert_final_newline = false
1616trim_trailing_whitespace = false
CONTRIBUTING.md+29−26
@@ -13,12 +13,12 @@ Found a bug?
1313Bug reports are welcome! Please report all bugs on pandoc's github
1414[issue tracker].
1515
16−Before you submit a bug report, search the (open *and* closed) issues to make
17−sure the issue hasn't come up before. Also, check the [User's Guide] and [FAQs]
18−for anything relevant.
16+Before you submit a bug report, search the [open issues] *and* [closed issues]
17+to make sure the issue hasn't come up before. Also, check the [User's Guide] and
18+[FAQs] for anything relevant.
1919
20−Make sure you can reproduce the bug with the latest released version of pandoc
21−(or, even better, the development version).
20+Make sure you can reproduce the bug with the [latest released version] of pandoc
21+(or, even better, the [development version]).
2222
2323Your report should give detailed, *reproducible* instructions, including
2424
@@ -37,25 +37,25 @@ Out of scope?
3737A less than perfect conversion does not necessarily mean there's
3838a bug in pandoc. Quoting from the MANUAL:
3939
40−> Because Pandoc's intermediate representation of a document is less
40+> Because pandoc's intermediate representation of a document is less
4141> expressive than many of the formats it converts between, one should
4242> not expect perfect conversions between every format and every other.
4343> Pandoc attempts to preserve the structural elements of a document, but
4444> not formatting details such as margin size. And some document elements,
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
47−> to be perfect, conversions from formats more expressive than Pandoc's
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
47+> to be perfect, conversions from formats more expressive than pandoc's
4848> Markdown can be expected to be lossy.
4949
50−For example, both docx and odt can represent margin size, but because
51−pandoc's internal document model does not contain a representation of
50+For example, both `docx` and `odt` formats can represent margin size, but
51+because pandoc's internal document model does not contain a representation of
5252margin 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`.)
5454
5555So 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
5757representable 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].)
5959
6060Fixing bugs from the issue tracker
6161----------------------------------
@@ -63,7 +63,7 @@ Fixing bugs from the issue tracker
6363Almost all the bugs on the issue tracker have one or more associated
6464tags. These are used to indicate the *complexity* and *nature* of a
6565bug. 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].
6767
6868* [beginner-friendly] — The perfect starting point for new contributors. The
6969 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].
9292Have an idea for a new feature?
9393-------------------------------
9494
95−First, search [pandoc-discuss] and the issue tracker (both open and closed
96−issues) to make sure that the idea has not been discussed before.
95+First, search [pandoc-discuss] and the issue tracker (both [open issues] *and*
96+[closed issues]) to make sure that the idea has not been discussed before.
9797
9898Explain the rationale for the feature you're requesting. Why would this
9999feature be useful? Consider also any possible drawbacks, including backwards
@@ -136,7 +136,7 @@ Please follow these guidelines:
136136 below under [Tests](#tests).) If you are adding a new writer or reader,
137137 you must include tests.
138138
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`.
140140
1411418. All code must be released under the general license governing pandoc
142142 (GPL v2).
@@ -146,7 +146,7 @@ Please follow these guidelines:
146146
14714710. We aim for compatibility with ghc versions from 7.8.3 to the
148148 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
150150 `Tested-With` stanza of `pandoc.cabal`. We currently relax
151151 the "`-Wall` clean" requirement for GHC 7.10.x, because
152152 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
197197We recommend using the following `.ghci` file (which can be
198198placed in the source directory):
199199
200−```
201−:set -fobject-code
202−:set -XTypeSynonymInstances
203−:set -XScopedTypeVariables
204−:set -XOverloadedStrings
205−```
200+ :set -fobject-code
201+ :set -XTypeSynonymInstances
202+ :set -XScopedTypeVariables
203+ :set -XOverloadedStrings
206204
207205Profiling
208206---------
@@ -252,7 +250,7 @@ the pandoc library is in `src/`, the source for the tests is in
252250
253251The modules `Text.Pandoc.Definition`, `Text.Pandoc.Builder`, and
254252`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>.
256254
257255To build pandoc, you will need a working installation of the
258256[Haskell platform].
@@ -304,6 +302,10 @@ The library is structured as follows:
304302 - `Text.Pandoc.UUID` contains functions for generating UUIDs.
305303 - `Text.Pandoc.XML` contains functions for formatting XML.
306304
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
307309[pandoc-discuss]: http://groups.google.com/group/pandoc-discuss
308310[issue tracker]: https://github.com/jgm/pandoc/issues
309311[User's Guide]: http://pandoc.org/MANUAL.html
@@ -311,6 +313,7 @@ The library is structured as follows:
311313[EditorConfig]: http://editorconfig.org/
312314[Haskell platform]: http://www.haskell.org/platform/
313315[hsb2hs]: http://hackage.haskell.org/package/hsb2hs
316+[GitHub labels]: https://github.com/jgm/pandoc/labels
314317[beginner-friendly]: https://github.com/jgm/pandoc/labels/beginner-friendly
315318[enhancement]: https://github.com/jgm/pandoc/labels/enhancement
316319[bug]: https://github.com/jgm/pandoc/labels/bug
COPYRIGHT+1−1
@@ -146,7 +146,7 @@ Copyright (C) 2017 Albert Krewinkel
146146Released under the GNU General Public License version 2 or later.
147147
148148----------------------------------------------------------------------
149−The dzslides template contains javascript and CSS from Paul Rouget's
149+The dzslides template contains JavaScript and CSS from Paul Rouget's
150150dzslides template.
151151http://github.com/paulrouget/dzslides
152152
MANUAL.txt+2−2
@@ -470,7 +470,7 @@ Reader options
470470 Those who would prefer to write filters in python can use the
471471 module [`pandocfilters`], installable from PyPI. There are also
472472 pandoc filter libraries in [PHP], [perl], and
473− [javascript/node.js].
473+ [JavaScript/node.js].
474474
475475 In order of preference, pandoc will look for filters in
476476
@@ -571,7 +571,7 @@ Reader options
571571[`pandocfilters`]: https://github.com/jgm/pandocfilters
572572[PHP]: https://github.com/vinai/pandocfilters-php
573573[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
575575
576576General writer options
577577----------------------
Setup.hs+1−1
@@ -1,5 +1,5 @@
11{-
2−Copyright (C) 2006-2015 John MacFarlane <jgm@berkeley.edu>
2+Copyright (C) 2006-2017 John MacFarlane <jgm@berkeley.edu>
33
44This program is free software; you can redistribute it and/or modify
55it under the terms of the GNU General Public License as published by
benchmark/benchmark-pandoc.hs+1−1
@@ -1,5 +1,5 @@
11{-
2−Copyright (C) 2012-2014 John MacFarlane <jgm@berkeley.edu>
2+Copyright (C) 2012-2017 John MacFarlane <jgm@berkeley.edu>
33
44This program is free software; you can redistribute it and/or modify
55it 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
313313the [panflute](http://scorreia.com/software/panflute/) library.
314314Don't like Python? There are also ports of pandocfilters in
315315[PHP](https://github.com/vinai/pandocfilters-php),
316−[perl](https://metacpan.org/pod/Pandoc::Filter), and
317−[javascript/node.js](https://github.com/mvhenderson/pandoc-filter-node).]
316+[perl](https://metacpan.org/pod/Pandoc::Filter),
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/).
318320
319321Starting with pandoc 2.0, pandoc includes built-in support for
320322writing filters in lua. The lua interpreter is built in to
doc/using-the-pandoc-api.md+1−1
@@ -21,7 +21,7 @@ Pictorially:
2121[input format] ==reader==> [Pandoc AST] ==writer==> [output format]
2222```
2323
24−This architecture allows pandoc to perform $M \times n$
24+This architecture allows pandoc to perform $M \times N$
2525conversions with $M$ readers and $N$ writers.
2626
2727The Pandoc AST is defined in the
linux/control.in+1−1
@@ -22,5 +22,5 @@ Description: general markup converter
2222 MediaWiki, DokuWiki, ZimWiki, Textile, groff man, groff
2323 ms, plain text, Emacs Org-Mode, AsciiDoc, Haddock markup,
2424 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,
2626 Slideous, DZSlides, reveal.js).
man/pandoc.1+1−1
@@ -485,7 +485,7 @@ writing filters in Haskell.
485485Those who would prefer to write filters in python can use the module
486486\f[C]pandocfilters\f[], installable from PyPI.
487487There are also pandoc filter libraries in PHP, perl, and
488−javascript/node.js.
488+JavaScript/node.js.
489489.PP
490490In order of preference, pandoc will look for filters in
491491.IP "1." 3
pandoc.cabal+1−1
@@ -25,7 +25,7 @@ description: Pandoc is a Haskell library for converting from one markup
2525 RTF, MediaWiki, DokuWiki, ZimWiki, Textile, groff man,
2626 groff ms, plain text, Emacs Org-Mode, AsciiDoc,
2727 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
2929 shows (S5, Slidy, Slideous, DZSlides, reveal.js).
3030 .
3131 In contrast to most existing tools for converting Markdown
pandoc.hs+2−2
@@ -3,7 +3,7 @@
33{-# LANGUAGE ScopedTypeVariables #-}
44{-# LANGUAGE TupleSections #-}
55{-
6−Copyright (C) 2006-2016 John MacFarlane <jgm@berkeley.edu>
6+Copyright (C) 2006-2017 John MacFarlane <jgm@berkeley.edu>
77
88This program is free software; you can redistribute it and/or modify
99it 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
2222
2323{- |
2424 Module : Main
25− Copyright : Copyright (C) 2006-2016 John MacFarlane
25+ Copyright : Copyright (C) 2006-2017 John MacFarlane
2626 License : GNU GPL, version 2 or above
2727
2828 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
1919{-# LANGUAGE FlexibleInstances #-}
2020{- |
2121 Module : Text.Pandoc.Lua.Util
22− Copyright : © 2012–2016 John MacFarlane,
22+ Copyright : © 2012–2017 John MacFarlane,
2323 © 2017 Albert Krewinkel
2424 License : GNU GPL, version 2 or above
2525
src/Text/Pandoc/Readers/CommonMark.hs+2−2
@@ -1,5 +1,5 @@
11{-
2−Copyright (C) 2015 John MacFarlane <jgm@berkeley.edu>
2+Copyright (C) 2015-2017 John MacFarlane <jgm@berkeley.edu>
33
44This program is free software; you can redistribute it and/or modify
55it 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
1818
1919{- |
2020 Module : Text.Pandoc.Readers.CommonMark
21− Copyright : Copyright (C) 2015 John MacFarlane
21+ Copyright : Copyright (C) 2015-2017 John MacFarlane
2222 License : GNU GPL, version 2 or above
2323
2424 Maintainer : John MacFarlane <jgm@berkeley.edu>
src/Text/Pandoc/Writers/CommonMark.hs+2−2
@@ -1,6 +1,6 @@
11{-# LANGUAGE OverloadedStrings #-}
22{-
3−Copyright (C) 2015 John MacFarlane <jgm@berkeley.edu>
3+Copyright (C) 2015-2017 John MacFarlane <jgm@berkeley.edu>
44
55This program is free software; you can redistribute it and/or modify
66it 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
1919
2020{- |
2121 Module : Text.Pandoc.Writers.CommonMark
22− Copyright : Copyright (C) 2015 John MacFarlane
22+ Copyright : Copyright (C) 2015-2017 John MacFarlane
2323 License : GNU GPL, version 2 or above
2424
2525 Maintainer : John MacFarlane <jgm@berkeley.edu>