diff options
-rw-r--r-- | .stylish-haskell.yaml | 8 | ||||
-rw-r--r-- | CONTRIBUTING.md | 2 | ||||
-rw-r--r-- | changelog | 64 | ||||
-rw-r--r-- | default.nix | 2 | ||||
-rw-r--r-- | doc/lua-filters.md | 2 | ||||
-rw-r--r-- | doc/using-the-pandoc-api.md | 4 | ||||
-rw-r--r-- | test/Tests/Lua.hs | 2 | ||||
-rw-r--r-- | test/Tests/Readers/Org/Inline.hs | 2 | ||||
-rw-r--r-- | test/command/3432.md | 2 | ||||
-rw-r--r-- | test/pptx/lists.native | 2 | ||||
-rw-r--r-- | test/pptx/lists.pptx | bin | 26765 -> 26765 bytes | |||
-rw-r--r-- | test/pptx/lists_templated.pptx | bin | 394091 -> 394091 bytes | |||
-rw-r--r-- | test/textile-reader.native | 2 | ||||
-rw-r--r-- | test/textile-reader.textile | 2 | ||||
-rw-r--r-- | test/txt2tags.t2t | 2 | ||||
-rw-r--r-- | trypandoc/trypandoc.hs | 2 |
16 files changed, 49 insertions, 49 deletions
diff --git a/.stylish-haskell.yaml b/.stylish-haskell.yaml index 496e72802..43c8442f8 100644 --- a/.stylish-haskell.yaml +++ b/.stylish-haskell.yaml @@ -41,7 +41,7 @@ steps: # Default: global. align: none - # Folowing options affect only import list alignment. + # Following options affect only import list alignment. # # List align has following options: # @@ -75,7 +75,7 @@ steps: # short enough to fit to single line. Otherwise it'll be multiline. # # - multiline: One line per import list entry. - # Type with contructor list acts like single import. + # Type with constructor list acts like single import. # # > import qualified Data.Map as M # > ( empty @@ -91,7 +91,7 @@ steps: # This option affects 'list_align' and 'long_list_align'. list_padding: 4 - # Separate lists option affects formating of import list for type + # Separate lists option affects formatting of import list for type # or class. The only difference is single space between type and list # of constructors, selectors and class functions. # @@ -124,7 +124,7 @@ steps: # Align affects alignment of closing pragma brackets. # - # - true: Brackets are aligned in same collumn. + # - true: Brackets are aligned in same column. # # - false: Brackets are not aligned together. There is only one space # between actual import and closing bracket. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 37c7be5a2..9f10ca2ec 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -264,7 +264,7 @@ The library is structured as follows: - `Text.Pandoc.Definition` (in `pandoc-types`) defines the types used for representing a pandoc document. - `Text.Pandoc.Builder` (in `pandoc-types`) provides functions for - building pandoc documents programatically. + building pandoc documents programmatically. - `Text.Pandoc.Generics` (in `pandoc-types`) provides functions allowing you to promote functions that operate on parts of pandoc documents to functions that operate on whole pandoc documents, walking the @@ -432,7 +432,7 @@ pandoc (2.1.3) * JATS writer: Remove extraneous, significant whitespace (#4335, Nokome Bentley). - * html2pdf: inject base tag wih current working directory (#4413, Mauro + * html2pdf: inject base tag with current working directory (#4413, Mauro Bieg). This helps ensure that linked resources are included. * Add Semigroup instances for everything for which we defined a @@ -580,7 +580,7 @@ pandoc (2.1.2) * Docx reader (Jesse Rosenthal, except where noted): + Handle nested sdt tags (#4415). - + Don't look up dependant run styles if `+styles` is enabled. + + Don't look up dependent run styles if `+styles` is enabled. + Move pandoc inline styling inside custom-style span. + Read custom styles (#1843). This will read all paragraph and character classes as divs and spans, respectively. Dependent styles @@ -2283,7 +2283,7 @@ pandoc (2.0) * Removed `hard_line_breaks` extension from `markdown_github` (#3594). GitHub has two Markdown modes, one for long-form documents like READMEs - and one for short things like issue coments. In issue comments, a line + and one for short things like issue comments. In issue comments, a line break is treated as a hard line break. In README, wikis, etc., it is treated as a space as in regular Markdown. Since pandoc is more likely to be used to convert long-form documents from GitHub Markdown, @@ -2636,7 +2636,7 @@ pandoc (2.0) top-level `Text.Pandoc` module. + Changed `StringWriter` -> `TextWriter`. - + `getWriter` now retuns a pair of a reader and + + `getWriter` now returns a pair of a reader and `Extensions`, instead of building the extensions into the reader (#3659). The calling code must explicitly set `readerExtensions` using the `Extensions` returned. The @@ -3049,7 +3049,7 @@ pandoc (2.0) of item disappear or are misplaced. Use `\texttt` instead. + Fix problem with escaping in `lstinline` (#1629). Previously the LaTeX writer created invalid LaTeX when `--listings` was specified and - a code span occured inside emphasis or another construction. + a code span occurred inside emphasis or another construction. + Fix error with line breaks after empty content (#2874). LaTeX requires something before a line break, so we insert a `~` if no printable content has yet been emitted. @@ -3156,7 +3156,7 @@ pandoc (2.0) + Don't drop smartTag contents (#2242). + Handle local namespace declarations (#3365). Previously we didn't - recognize math, for example, when the xmlns declaration occured on + recognize math, for example, when the xmlns declaration occurred on the element and not the root. + More efficient trimSps (#1530). Replacing `trimLineBreaks`. This does the work of `normalizeSpaces` as well, so we avoid the need for @@ -3390,7 +3390,7 @@ pandoc (2.0) + Allow `]` inside group in option brackets (#3857). + lstinline with braces can be used (verb cannot be used with braces) (Marc Schreiber, #3535). - + Fix keyval funtion: pandoc did not parse options in braces correctly + + Fix keyval function: pandoc did not parse options in braces correctly (Marc Schreiber, #3642). + When parsing raw LaTeX commands, include trailing space (#1773). Otherwise things like `\noindent foo` break and turn into @@ -3482,7 +3482,7 @@ pandoc (2.0) parse, the parser was applied too often, consuming too much of the input. This only affects `many1Till p end` where `p` matches on a prefix of `end`. - + Provide `parseFromString` (#3690). This is a verison of + + Provide `parseFromString` (#3690). This is a version of `parseFromString` specialied to ParserState, which resets `stateLastStrPos` at the end. This is almost always what we want. This fixes a bug where `_hi_` wasn't treated as emphasis in the @@ -3588,7 +3588,7 @@ pandoc (2.0) + Use `unicode-math` (Vaclav Haisman). Use `mathspec` with only XeLaTeX on request. + Don't load `fontspec` before `unicode-math` (over there). - The `unicode-math` package loads `fontspec` so explict loading of + The `unicode-math` package loads `fontspec` so explicit loading of `fontspec` before `unicode-math` is not necessary. + Use `unicode-math` by default in default.latex template. mathspec will be used in xelatex if the `mathspec` variable is set; otherwise @@ -4241,7 +4241,7 @@ pandoc (1.18) is now used in parsing RST and Markdown line blocks, DocBook `linegroup`/`line` combinations, and Org-mode `VERSE` blocks. Previously `Para` blocks with hard linebreaks were used. `LineBlock`s - are handled specially in the following ouput formats: AsciiDoc + are handled specially in the following output formats: AsciiDoc (as `[verse]` blocks), ConTeXt (`\startlines`/`\endlines`), HTML (`div` with a style), Markdown (line blocks if `line_blocks` is enabled), Org-mode (`VERSE` blocks), RST (line blocks). In @@ -4388,7 +4388,7 @@ pandoc (1.18) comma-separated list. + Give precedence to later meta lines. The last meta-line of any given type is the significant line. Previously the value of the first line - was kept, even if more lines of the same type were encounterd. + was kept, even if more lines of the same type were encountered. + Read LaTeX_header as header-includes. LaTeX-specific header commands can be defined in `#+LaTeX_header` lines. They are parsed as format-specific inlines to ensure that they will only show up in LaTeX @@ -4436,7 +4436,7 @@ pandoc (1.18) be able to figure out internal links to a header in a docx if the anchor span was empty. We change that to read the inlines out of the first anchor span in a header. - + Let headers use exisiting id. Previously we always generated an id for + + Let headers use existing id. Previously we always generated an id for headers (since they wouldn't bring one from Docx). Now we let it use an existing one if possible. This should allow us to recurs through anchor spans. @@ -4543,7 +4543,7 @@ pandoc (1.18) + Don't emit HTML for tables unless `raw_html` extension is set (#3154). Emit `[TABLE]` if no suitable table formats are enabled and raw HTML is disabled. - + Check for the `raw_html` extension before emiting a raw HTML block. + + Check for the `raw_html` extension before emitting a raw HTML block. + Abstract out note/ref function (Jesse Rosenthal). + Add ReaderT monad for environment variables (Jesse Rosenthal). @@ -5023,7 +5023,7 @@ pandoc (1.17.1) character. Empty rows where parsed as alignment rows and dropped from the output. + Fix spacing after LaTeX-style symbols. - The org-reader was droping space after unescaped LaTeX-style symbol + The org-reader was dropping space after unescaped LaTeX-style symbol commands: `\ForAll \Auml` resulted in `∀Ä` but should give `∀ Ä` instead. This seems to be because the LaTeX-reader treats the command-terminating space as part of the command. Dropping the trailing @@ -5117,7 +5117,7 @@ pandoc (1.17.1) + Clarified documentation of `implicit_header_references` (#2904). + Improved documentation of `--columns` option. - * Added appveyor setup, with artefacts (Jan Schulz). + * Added appveyor setup, with artifacts (Jan Schulz). * stack.yaml versions: Use proper flags used for texmath, pandoc-citeproc. @@ -5356,7 +5356,7 @@ pandoc (1.16.0.1) * Entity handling fixes: improved handling of entities like `⟨` that require a trailing semicolon. Allow uppercase - `x` in numerical hexidecimal character references, working + `x` in numerical hexadecimal character references, working around a tagsoup bug. * `stack.yaml` - use lts-4.0, but with older aeson to avoid excessive @@ -6852,7 +6852,7 @@ pandoc (1.14) * `Text.Pandoc.Shared`: + Make safeRead safe (#1801, Matthew Pickering). - + Addded `mapLeft`, `hush` (Matthew Pickering). + + Added `mapLeft`, `hush` (Matthew Pickering). * `Text.Pandoc.Pretty`: @@ -6920,7 +6920,7 @@ pandoc (1.14) + Use `text:p` instead of `text:h` for title. Using `text:h` causes problems with numbering. Closes #2059. - Thansk to @nkalvi for diagnosing this. + Thanks to @nkalvi for diagnosing this. * reveal.js template: @@ -7026,7 +7026,7 @@ pandoc (1.13.2) + Parse RST class directives. The class directive accepts one or more class names, and creates a Div value with those classes. If the directive has an indented body, the body is parsed as the children of - the Div. If not, the first block folowing the directive is made a + the Div. If not, the first block following the directive is made a child of the Div. This differs from the behavior of rst2xml, which does not create a Div element. Instead, the specified classes are applied to each child of the directive. However, most Pandoc Block @@ -7971,7 +7971,7 @@ pandoc (1.13) different versions of the `directory` library. + Added `Text.Pandoc.Compat.Except` to allow building against - different verions of `mtl`. + different versions of `mtl`. * Code cleanup in some writers, using Reader monad to avoid passing options parameter around (Matej Kollar). @@ -8631,7 +8631,7 @@ pandoc (1.12.2) + Parse contents of curly quotes or matched `"` as quotes. + Support `\textnormal` as span with class `nodecor`. This is needed for pandoc-citeproc. - + Improved citation parsing. This fixes a run-time error that occured + + Improved citation parsing. This fixes a run-time error that occurred with `\citet{}` (empty list of keys). It also ensures that empty keys don't get produced. @@ -8914,7 +8914,7 @@ pandoc (1.12) to make that the current directory before running pandoc. (#942) * Better error reporting in some readers, due to changes in `readWith`: - the line in which the error occured is printed, with a caret pointing + the line in which the error occurred is printed, with a caret pointing to the column. * All slide formats now support incremental slide view for definition lists. @@ -9608,7 +9608,7 @@ pandoc (1.11) + Include HTML TOC, even in epub2. The TOC is included in `<spine>`, but `linear` is set to `no` unless the `--toc` option is specified. Include `<guide>` element in OPF. This should allow the TOC to - be useable in Kindles when converted with kindlegen. Closes #773. + be usable in Kindles when converted with kindlegen. Closes #773. * `Text.Pandoc.Parsing`: Optimized `oneOfStringsCI`. This dramatically reduces the speed penalty that comes from enabling the @@ -9973,7 +9973,7 @@ pandoc (1.10) [API changes] * `Text.Pandoc.Definition`: Added `Attr` field to `Header`. - Previously header identifers were autogenerated by the writers. + Previously header identifiers were autogenerated by the writers. Now they are added in the readers (either automatically or explicitly). * `Text.Pandoc.Builder`: @@ -10210,7 +10210,7 @@ pandoc (1.10) incorrectly implented RST-style autolinks for URLs and email addresses. This has been fixed. Now an autolink is done this way: `"$":http://myurl.com`. - + Fixed footnotes bug in textile. This affected notes occuring + + Fixed footnotes bug in textile. This affected notes occurring before punctuation, e.g. `foo[1].`. Closes #518. * LaTeX reader: @@ -11243,7 +11243,7 @@ pandoc (1.9) Items are no longer installed as root. Man pages are zipped and given proper permissions. - * Modified windows installer generater to use cabal-dev. + * Modified windows installer generator to use cabal-dev. * Setup: Making man pages now works with cabal-dev (at least on OSX). In Setup.hs we now invoke 'runghc' in a way that points it to the correct @@ -12286,7 +12286,7 @@ pandoc (1.5) better browsers) as text/html. + Removed Text.Pandoc.LaTeXMathML. The module was no longer necessary; it was replaced by two lines in pandoc.hs. - + Replaced LaTeXMathML.js.commend and LaTeXMathML.js.packed with a + + Replaced LaTeXMathML.js.comment and LaTeXMathML.js.packed with a single combined file, LaTeXMathML.js. * Added --data-dir option. @@ -12520,7 +12520,7 @@ pandoc (1.4) * Replaced old headers with templates. Now users have much more control over the way documents appear in --standalone mode, and writer code is simplified. Resolves Issues #59, 147. - Every effort has been made to retain backwards compatibilty. + Every effort has been made to retain backwards compatibility. So, the --custom-header option should still work as before. + Added Text.Pandoc.Templates. This provides functions for @@ -13488,7 +13488,7 @@ pandoc (0.46) unstable; urgency=low + Don't interpret contents of style tags as markdown. (Resolves Issue #40.) - - Added htmlStyle, analagous to htmlScript. + - Added htmlStyle, analogous to htmlScript. - Use htmlStyle in htmlBlockElement and rawHtmlInline. - Moved "script" from the list of tags that can be either block or inline to the list of block tags. @@ -14267,7 +14267,7 @@ pandoc (0.4) unstable; urgency=low notes and add information to state. (Reference keys may be needed at this stage.) Finally, parse everything else. + Replaced named constants like 'emphStart' with literals. - + Removed an extra occurance of escapedChar in definition of inline. + + Removed an extra occurrence of escapedChar in definition of inline. * RST reader: @@ -14307,7 +14307,7 @@ pandoc (0.4) unstable; urgency=low + The Html header is now written programmatically, so it has been removed from the 'headers' directory. The S5 header is still needed, but the doctype and some of the meta declarations have - been removed, since they are written programatically. This change + been removed, since they are written programmatically. This change introduces a new dependency on the xhtml package. + Fixed two bugs in email obfuscation involving improper escaping of '&' in the `<noscript>` section and in `--strict` mode. Resolves @@ -14616,7 +14616,7 @@ pandoc (0.3) unstable; urgency=low + win-pkg target creates Windows binary package. + tarball target creates distribution source tarball. + website target generates pandoc's website automatically, including - demos. New 'web' directory containts files needed for construction + demos. New 'web' directory contains files needed for construction of the website (which will be created as the 'pandoc' subdirectory of 'web'). + Makefile checks to see if we're running Windows/Cygwin; if so, diff --git a/default.nix b/default.nix index b34400204..3dc7d9b9e 100644 --- a/default.nix +++ b/default.nix @@ -2,7 +2,7 @@ # # To build pandoc run: # nix-build -# To run a nix shell with everthing needed to build pandoc with cabal: +# To run a nix shell with everything needed to build pandoc with cabal: # nix-shell # To build pandoc for use on Linux and macOS systems without Nix: # nix-build -A patched diff --git a/doc/lua-filters.md b/doc/lua-filters.md index 170aaa8f5..881c981f5 100644 --- a/doc/lua-filters.md +++ b/doc/lua-filters.md @@ -114,7 +114,7 @@ The return of a filter function must one of the following: - a pandoc object: this must be of the same type as the input and will replace the original object. - a list of pandoc objects: these will replace the original - object; the list is merged with the neighbors of the orignal + object; the list is merged with the neighbors of the original objects (spliced into the list the original object belongs to); returning an empty list deletes the object. diff --git a/doc/using-the-pandoc-api.md b/doc/using-the-pandoc-api.md index 8527f6373..550b38c65 100644 --- a/doc/using-the-pandoc-api.md +++ b/doc/using-the-pandoc-api.md @@ -42,7 +42,7 @@ limitation is mostly a help rather than a hindrance, since many of the formats pandoc supports have similar limitations. The best way to explore the pandoc AST is to use `pandoc -t -native`, which will display the AST correspoding to some +native`, which will display the AST corresponding to some Markdown input: ``` @@ -187,7 +187,7 @@ Some particularly important options to know about: # Builder Sometimes it's useful to construct a Pandoc document -programatically. To make this easier we provide the +programmatically. To make this easier we provide the module [Text.Pandoc.Builder] `pandoc-types`. Because concatenating lists is slow, we use special diff --git a/test/Tests/Lua.hs b/test/Tests/Lua.hs index 28a691715..9d2d3b635 100644 --- a/test/Tests/Lua.hs +++ b/test/Tests/Lua.hs @@ -129,7 +129,7 @@ tests = map (localOption (QuickCheckTests 20)) , testCase "Pandoc version is set" . runPandocLua' $ do Lua.getglobal' "table.concat" Lua.getglobal "PANDOC_VERSION" - Lua.push ("." :: String) -- seperator + Lua.push ("." :: String) -- separator Lua.call 2 1 Lua.liftIO . assertEqual "pandoc version is wrong" pandocVersion =<< Lua.peek Lua.stackTop diff --git a/test/Tests/Readers/Org/Inline.hs b/test/Tests/Readers/Org/Inline.hs index 07fe2d2e9..7dfa001e3 100644 --- a/test/Tests/Readers/Org/Inline.hs +++ b/test/Tests/Readers/Org/Inline.hs @@ -96,7 +96,7 @@ tests = "[fn::Schreib mir eine E-Mail]" =?> para (note $ para "Schreib mir eine E-Mail") - , "Markup-chars not occuring on word break are symbols" =: + , "Markup-chars not occurring on word break are symbols" =: T.unlines [ "this+that+ +so+on" , "seven*eight* nine*" , "+not+funny+" diff --git a/test/command/3432.md b/test/command/3432.md index 7264d22c3..381f8af87 100644 --- a/test/command/3432.md +++ b/test/command/3432.md @@ -195,7 +195,7 @@ List-table without header-rows. </table> ``` -List-table with empty cells. You need a space after '-', otherwise the row will disapear. Parser for Bulletlists causes this ristriction. +List-table with empty cells. You need a space after '-', otherwise the row will disappear. Parser for Bulletlists causes this restriction. ``` % pandoc -f rst diff --git a/test/pptx/lists.native b/test/pptx/lists.native index e08580cd5..61249c7fe 100644 --- a/test/pptx/lists.native +++ b/test/pptx/lists.native @@ -1,7 +1,7 @@ [Header 1 ("lists",[],[]) [Str "Lists"] ,BulletList [[Para [Str "Bulleted",Space,Str "bulleted",Space,Str "lists."]] - ,[Para [Str "And",Space,Str "go",Space,Str "to",Space,Str "aribtrary",Space,Str "depth."] + ,[Para [Str "And",Space,Str "go",Space,Str "to",Space,Str "arbitrary",Space,Str "depth."] ,BulletList [[Para [Str "Like",Space,Str "this"] ,BulletList diff --git a/test/pptx/lists.pptx b/test/pptx/lists.pptx Binary files differindex acb0841ce..c28e840f1 100644 --- a/test/pptx/lists.pptx +++ b/test/pptx/lists.pptx diff --git a/test/pptx/lists_templated.pptx b/test/pptx/lists_templated.pptx Binary files differindex a25feaff1..74505454e 100644 --- a/test/pptx/lists_templated.pptx +++ b/test/pptx/lists_templated.pptx diff --git a/test/textile-reader.native b/test/textile-reader.native index 10bf2c857..16b5a87e8 100644 --- a/test/textile-reader.native +++ b/test/textile-reader.native @@ -2,7 +2,7 @@ Pandoc (Meta {unMeta = fromList []}) [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc",Space,Str "Textile",Space,Str "Reader.",Space,Str "Part",Space,Str "of",Space,Str "it",Space,Str "comes",LineBreak,Str "from",Space,Str "John",Space,Str "Gruber\8217s",Space,Str "markdown",Space,Str "test",Space,Str "suite."] ,HorizontalRule ,Header 1 ("headers",[],[]) [Str "Headers"] -,Header 2 ("level-2-with-an-embeded-link",[],[]) [Str "Level",Space,Str "2",Space,Str "with",Space,Str "an",Space,Link ("",[],[]) [Str "embeded",Space,Str "link"] ("http://www.example.com","")] +,Header 2 ("level-2-with-an-embedded-link",[],[]) [Str "Level",Space,Str "2",Space,Str "with",Space,Str "an",Space,Link ("",[],[]) [Str "embedded",Space,Str "link"] ("http://www.example.com","")] ,Header 3 ("level-3-with-emphasis",[],[]) [Str "Level",Space,Str "3",Space,Str "with",Space,Strong [Str "emphasis"]] ,Header 4 ("level-4",[],[]) [Str "Level",Space,Str "4"] ,Header 5 ("level-5",[],[]) [Str "Level",Space,Str "5"] diff --git a/test/textile-reader.textile b/test/textile-reader.textile index cca0b83f7..d02310b3d 100644 --- a/test/textile-reader.textile +++ b/test/textile-reader.textile @@ -5,7 +5,7 @@ from John Gruber's markdown test suite. h1. Headers -h2. Level 2 with an "embeded link":http://www.example.com +h2. Level 2 with an "embedded link":http://www.example.com h3. Level 3 with *emphasis* diff --git a/test/txt2tags.t2t b/test/txt2tags.t2t index d374b7a85..f736cfa93 100644 --- a/test/txt2tags.t2t +++ b/test/txt2tags.t2t @@ -136,7 +136,7 @@ i) ***bold*** ///ital/// ___undr___ ---strk--- ```mono``` """raw" %%% Syntax: Repetition is greedy %% When the mark character is repeated many times, %% the contents are expanded to the largest possible. -%% Thats why they are greedy, the outer marks are +%% That's why they are greedy, the outer marks are %% the ones used. i) ***** ///// _____ ----- ````` """"" ''''' diff --git a/trypandoc/trypandoc.hs b/trypandoc/trypandoc.hs index a4c21e1f6..f451b3063 100644 --- a/trypandoc/trypandoc.hs +++ b/trypandoc/trypandoc.hs @@ -25,7 +25,7 @@ main = run app app :: Application app req respond = do let query = queryToQueryText $ queryString req - let getParam x = maybe (error $ T.unpack x ++ " paramater not set") + let getParam x = maybe (error $ T.unpack x ++ " parameter not set") return $ lookup x query text <- getParam "text" >>= checkLength . fromMaybe T.empty fromFormat <- fromMaybe "" <$> getParam "from" |