diff --git a/changelog.md b/changelog.md index 3ea7cc21e..93f251e43 100644 --- a/changelog.md +++ b/changelog.md @@ -33,7 +33,7 @@ * Fix MANUAL.txt CSL JSON conversion examples. - * Fix spelling errors in chengelog, MANUAL.txt, `doc/org.md` (#6738). + * Fix spelling errors in changelog, MANUAL.txt, `doc/org.md` (#6738). ## pandoc 2.11 (2020-10-11) @@ -3369,7 +3369,7 @@ * Man/Ms writers: Don't escape `-` as `\-`. The `\-` gets rendered in HTML and PDF as a unicode minus sign. - * Ms writer: Ensure we have a newline after .EN in disply math (#5251). + * Ms writer: Ensure we have a newline after .EN in display math (#5251). * RST writer: Don't wrap simple table header lines (#5128). @@ -9016,11 +9016,11 @@ + Allow alignments to be specified in Markdown grid tables. For example, - +-------+---------------+--------------------+ + +-------|---------------|--------------------+ | Right | Left | Centered | +=========:+:=================+:=============:+ | Bananas | $1.34 | built-in wrapper | - +-------+---------------+--------------------+ + +-------|---------------|--------------------+ + Allow Small Caps elements to be created using bracketed spans (as they already can be using HTML-syntax spans) (#3191, Kolen Cheung). diff --git a/src/Text/Pandoc/Citeproc.hs b/src/Text/Pandoc/Citeproc.hs index ee78bb3ff..c00c8ca09 100644 --- a/src/Text/Pandoc/Citeproc.hs +++ b/src/Text/Pandoc/Citeproc.hs @@ -197,7 +197,7 @@ getRefsFromBib locale idpred t = do case formatFromExtension fp of Just f -> getRefs locale f idpred (Just fp) raw Nothing -> throwError $ PandocAppError $ - "Could not deterine bibliography format for " <> t + "Could not determine bibliography format for " <> t getRefs :: PandocMonad m => Locale @@ -532,6 +532,3 @@ removeFinalPeriod ils = case lastMay ils of Just (Str ".") -> initSafe ils _ -> ils - - - diff --git a/src/Text/Pandoc/Class/PandocMonad.hs b/src/Text/Pandoc/Class/PandocMonad.hs index 6042973ab..1903d73d8 100644 --- a/src/Text/Pandoc/Class/PandocMonad.hs +++ b/src/Text/Pandoc/Class/PandocMonad.hs @@ -600,7 +600,7 @@ makeCanonical = Posix.joinPath . transformPathParts . splitDirectories go (_:as) ".." = as go as x = x : as --- | Trys to run an action on a file: for each directory given, a +-- | Tries to run an action on a file: for each directory given, a -- filepath is created from the given filename, and the action is run on -- that filepath. Returns the result of the first successful execution -- of the action, or throws a @PandocResourceNotFound@ exception if the diff --git a/src/Text/Pandoc/Error.hs b/src/Text/Pandoc/Error.hs index 63973bd05..bd24fec6f 100644 --- a/src/Text/Pandoc/Error.hs +++ b/src/Text/Pandoc/Error.hs @@ -10,8 +10,8 @@ Stability : alpha Portability : portable -This module provides a standard way to deal with possible errors encounted -during parsing. +This module provides a standard way to deal with possible errors +encountered during parsing. -} module Text.Pandoc.Error ( diff --git a/src/Text/Pandoc/Lua/Marshaling/MediaBag.hs b/src/Text/Pandoc/Lua/Marshaling/MediaBag.hs index e9b0c5770..2cf5b8893 100644 --- a/src/Text/Pandoc/Lua/Marshaling/MediaBag.hs +++ b/src/Text/Pandoc/Lua/Marshaling/MediaBag.hs @@ -34,7 +34,7 @@ instance Peekable MediaItems where peek = peekMediaItems -- | Push an iterator triple to be used with Lua's @for@ loop construct. --- Each iterator invokation returns a tripple consisting of an item's +-- Each iterator invocation returns a triple containing the item's -- filename, MIME type, and content. pushIterator :: MediaBag -> Lua NumResults pushIterator mb = do diff --git a/src/Text/Pandoc/Readers/Creole.hs b/src/Text/Pandoc/Readers/Creole.hs index 0bd02d17c..2658dfea2 100644 --- a/src/Text/Pandoc/Readers/Creole.hs +++ b/src/Text/Pandoc/Readers/Creole.hs @@ -252,7 +252,7 @@ inlineNowiki = B.code <$> (start >> manyTillChar (noneOf "\n\r") end) end = try $ string "}}}" >> lookAhead (noneOf "}") placeholder :: PandocMonad m => CRLParser m B.Inlines --- The semantics of the placeholder is basicallly implementation +-- The semantics of the placeholder is basically implementation -- dependent, so there is no way to DTRT for all cases. -- So for now we just drop them. placeholder = B.text <$> try (string "<<<" >> manyTill anyChar (string ">>>") diff --git a/src/Text/Pandoc/Readers/Odt/Generic/Utils.hs b/src/Text/Pandoc/Readers/Odt/Generic/Utils.hs index 1999469ee..146f35319 100644 --- a/src/Text/Pandoc/Readers/Odt/Generic/Utils.hs +++ b/src/Text/Pandoc/Readers/Odt/Generic/Utils.hs @@ -41,7 +41,7 @@ import Data.Maybe -- > foldr (.) id -- where '(.)' are 'id' are the ones from "Control.Category" -- and 'foldr' is the one from "Data.Foldable". --- The noun-form was chosen to be consistend with 'sum', 'product' etc +-- The noun-form was chosen to be consistent with 'sum', 'product' etc -- based on the discussion at -- -- (that I was not part of) diff --git a/src/Text/Pandoc/Readers/Org/Blocks.hs b/src/Text/Pandoc/Readers/Org/Blocks.hs index 8eb7cfdd3..cd91e9ecc 100644 --- a/src/Text/Pandoc/Readers/Org/Blocks.hs +++ b/src/Text/Pandoc/Readers/Org/Blocks.hs @@ -289,7 +289,7 @@ verseBlock blockType = try $ do return (trimInlinesF $ pure nbspIndent <> line) -- | Read a code block and the associated results block if present. Which of --- boths blocks is included in the output is determined using the "exports" +-- the blocks is included in the output is determined using the "exports" -- argument in the block header. codeBlock :: PandocMonad m => BlockAttributes -> Text -> OrgParser m (F Blocks) codeBlock blockAttrs blockType = do diff --git a/test/command/biblatex-thesis.md b/test/command/biblatex-thesis.md index 6ea23827c..aba8b5648 100644 --- a/test/command/biblatex-thesis.md +++ b/test/command/biblatex-thesis.md @@ -2,7 +2,7 @@ % pandoc -f biblatex -t markdown -s @comment{excerpted from http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bib -TODO: Uppercase letters follwing hyphens need to be converted to lowercase, too (e.g., "r" in "High-Resolution". -- Same for citeproc when doing title-case conversion!) +TODO: Uppercase letters following hyphens need to be converted to lowercase, too (e.g., "r" in "High-Resolution". -- Same for citeproc when doing title-case conversion!) } @thesis{geer, diff --git a/test/command/yaml-metadata-blocks.md b/test/command/yaml-metadata-blocks.md index 5b73cff72..0733623dd 100644 --- a/test/command/yaml-metadata-blocks.md +++ b/test/command/yaml-metadata-blocks.md @@ -21,18 +21,18 @@ scientific: 3.7e-5 bool: true more: False nothing: null -emtpy: [] +empty: [] nested: int: 8 float: 2.5 bool: true more: False nothing: null - emtpy: [] + empty: [] scientific: 3.7e-5 --- ^D -Pandoc (Meta {unMeta = fromList [("bool",MetaBool True),("emtpy",MetaList []),("float",MetaInlines [Str "1.5"]),("int",MetaInlines [Str "7"]),("more",MetaBool False),("nested",MetaMap (fromList [("bool",MetaBool True),("emtpy",MetaList []),("float",MetaInlines [Str "2.5"]),("int",MetaInlines [Str "8"]),("more",MetaBool False),("nothing",MetaInlines [Str "null"]),("scientific",MetaInlines [Str "3.7e-5"])])),("nothing",MetaInlines [Str "null"]),("scientific",MetaInlines [Str "3.7e-5"])]}) +Pandoc (Meta {unMeta = fromList [("bool",MetaBool True),("empty",MetaList []),("float",MetaInlines [Str "1.5"]),("int",MetaInlines [Str "7"]),("more",MetaBool False),("nested",MetaMap (fromList [("bool",MetaBool True),("empty",MetaList []),("float",MetaInlines [Str "2.5"]),("int",MetaInlines [Str "8"]),("more",MetaBool False),("nothing",MetaInlines [Str "null"]),("scientific",MetaInlines [Str "3.7e-5"])])),("nothing",MetaInlines [Str "null"]),("scientific",MetaInlines [Str "3.7e-5"])]}) [] ``` ``` diff --git a/test/epub/features.epub b/test/epub/features.epub index 2690eec8b..0d50380ac 100644 Binary files a/test/epub/features.epub and b/test/epub/features.epub differ diff --git a/test/epub/features.native b/test/epub/features.native index 3b9535e26..51a2881af 100644 --- a/test/epub/features.native +++ b/test/epub/features.native @@ -64,7 +64,7 @@ ,Para [Str "The",Space,Str "test",Space,Str "passes",Space,Str "if",Space,Str "the",Space,Str "rendering",Space,Str "looks",Space,Str "like",Space,Str "."]] ,Div ("content-mathml-001.xhtml#mathml-025",["section","ctest"],[]) [Header 2 ("",[],[]) [Span ("",["nature"],[]) [Str "[REQUIRED]"],SoftBreak,Span ("",["test-id"],[]) [Str "mathml-025"],Str "Testing",Space,Code ("",[],[]) "mtable",Space,Str "with",Space,Code ("",[],[]) "colspan",Space,Str "and",Space,Code ("",[],[]) "rowspan",Space,Str "attributes,",Space,Str "Hebrew",Space,Str "and",Space,Str "Script",Space,Str "fonts"] - ,Para [Str "Tests",Space,Str "whether",Space,Code ("",[],[]) "mtable",Space,Str "with",Space,Code ("",[],[]) "colspan",Space,Str "and",Space,Code ("",[],[]) "mspace",Space,Str "attributes",Space,Str "(colum",Space,Str "and",Space,Str "row",Space,Str "spanning)",Space,Str "are",Space,Str "supported;",Space,Str "uses",Space,Str "Hebrew",Space,Str "and",Space,Str "Script",Space,Str "alphabets."] + ,Para [Str "Tests",Space,Str "whether",Space,Code ("",[],[]) "mtable",Space,Str "with",Space,Code ("",[],[]) "colspan",Space,Str "and",Space,Code ("",[],[]) "mspace",Space,Str "attributes",Space,Str "(column",Space,Str "and",Space,Str "row",Space,Str "spanning)",Space,Str "are",Space,Str "supported;",Space,Str "uses",Space,Str "Hebrew",Space,Str "and",Space,Str "Script",Space,Str "alphabets."] ,Plain [Math DisplayMath "\\begin{matrix}\n & {\\operatorname{cov}\\left( \\mathcal{L} \\right)} & \\longrightarrow & {\\operatorname{non}\\left( \\mathcal{K} \\right)} & \\longrightarrow & {\\operatorname{cof}\\left( \\mathcal{K} \\right)} & \\longrightarrow & {\\operatorname{cof}\\left( \\mathcal{L} \\right)} & \\longrightarrow & 2^{\\aleph_{0}} \\\\\n & \\uparrow & & \\uparrow & & \\uparrow & & \\uparrow & & \\\\\n & {\\mathfrak{b}} & \\longrightarrow & {\\mathfrak{d}} & & & & & & \\\\\n & \\uparrow & & \\uparrow & & & & & & \\\\\n\\aleph_{1} & \\longrightarrow & {\\operatorname{add}\\left( \\mathcal{L} \\right)} & \\longrightarrow & {\\operatorname{add}\\left( \\mathcal{K} \\right)} & \\longrightarrow & {\\operatorname{cov}\\left( \\mathcal{K} \\right)} & \\longrightarrow & {\\operatorname{non}\\left( \\mathcal{L} \\right)} & \\\\\n\\end{matrix}"] ,Para [Str "The",Space,Str "test",Space,Str "passes",Space,Str "if",Space,Str "the",Space,Str "rendering",Space,Str "looks",Space,Str "like",Space,Link ("",[],[]) [Str "Cicho\324's",Space,Str "Diagram"] ("http://en.wikipedia.org/wiki/Cicho%C5%84's_diagram",""),Str ":",Space,Str "."]] ,Div ("content-mathml-001.xhtml#mathml-026",["section","ctest"],[]) diff --git a/test/tables/planets.html4 b/test/tables/planets.html4 index 3e9caa017..4435571b4 100644 --- a/test/tables/planets.html4 +++ b/test/tables/planets.html4 @@ -17,7 +17,7 @@ -Terrestial planets +Terrestrial planets Mercury 0.330 4,879 diff --git a/test/tables/planets.html5 b/test/tables/planets.html5 index 35be2e27f..1fee985b9 100644 --- a/test/tables/planets.html5 +++ b/test/tables/planets.html5 @@ -17,7 +17,7 @@ -Terrestial planets +Terrestrial planets Mercury 0.330 4,879 diff --git a/test/tables/planets.native b/test/tables/planets.native index 4a348ba54..02f42ef08 100644 --- a/test/tables/planets.native +++ b/test/tables/planets.native @@ -29,7 +29,7 @@ [(TableBody ("",[],[]) (RowHeadColumns 3) [] [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 4) (ColSpan 2) [Plain [Str "Terrestial planets"]] + [Cell ("",[],[]) AlignDefault (RowSpan 4) (ColSpan 2) [Plain [Str "Terrestrial planets"]] ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "Mercury"]] ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "0.330"]] ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) [Plain [Str "4,879"]] diff --git a/test/textile-reader.native b/test/textile-reader.native index 7126c3634..e691e41fc 100644 --- a/test/textile-reader.native +++ b/test/textile-reader.native @@ -90,7 +90,7 @@ Pandoc (Meta {unMeta = fromList []}) ,Para [Emph [Strong [Str "This",Space,Str "is",Space,Str "strong",Space,Str "and",Space,Str "em."]],LineBreak,Str "So",Space,Str "is",Space,Strong [Emph [Str "this"]],Space,Str "word",Space,Str "and",Space,Emph [Strong [Str "that",Space,Str "one"]],Str ".",LineBreak,Strikeout [Str "This",Space,Str "is",Space,Str "strikeout",Space,Str "and",Space,Strong [Str "strong"]]] ,Para [Str "Superscripts:",Space,Str "a",Superscript [Str "bc"],Str "d",Space,Str "a",Space,Superscript [Strong [Str "hello"]],Space,Str "a",Superscript [Str "hello",Space,Str "there"],Str ".",LineBreak,Str "Subscripts:",Space,Subscript [Str "here"],Space,Str "H",Space,Subscript [Str "2"],Str "O,",Space,Str "H",Space,Subscript [Str "23"],Str "O,",Space,Str "H",Space,Subscript [Str "many",Space,Str "of",Space,Str "them"],Str "O."] ,Para [Str "Dashes",Space,Str ":",Space,Str "How",Space,Str "cool",Space,Str "\8212",Space,Str "automatic",Space,Str "dashes."] -,Para [Str "Elipses",Space,Str ":",Space,Str "He",Space,Str "thought",Space,Str "and",Space,Str "thought",Space,Str "\8230",Space,Str "and",Space,Str "then",Space,Str "thought",Space,Str "some",Space,Str "more."] +,Para [Str "Ellipses",Space,Str ":",Space,Str "He",Space,Str "thought",Space,Str "and",Space,Str "thought",Space,Str "\8230",Space,Str "and",Space,Str "then",Space,Str "thought",Space,Str "some",Space,Str "more."] ,Para [Str "Quotes",Space,Str "and",Space,Str "apostrophes",Space,Str ":",Space,Quoted DoubleQuote [Str "I\8217d",Space,Str "like",Space,Str "to",Space,Str "thank",Space,Str "you"],Space,Str "for",Space,Str "example."] ,Header 1 ("links",[],[]) [Str "Links"] ,Header 2 ("explicit",[],[]) [Str "Explicit"] diff --git a/test/textile-reader.textile b/test/textile-reader.textile index d02310b3d..164fe966c 100644 --- a/test/textile-reader.textile +++ b/test/textile-reader.textile @@ -162,7 +162,7 @@ Subscripts: ~here~ H[ ~2~]O, H[ ~23~]O, H[ ~many of them~]O. Dashes : How cool -- automatic dashes. -Elipses : He thought and thought ... and then thought some more. +Ellipses : He thought and thought ... and then thought some more. Quotes and apostrophes : "I'd like to thank you" for example.